diff options
| author | Werner Koch <wk@gnupg.org> | 2014-11-05 21:40:52 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-11-05 21:40:52 +0100 |
| commit | 8ec0b384a86bd7f67a60ab43ff1540e80c3f729d (patch) | |
| tree | f343c54a0d2f098dddfc746b3430f051bf84f9c2 /build-aux | |
| parent | Post release updates. (diff) | |
| download | gnupg2-8ec0b384a86bd7f67a60ab43ff1540e80c3f729d.tar.xz gnupg2-8ec0b384a86bd7f67a60ab43ff1540e80c3f729d.zip | |
speedo: Append the date to the Windows installer.
* build-aux/speedo.mk (BUILD_DATESTR): New.
(dist-source, installer): Use it.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/speedo.mk | 6 | ||||
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index b7bcf06ee..63d508d88 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -573,6 +573,7 @@ endif BUILD_ISODATE=$(shell date -u +%Y-%m-%d) +BUILD_DATESTR=$(subst -,,$(BUILD_ISODATE)) # The next two macros will work only after gnupg has been build. ifeq ($(TARGETOS),w32) @@ -1000,7 +1001,7 @@ ifeq ($(TARGETOS),w32) dist-source: all for i in 00 01 02 03; do sleep 1;touch PLAY/stamps/stamp-*-${i}-*;done (set -e;\ - tarname="$(INST_NAME)-$(INST_VERSION)_$(BUILD_ISODATE).tar" ;\ + tarname="$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).tar" ;\ [ -f "$$tarname" ] && rm "$$tarname" ;\ tar -C $(topsrc) -cf "$$tarname" --exclude-backups --exclude-vc \ --transform='s,^\./,$(INST_NAME)-$(INST_VERSION)/,' \ @@ -1043,11 +1044,12 @@ installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt -DTOP_SRCDIR=$(topsrc) \ -DW32_SRCDIR=$(w32src) \ -DBUILD_ISODATE=$(BUILD_ISODATE) \ + -DBUILD_DATESTR=$(BUILD_DATESTR) \ -DNAME=$(INST_NAME) \ -DVERSION=$(INST_VERSION) \ -DPROD_VERSION=$(INST_PROD_VERSION) \ $(w32src)/inst.nsi - @echo "Ready: $(idir)/$(INST_NAME)-$(INST_VERSION)" + @echo "Ready: $(idir)/$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).exe" endif # }}} W32 diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index 707b0585f..b43e5ffc0 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -22,7 +22,8 @@ # BUILD_DIR # TOP_SRCDIR # W32_SRCDIR -# BUILD_ISODATE +# BUILD_ISODATE - the build date, e.g. "2014-10-31" +# BUILD_DATESTR - ditto w/o '-', e.g. "20141031" # NAME # VERSION # PROD_VERSION @@ -94,9 +95,9 @@ SetCompressor lzma Name "${PRETTY_PACKAGE}" # Set the output filename. -OutFile "${NAME}-${VERSION}.exe" +OutFile "${NAME}-${VERSION}_${BUILD_DATESTR}.exe" -#Fixme: Do we need a logo +#Fixme: Do we need a logo? #Icon "${TOP_SRCDIR}/doc/logo/gnupg-logo-icon.ico" #UninstallIcon "${TOP_SRCDIR}/doc/logo/gnupg-logo-icon.ico" |