From 8ca6787ac77e83879fd65ac0848df1f8699dcfda Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 26 Jan 2022 18:57:46 +0200
Subject: [PATCH 34/34] Msys2: Make .nsi creation scripts Qt5/Qt6 specific

See osdn #43701

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/Makefile.am                                          | 3 ++-
 windows/installer_msys2/Makefile                             | 2 +-
 windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh         | 4 ++--
 .../{create-freeciv-qt-nsi.sh => create-freeciv-qt5-nsi.sh}  | 0
 windows/installer_msys2/create-freeciv-qt6-nsi.sh            | 5 +++++
 5 files changed, 10 insertions(+), 4 deletions(-)
 rename windows/installer_msys2/{create-freeciv-qt-nsi.sh => create-freeciv-qt5-nsi.sh} (100%)
 create mode 100644 windows/installer_msys2/create-freeciv-qt6-nsi.sh

diff --git a/windows/Makefile.am b/windows/Makefile.am
index 90794cc459..ed4f2d18af 100644
--- a/windows/Makefile.am
+++ b/windows/Makefile.am
@@ -12,7 +12,8 @@ dist_noinst_DATA = \
 		installer_msys2/licenses/COPYING.installer	\
 		installer_msys2/create-freeciv-gtk-qt-nsi.sh	\
 		installer_msys2/create-freeciv-gtk3.22-nsi.sh	\
-		installer_msys2/create-freeciv-qt-nsi.sh	\
+		installer_msys2/create-freeciv-qt5-nsi.sh	\
+		installer_msys2/create-freeciv-qt6-nsi.sh	\
 		installer_msys2/create-freeciv-sdl2-nsi.sh	\
 		installer_msys2/create-freeciv-ruledit-nsi.sh	\
 		installer_msys2/freeciv-gtk3.22.cmd		\
diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile
index 9de2133506..9b9f7cbc1c 100644
--- a/windows/installer_msys2/Makefile
+++ b/windows/installer_msys2/Makefile
@@ -522,7 +522,7 @@ installer-common: clean-install-common install-freeciv-$(GUI) install-env-$(GUI)
 	# extract Freeciv version
 	$(eval FREECIV_VERSION := $(shell ../../fc_version))
 	# create NSIS script
-	./create-freeciv-$(CLIENT)-nsi.sh install-$(WINARCH)-$(GUI) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi
+	./create-freeciv-$(GUI)-nsi.sh install-$(WINARCH)-$(GUI) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi
 	# create installer executable
 	mkdir -p Output
 	makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi
diff --git a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
index 3f1f4cf2e2..49610dfb6a 100644
--- a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
+++ b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# ./create-freeciv-gtk-qt-nsi.sh <Freeciv files directory> <version> <gtk3.22|qt5> <GTK+3|Qt5> <win32|win64|win> [mp gui] [exe id]
+# ./create-freeciv-gtk-qt-nsi.sh <Freeciv files directory> <version> <gtk3.22|qt5|qt6> <GTK+3|Qt5|Qt6> <win32|win64|win> [mp gui] [exe id]
 
 if test "x$7" != "x" ; then
   EXE_ID="$7"
@@ -125,7 +125,7 @@ cat <<EOF
   CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Modpack Installer.lnk" "\$INSTDIR\freeciv-mp-\${MPEXE_ID}.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-mp-\${MPEXE_ID}.exe" 0 SW_SHOWMINIMIZED
 EOF
 
-if test "x$3" = "xqt5" ; then
+if test "x$3" = "xqt5" || test "x$3" = "xqt6" ; then
     echo "CreateShortCut \"\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Ruleset Editor.lnk\" \"\$INSTDIR\freeciv-ruledit.cmd\" \"\$DefaultLanguageCode\" \"\$INSTDIR\freeciv-ruledit.exe\" 0 SW_SHOWMINIMIZED"
 fi
 
diff --git a/windows/installer_msys2/create-freeciv-qt-nsi.sh b/windows/installer_msys2/create-freeciv-qt5-nsi.sh
similarity index 100%
rename from windows/installer_msys2/create-freeciv-qt-nsi.sh
rename to windows/installer_msys2/create-freeciv-qt5-nsi.sh
diff --git a/windows/installer_msys2/create-freeciv-qt6-nsi.sh b/windows/installer_msys2/create-freeciv-qt6-nsi.sh
new file mode 100644
index 0000000000..a979616a06
--- /dev/null
+++ b/windows/installer_msys2/create-freeciv-qt6-nsi.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# ./create-freeciv-qt-nsi.sh <Freeciv files directory> <version>
+
+./create-freeciv-gtk-qt-nsi.sh $1 $2 "qt6" "Qt6" $3 "" "qt"
-- 
2.34.1