Skip to content

Commit

Permalink
Set version to 2.2.4. Prepare for new release.
Browse files Browse the repository at this point in the history
  • Loading branch information
bengtmartensson committed Jan 15, 2020
1 parent 818fe88 commit 1d25d2c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ before_install:
install:
- sudo apt-get install -y --force-yes autoconf dos2unix icoutils xsltproc
script:
- tools/build-IrpTransmogrifier.sh
- tools/build-Girr.sh
- tools/build-Jirc.sh
#- tools/build-IrpTransmogrifier.sh
#- tools/build-Girr.sh
#- tools/build-Jirc.sh
#- tools/build-DevSlashLirc.sh
- tools/build-HarcHardwareBundle.sh
#- tools/build-HarcHardwareBundle.sh
- tools/build-tonto.sh -n
- tools/get-jdk.sh linux
- wget --quiet http://www.harctoolbox.org/downloads/jre-x64-macOS.tar.gz
Expand Down
11 changes: 5 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<groupId>org.harctoolbox</groupId>
<artifactId>IrScrutinizer</artifactId>
<packaging>jar</packaging>
<version>2.2.0-${git.commit.id.abbrev}-SNAPSHOT</version>
<!--version>2.2.0-SNAPSHOT</version-->
<version>2.2.4</version>
<name>${project.artifactId}</name>
<licenses>
<license>
Expand All @@ -31,10 +30,10 @@
<inno_path>${basedir}/../Inno Setup 6/ISCC.exe</inno_path>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<IrpTransmogrifier.version>1.2.4-SNAPSHOT</IrpTransmogrifier.version>
<Girr.version>2.2.4-SNAPSHOT</Girr.version>
<Jirc.version>2.2.4-SNAPSHOT</Jirc.version>
<HarcHardware.version>2.2.4-SNAPSHOT</HarcHardware.version>
<IrpTransmogrifier.version>1.2.4</IrpTransmogrifier.version>
<Girr.version>${project.version}</Girr.version>
<Jirc.version>${project.version}</Jirc.version>
<HarcHardware.version>${project.version}</HarcHardware.version>
</properties>

<profiles>
Expand Down
11 changes: 11 additions & 0 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ MYDIR := $(dir $(firstword $(MAKEFILE_LIST)))
TOP := $(realpath $(MYDIR)..)
GH_PAGES := $(TOP)/gh-pages
ORIGINURL := $(shell git remote get-url origin)
PROJECT_NAME := IrScrutinizer

VERSION=$(shell cat $(TOP)/target/$(MYPROG).version | cut --delimiter=' ' -f 3)

Expand All @@ -22,6 +23,16 @@ $(IRSCRUTINIZER_JAR):
apidoc javadoc: target/site/apidocs/index.html
$(BROWSE) $<

version:
@echo $(VERSION)

push:
git push

setversion:
mvn versions:set -DnewVersion=$(NEWVERSION)
git commit -S -m "Set version to $(NEWVERSION)" pom.xml src/main/doc/$(PROJECT_NAME).releasenotes.txt

target/site/apidocs/index.html:
mvn javadoc:javadoc

Expand Down

0 comments on commit 1d25d2c

Please sign in to comment.