diff --git a/pom.xml b/pom.xml index 1deb7a4b..4aa270d5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.harctoolbox IrScrutinizer jar - 2.2.6-SNAPSHOT + 2.2.6 ${project.artifactId} @@ -30,7 +30,7 @@ ${basedir}/Inno_Setup_6/ISCC.exe 1.8 1.8 - 1.2.6-SNAPSHOT + 1.2.6 ${project.version} ${project.version} ${project.version} diff --git a/src/main/doc/Checklist.txt b/src/main/doc/Checklist.txt new file mode 100644 index 00000000..e4a6a07f --- /dev/null +++ b/src/main/doc/Checklist.txt @@ -0,0 +1,25 @@ +Checklist for release (for maintainer) + +0. Check in good code ;-). Check that tests run ok, javadoc is ok. +1. Update pom.xml and releasenotes, and checkin. Update versions of dependencies. + For this, can use + make setversion NEWVERSION=1.x.y. +2. Check installation on + * gen binary + setup-irscrutinizer.sh + * AppImage + * Windows 64/32 bit + * Mac +3. push, make sure Travis build is ok. +4. make tag. +5. mvn install +6. Create release on GitHub, using just created tag. Upload +*.bin.zip. *AppImage, *.dmg. *releasenotes.txt, checksums.* +7. Delete CI build. +8. make gh-pages. +9. cd .../www.harctoolbox.org; make clean; make site. +10 cd build/site/en/; make clean; make site +11. Upload IrScrutinizer.version using make upload-version +12. Upload IrScrutinizer.html IrScrutinizer.pdf IrScrutinizer.version +IrpTransmogrifier.releasenotes.txt wholesite.html wholesite.pdf to harctoolbox.org. +using make upload-harctoolbox. +13. make clean. diff --git a/src/main/doc/IrScrutinizer.releasenotes.txt b/src/main/doc/IrScrutinizer.releasenotes.txt index ad9e58da..0af7f6d5 100644 --- a/src/main/doc/IrScrutinizer.releasenotes.txt +++ b/src/main/doc/IrScrutinizer.releasenotes.txt @@ -1,11 +1,15 @@ Release notes for IrScrutinizer, including IrpMaster/IrpTransmogrifier, Girr, HardHardware, DevSlashLirc, and Jirc. +The gaps in release number sequence are due to keeping version numbers +(after the first digit) equal to IrpTransmogrifier. + The notation #n refers to issues number n at https://github.com/bengtmartensson/IrScrutinizer/issues ============================================================================== Version 2.2.6, released 2020-05-25. +* Uses IrpTransmogrifier 2.2.6, see IrpTransmogrifier.releasenotes.txt. * Improved text in GUI on capture parameters. * Author's public key now available as popup. * If capture thread stops by exception, the program was left in unusable state. #383. @@ -41,6 +45,9 @@ Version 2.2.6, released 2020-05-25. * Fixed decoding of "short Pronto". #358. * Some documentation update, in particular on installation. +============================================================================= +Version 2.2.5: There has been no release 2.2.5. + ============================================================================= Version 2.2.4, released 2020-01-15. diff --git a/tools/Makefile b/tools/Makefile index 0fdf2f99..664a0edc 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -9,11 +9,11 @@ MYDIR := $(dir $(firstword $(MAKEFILE_LIST))) TOP := $(realpath $(MYDIR)..) GH_PAGES := $(TOP)/gh-pages ORIGINURL := $(shell git remote get-url origin) -PROJECT_NAME := IrScrutinizer +PROJECT_NAME := $(MYPROG) VERSION=$(shell cat $(TOP)/target/$(MYPROG).version | cut --delimiter=' ' -f 3) -IRSCRUTINIZER_JAR := target/IrScrutinizer-jar-with-dependencies.jar +IRSCRUTINIZER_JAR := target/$(MYPROG)-jar-with-dependencies.jar default: $(IRSCRUTINIZER_JAR) @@ -52,7 +52,17 @@ tag: git push origin Version-$(VERSION) upload-version: - curl --netrc -T target/IrScrutinizer.version ftp://bengt-martensson.de/harctoolbox/downloads/IrScrutinizer.version + curl --netrc -T target/$(MYPROG).version ftp://bengt-martensson.de/harctoolbox/downloads/$(MYPROG).version + +upload-harctoolbox: + @(cd $(TOP)/../www.harctoolbox.org ; \ + make clean ; \ + make site ; \ + cd build/site/en ; \ + for file in $(MYPROG).html $(MYPROG).pdf $(MYPROG).releasenotes.txt wholesite.html wholesite.pdf ; do \ + echo Uploading $$file... ; \ + curl --netrc --upload-file $$file $(UPLOADDIR_DIR)/$$file;\ + done ) # Only for Unix-like systems install: $(IRP_TRANSMOGRIFIER_JAR) | $(INSTALLDIR) @@ -64,6 +74,6 @@ $(INSTALLDIR): clean: mvn clean - rm -rf $(GH_PAGES) + rm -rf $(GH_PAGES) pom.xml.versionsBackup .PHONY: clean