## Process this file with automake to produce Makefile.in
-# Location of the released tarball archives. Note that this is an
-# internal archive and before uploading this to the public server,
-# manual tests should be run and the git release tat set and pushed.
-# Adjust as needed.
-RELEASE_ARCHIVE_DIR = wk@vigenere:tarballs/gnupg/v2.2
+# To include the wixlibs for building an MSI installer in a release use
+# make release WITH_MSI=1
-# The key used to sign the released sources. Adjust as needed.
-RELEASE_SIGNING_KEY = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
+# Location of the released tarball archives. This is prefixed by
+# the variable RELEASE_ARCHIVE in ~/.gnupg-autogen.rc. For example:
+# RELEASE_ARCHIVE=user@host:archive/tarballs
+RELEASE_ARCHIVE_SUFFIX = gnupg/v2.3
+# The variable RELEASE_SIGNKEY in ~/.gnupg-autogen.rc is used
+# to specify the key for signing. For example:
+# RELEASE_SIGNKEY=D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
# Autoconf flags.
ACLOCAL_AMFLAGS = -I m4
+AM_DISTCHECK_DVI_TARGET = pdf
AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \
- --enable-all-tests --enable-symcryptrun --enable-g13 \
+ --enable-all-tests --enable-g13 \
--enable-gpgtar --enable-wks-tools --disable-ntbtls
GITLOG_TO_CHANGELOG=gitlog-to-changelog
build-aux/speedo/patches/atk-1.32.0.patch \
build-aux/speedo/patches/libiconv-1.14.patch \
build-aux/speedo/patches/pango-1.29.4.patch \
- build-aux/speedo/patches/gpgme-1.12.0.patch \
build-aux/speedo/patches/sqlite.patch
else
doc =
endif
+if DISABLE_TESTS
+tests =
+else
+tests = tests
+endif
+if BUILD_TPM2D
+tpm2d = tpm2d
+else
+tpm2d =
+endif
-SUBDIRS = m4 common kbx \
+SUBDIRS = m4 common regexp kbx \
${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
- tools po ${doc} tests
+ tools po ${doc} ${tests} ${tpm2d}
dist_doc_DATA = README
distcheck-hook:
set -e; ( \
- pref="#+macro: gnupg22_" ;\
+ pref="#+macro: gnupg24_" ;\
reldate="$$(date -u +%Y-%m-%d)" ;\
echo "$${pref}ver $(PACKAGE_VERSION)" ;\
echo "$${pref}date $${reldate}" ;\
exit 2;\
fi ;\
echo "/* Build started at $$(date -uIseconds) */" ;\
+ [ -n "$(WITH_MSI)" ] && echo "/* (with MSI build support) */" ;\
cd $(top_srcdir); \
./autogen.sh --force; \
cd $(abs_top_builddir); \
rm -rf dist; mkdir dist ; cd dist ; \
$(abs_top_srcdir)/configure --enable-maintainer-mode; \
$(MAKE) distcheck TESTFLAGS=--parallel; \
- $(TAR) xjf $(RELEASE_NAME).tar.bz2 ;\
- $(MAKE) -f $(RELEASE_NAME)/build-aux/speedo.mk w32-release ;\
+ $(AMTAR) xjf $(RELEASE_NAME).tar.bz2 ;\
+ target=w32-release ;\
+ [ -n "$(WITH_MSI)" ] && target=w32-msi-release ;\
+ $(MAKE) -f $(RELEASE_NAME)/build-aux/speedo.mk $${target} ;\
echo "/* Build finished at $$(date -uIseconds) */" ;\
- echo "/*" ;\
- echo " * Please run the final step interactivly:" ;\
+ echo "/*" ;\
+ echo " * Please run the final step interactively:" ;\
echo " * make sign-release" ;\
echo " */" ;\
) 2>&1 | tee "$(RELEASE_NAME).buildlog"
sign-release:
+(set -e; \
cd dist; \
+ x=$$(grep '^RELEASE_ARCHIVE=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
+ if [ -z "$$x" ]; then \
+ echo "error: RELEASE_ARCHIVE missing in ~/.gnupg-autogen.rc">&2; \
+ exit 2;\
+ fi;\
+ myarchive="$$x/$(RELEASE_ARCHIVE_SUFFIX)";\
+ x=$$(grep '^RELEASE_SIGNKEY=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
+ if [ -z "$$x" ]; then \
+ echo "error: RELEASE_SIGNKEY missing in ~/.gnupg-autogen.rc">&2; \
+ exit 2;\
+ fi;\
+ mysignkey="$$x";\
release_w32_name="$(RELEASE_W32_STEM_NAME)_$$(date -u +%Y%m%d)" ;\
files1="$(RELEASE_NAME).tar.bz2 \
$${release_w32_name}.tar.xz \
$${release_w32_name}.tar.xz.sig \
$${release_w32_name}.exe.sig \
$${release_w32_name}.exe.swdb" ;\
- files3="$${release_w32_name}.wixlib"; \
+ wixlibfile="$${release_w32_name}.wixlib";\
$(MAKE) -f $(RELEASE_NAME)/build-aux/speedo.mk w32-sign-installer ;\
echo "/* Signing the source tarball ..." ;\
- gpg -sbu $(RELEASE_SIGNING_KEY) $(RELEASE_NAME).tar.bz2 ;\
+ gpg -sbu $$mysignkey $(RELEASE_NAME).tar.bz2 ;\
echo "/* Signing the W32 source tarball ..." ;\
- gpg -sbu $(RELEASE_SIGNING_KEY) $${release_w32_name}.tar.xz ;\
+ gpg -sbu $$mysignkey $${release_w32_name}.tar.xz ;\
echo "/* Signing the W32 installer ..." ;\
- gpg -sbu $(RELEASE_SIGNING_KEY) $${release_w32_name}.exe ;\
+ gpg -sbu $$mysignkey $${release_w32_name}.exe ;\
cat $(RELEASE_NAME).swdb >swdb.snippet;\
- echo '#+macro: gnupg22_branch STABLE-BRANCH-2-2' >>swdb.snippet;\
+ echo '#+macro: gnupg24_branch STABLE-BRANCH-2-4' >>swdb.snippet;\
cat $${release_w32_name}.exe.swdb >>swdb.snippet;\
echo >>swdb.snippet ;\
sha1sum $${files1} >>swdb.snippet ;\
cat "../$(RELEASE_NAME).buildlog" swdb.snippet \
| gzip >$(RELEASE_NAME).buildlog ;\
- echo "Release created - copying it to the local archive ..." ;\
- scp -p $${files1} $${files2} $${files3} $(RELEASE_ARCHIVE_DIR)/ || true;\
+ echo "Release created - copying it to the archive ..." ;\
+ scp -p $${files1} $${files2} $$myarchive/ \
+ || echo "/* Error copying files to the archive - ignored */" ;\
+ if [ -e $${wixlibfile} ]; then\
+ scp -p $${wixlibfile} $$myarchive/ \
+ || echo "/* Error copying wixlib to the archive - ignored. */" ;\
+ fi ;\
echo '/*' ;\
echo ' * All done; for checksums see dist/swdb.snippet' ;\
echo ' */' ;\