Imported Upstream version 2.3.1

[platform/upstream/gpg2.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f3aa206..06a9a66 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,10 +18,13 @@
 
 ## Process this file with automake to produce Makefile.in
 
+# To include the wixlibs for building an MSI installer in a release use
+#   make release WITH_MSI=1
+
 # 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.2
+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
@@ -29,6 +32,7 @@ RELEASE_ARCHIVE_SUFFIX  = gnupg/v2.2
 
 # Autoconf flags.
 ACLOCAL_AMFLAGS = -I m4
+AM_DISTCHECK_DVI_TARGET = pdf
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \
   --enable-all-tests --enable-g13 \
   --enable-gpgtar --enable-wks-tools --disable-ntbtls
@@ -58,7 +62,6 @@ EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \
              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
 
 
@@ -104,10 +107,15 @@ tests =
 else
 tests = tests
 endif
+if BUILD_TPM2D
+tpm2d = tpm2d
+else
+tpm2d =
+endif
 
 SUBDIRS = m4 common regexp kbx \
           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
-          tools po ${doc} ${tests}
+          tools po ${doc} ${tests} ${tpm2d}
 
 dist_doc_DATA = README
 
@@ -116,7 +124,7 @@ dist-hook: gen-ChangeLog
 
 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}" ;\
@@ -185,24 +193,27 @@ release:
           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; \
-         test $$(pwd | sed 's,.*/,,') = dist || cd dist; \
+         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; \
@@ -225,8 +236,7 @@ sign-release:
                  $${release_w32_name}.tar.xz.sig \
                  $${release_w32_name}.exe.sig    \
                  $${release_w32_name}.exe.swdb" ;\
-         files3="$${release_w32_name}.wixlib \
-                 $${release_w32_name}.wixlib.sig"; \
+          wixlibfile="$${release_w32_name}.wixlib";\
          $(MAKE) -f $(RELEASE_NAME)/build-aux/speedo.mk w32-sign-installer ;\
          echo "/* Signing the source tarball ..." ;\
          gpg -sbu $$mysignkey $(RELEASE_NAME).tar.bz2 ;\
@@ -234,18 +244,20 @@ sign-release:
          gpg -sbu $$mysignkey $${release_w32_name}.tar.xz ;\
          echo "/* Signing the W32 installer ..." ;\
          gpg -sbu $$mysignkey $${release_w32_name}.exe ;\
-         echo "/* Signing the Wixlib ..." ;\
-         gpg -sbu $$mysignkey $${release_w32_name}.wixlib ;\
          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 archive ..." ;\
-         scp -p $${files1} $${files2} $${files3} $$myarchive/ \
+         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 ' */' ;\