diff options
| author | Werner Koch <[email protected]> | 2015-10-08 16:24:26 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-10-08 16:25:37 +0000 |
| commit | 2eee29253d5940e6da9cb2f44e9c44033675ec12 (patch) | |
| tree | ddd2947991b8d1e62202b2003b56996ed44078aa /build-aux | |
| parent | common: Allow building of mkdir_p.c for Windows. (diff) | |
| download | gnupg-2eee29253d5940e6da9cb2f44e9c44033675ec12.tar.gz gnupg-2eee29253d5940e6da9cb2f44e9c44033675ec12.zip | |
speedo: Add a w32-release target.
--
This simplifies building a release to:
git tag -s gnupg-2.n.m
./autogen.sh --force
cd ~/b/gnupg
~/s/gnupg/configure --enable-maintainer-mode
make distcheck
tar xJf gnupg-2.n.m.tar.bz2
make -f gnupg-2.n.m/build-aux/speedo.mk w32-release
gpg -sbvu KEYID gnupg-2.n.m.tar.bz2
gpg -sbvu KEYID gnupg-w32-2.n.m-20151008.tar.xz
gpg -sbvu KEYID gnupg-w32-2.n.m-20151008.exe
scp gnupg-2.n.m.tar.bz2 $TARGET
scp gnupg-w32-2.n.m-20151008.tar.xz $TARGET
scp gnupg-w32-2.n.m-20151008.exe $TARGET
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/speedo.mk | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index dc949baf1..cd3a66d26 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -57,6 +57,7 @@ help: @echo ' native-gui Ditto but with pinentry and GPA' @echo ' w32-installer Build a Windows installer' @echo ' w32-source Pack a source archive' + @echo ' w32-release Build a Windows release' @echo @echo 'You may append INSTALL_PREFIX=<dir> for native builds.' @echo 'Prepend TARGET with "git-" to build from GIT repos.' @@ -104,6 +105,11 @@ this-w32-source: check-tools $(SPEEDOMAKE) TARGETOS=w32 WHAT=this WITH_GUI=0 \ CUSTOM_SWDB=1 dist-source +w32-release: check-tools + $(SPEEDOMAKE) TARGETOS=w32 WHAT=release WITH_GUI=0 SELFCHECK=0 \ + installer-from-source + + # Set this to "git" to build from git, # to "release" from tarballs, @@ -1050,7 +1056,7 @@ clean-speedo: # {{{ ifeq ($(TARGETOS),w32) -dist-source: all +dist-source: installer for i in 00 01 02 03; do sleep 1;touch PLAY/stamps/stamp-*-${i}-*;done (set -e;\ tarname="$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).tar" ;\ @@ -1061,6 +1067,7 @@ dist-source: all tar --totals -rf "$$tarname" --exclude-backups --exclude-vc \ --transform='s,^,$(INST_NAME)-$(INST_VERSION)/,' \ PLAY/stamps/stamp-*-00-unpack PLAY/src swdb.lst swdb.lst.sig ;\ + [ -f "$$tarname".xz ] && rm "$$tarname".xz;\ xz "$$tarname" ;\ ) @@ -1112,6 +1119,18 @@ installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt $(extra_installer_options) $(w32src)/inst.nsi @echo "Ready: $(idir)/$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).exe" +# Build the installer from the source tarball. +installer-from-source: dist-source + (set -e;\ + [ -d PLAY-release ] && rm -rf PLAY-release; \ + mkdir PLAY-release;\ + cd PLAY-release; \ + tar xJf "../$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).tar.xz";\ + cd $(INST_NAME)-$(INST_VERSION); \ + $(MAKE) -f build-aux/speedo.mk this-w32-installer SELFCHECK=0;\ + mv "PLAY/inst/$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).exe" ../.. ;\ + ) + endif # }}} W32 |