From 1d84604ae11c19a4b503d9116a1664318850fd06 Mon Sep 17 00:00:00 2001
From: Christian Hohnstaedt <christian@hohnstaedt.de>
Date: Wed, 29 Jan 2020 21:15:28 +0100
Subject: [PATCH] Improve windows build targets and release script

---
 Makefile          | 13 +++++++------
 git.release       |  2 +-
 misc/build-w32.sh |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a3533201..16283b9d 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ OSSLSIGN_OPT=sign -askpass -certs ~/osdch.crt -askpass \
 MAKENSIS=makensis
 
 ifeq ($(SUFFIX), .exe)
-all: xca-portable.zip
+all: xca-portable.zip msi-installer-dir.zip
 else
 ifneq ($(MACDEPLOYQT),)
 all: $(MACTARGET).dmg
@@ -102,8 +102,8 @@ clean:
 	rm -f ui/ui_*.h lang/xca_*.qm doc/*.html doc/xca.1.gz img/imgres.cpp
 	rm -f lang/*.xml lang/.build-stamp misc/dn.txt misc/eku.txt
 	rm -f commithash.h misc/oids.txt
-	rm -f xca$(SUFFIX) setup_xca*.exe *.dmg xca-portable*.zip xca*.msi
-	rm -rf xca-$(VERSION)*
+	rm -f xca$(SUFFIX) *.dmg xca-portable*.zip msi-installer-dir*.zip xca*.msi
+	rm -rf xca-$(VERSION)* msi-installer-dir-$(VERSION)* xca-portable-$(VERSION)*
 
 distclean: clean
 	rm -f local.h Local.mak config.log config.status misc/Info.plist
@@ -142,7 +142,7 @@ xca$(SUFFIX).signed: xca$(SUFFIX)
 	  mv "$<" "$@"; \
 	fi
 
-msi-installer_dir: misc/xca.wxs misc/xca.bat misc/variables.wxi img/banner.bmp img/dialog.bmp img/key.ico misc/copyright.rtf
+msi-installer-dir-$(VERSION): misc/xca.wxs misc/xca.bat misc/variables.wxi img/banner.bmp img/dialog.bmp img/key.ico misc/copyright.rtf
 	rm -f $@/* && mkdir -p $@ && cp -ra $^ $@
 
 xca-portable-$(VERSION): xca$(SUFFIX).signed do.doc do.lang do.misc
@@ -164,7 +164,8 @@ xca-portable-$(VERSION): xca$(SUFFIX).signed do.doc do.lang do.misc
 
 
 xca-portable.zip: xca-portable-$(VERSION).zip
-xca-portable-$(VERSION).zip: xca-portable-$(VERSION)
+msi-installer-dir.zip: msi-installer-dir-$(VERSION).zip
+%-$(VERSION).zip: %-$(VERSION)
 	zip -r $@ $^
 
 $(DMGSTAGE): xca$(SUFFIX)
@@ -197,7 +198,7 @@ trans:
 	lupdate -locations relative $(TOPDIR)/xca.pro
 	$(MAKE) -C lang xca.pot
 
-.PHONY: $(SUBDIRS) $(INSTDIR) xca.app setup.exe doc lang macdeployqt/macdeployqt $(DMGSTAGE) commithash.h xca-portable.zip
+.PHONY: $(SUBDIRS) $(INSTDIR) xca.app doc lang macdeployqt/macdeployqt $(DMGSTAGE) commithash.h xca-portable.zip msi-installer-dir.zip
 
 do.doc do.lang headers: local.h
 
diff --git a/git.release b/git.release
index 5fe4f1b4..3cd3546d 100755
--- a/git.release
+++ b/git.release
@@ -70,7 +70,7 @@ cp xca-$TVERSION.tar.gz "$releasedir"
 (
   cd ..
   "./xca-$TVERSION/misc/build-w32.sh"
-  cp "xca-portable-${TVERSION}.zip" "$releasedir"
+  cp "xca-portable-${TVERSION}.zip" msi-installer-dir-${TVERSION}.zip "$releasedir"
 )
 
 ls -la  "$releasedir"
diff --git a/misc/build-w32.sh b/misc/build-w32.sh
index 5af0d8e0..9ed84407 100755
--- a/misc/build-w32.sh
+++ b/misc/build-w32.sh
@@ -49,7 +49,7 @@ do_XCA()
   cd $XCA_BUILD
   $XCA_DIR/configure --host ${HOST} --with-qt=${INSTALL_DIR}/../qt/5.12.0
   make -j5 USE_HOSTTOOLS=no
-  cp xca-portable*.zip ..
+  cp xca-portable*.zip msi-installer-dir*.zip ..
 )}
 
 XCA_BUILD="`pwd`"/xca_build