summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2023-05-30 17:38:27 +0200
committerWerner Koch <wk@gnupg.org>2023-05-30 17:38:27 +0200
commitc8f6fdcd359ac22466db880b5f13e272dcd65a8b (patch)
tree6c74968b3bed276a9615b1c6971b0fec0615dbfc
parentPost release updates (diff)
downloadgnupg2-c8f6fdcd359ac22466db880b5f13e272dcd65a8b.tar.xz
gnupg2-c8f6fdcd359ac22466db880b5f13e272dcd65a8b.zip
build: Always build the wixlib with a release
-- Forgot it today again; better do it by default. Also disable sslsigncode verify due to missing certificate problem (for signing we use Scute).
-rw-r--r--Makefile.am4
-rw-r--r--build-aux/speedo.mk6
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 0f2075089..1cd009811 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,8 @@
## 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
+# We want to also build the wixlib for use by GnuPG Desktop
+WITH_MSI=1
# Location of the released tarball archives. This is prefixed by
# the variable RELEASE_ARCHIVE in ~/.gnupg-autogen.rc. For example:
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index db78afa50..170c20b79 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -1543,10 +1543,8 @@ sign-installer:
if [ -f "$${msifile}" ]; then \
$(call MKSWDB_commands,$${msifile},$${reldate},"wixlib_"); \
fi; \
- echo "speedo: /*" ;\
- echo "speedo: * Verification result" ;\
- echo "speedo: */" ;\
- osslsigncode verify $${exefile} \
+ echo "speedo: /* (osslsigncode verify disabled) */" ;\
+ echo osslsigncode verify $${exefile} \
)