From b456238b4cd507385692bf391aab3ed0a729b59c Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 14 Jan 2022 21:29:18 +0200
Subject: [PATCH 42/42] Msys2: Rename "qt" installer package as "qt5"

See osdn #43621

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_msys2/Makefile              |  2 +-
 .../create-freeciv-gtk-qt-nsi.sh              | 23 ++++++++++++-------
 .../installer_msys2/create-freeciv-qt-nsi.sh  |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile
index 9f6a4033bb..9de2133506 100644
--- a/windows/installer_msys2/Makefile
+++ b/windows/installer_msys2/Makefile
@@ -581,7 +581,7 @@ clean-install-ruledit-qt6:
 	./cleanup_checkout.sh ../..
 
 clean-installer-common:
-	rm -f Output/Freeciv-*-$(CLIENT)-setup.exe
+	rm -f Output/Freeciv-*-$(GUI)-setup.exe
 	rm -f Freeciv-*-$(GUI).nsi
 
 clean-installer-ruledit-qt5:
diff --git a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
index 0f04b76da8..3f1f4cf2e2 100644
--- a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
+++ b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
@@ -1,11 +1,17 @@
 #!/bin/sh
 
-# ./create-freeciv-gtk-qt-nsi.sh <Freeciv files directory> <version> <gtk3.22|qt> <GTK+3|Qt> <win32|win64|win> [mp gui]
+# ./create-freeciv-gtk-qt-nsi.sh <Freeciv files directory> <version> <gtk3.22|qt5> <GTK+3|Qt5> <win32|win64|win> [mp gui] [exe id]
+
+if test "x$7" != "x" ; then
+  EXE_ID="$7"
+else
+  EXE_ID="$3"
+fi
 
 if test "x$6" != "x" ; then
-  MPGUI_ID="$6"
+  MPEXE_ID="$6"
 else
-  MPGUI_ID="$3"
+  MPEXE_ID="$EXE_ID"
 fi
 
 cat <<EOF
@@ -18,7 +24,8 @@ SetCompressor /SOLID lzma
 !define APPNAME "Freeciv"
 !define VERSION $2
 !define GUI_ID $3
-!define MPGUI_ID $MPGUI_ID
+!define EXE_ID $EXE_ID
+!define MPEXE_ID $MPEXE_ID
 !define GUI_NAME $4
 !define WIN_ARCH $5
 !define APPID "\${APPNAME}-\${VERSION}-\${GUI_ID}"
@@ -113,12 +120,12 @@ cat <<EOF
 
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
   CreateDirectory "\$SMPROGRAMS\\\$STARTMENU_FOLDER"
-  CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv.lnk" "\$INSTDIR\freeciv-\${GUI_ID}.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-\${GUI_ID}.exe" 0 SW_SHOWMINIMIZED
+  CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv.lnk" "\$INSTDIR\freeciv-\${EXE_ID}.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-\${EXE_ID}.exe" 0 SW_SHOWMINIMIZED
   CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Server.lnk" "\$INSTDIR\freeciv-server.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-server.exe" 0 SW_SHOWMINIMIZED
-  CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Modpack Installer.lnk" "\$INSTDIR\freeciv-mp-\${MPGUI_ID}.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-mp-\${MPGUI_ID}.exe" 0 SW_SHOWMINIMIZED
+  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" = "xqt" ; then
+if test "x$3" = "xqt5" ; then
     echo "CreateShortCut \"\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Ruleset Editor.lnk\" \"\$INSTDIR\freeciv-ruledit.cmd\" \"\$DefaultLanguageCode\" \"\$INSTDIR\freeciv-ruledit.exe\" 0 SW_SHOWMINIMIZED"
 fi
 
@@ -276,7 +283,7 @@ cat <<EOF
 FunctionEnd
 
 Function RunFreeciv
-  nsExec::Exec '"\$INSTDIR\freeciv-\${GUI_ID}.cmd" \$DefaultLanguageCode'
+  nsExec::Exec '"\$INSTDIR\freeciv-\${EXE_ID}.cmd" \$DefaultLanguageCode'
 FunctionEnd
 
 EOF
diff --git a/windows/installer_msys2/create-freeciv-qt-nsi.sh b/windows/installer_msys2/create-freeciv-qt-nsi.sh
index 9aa97e460e..ad74a13297 100644
--- a/windows/installer_msys2/create-freeciv-qt-nsi.sh
+++ b/windows/installer_msys2/create-freeciv-qt-nsi.sh
@@ -2,4 +2,4 @@
 
 # ./create-freeciv-qt-nsi.sh <Freeciv files directory> <version>
 
-./create-freeciv-gtk-qt-nsi.sh $1 $2 "qt" "Qt" $3
+./create-freeciv-gtk-qt-nsi.sh $1 $2 "qt5" "Qt5" $3 "" "qt"
-- 
2.34.1