From 83f5def41761668b0084022e7d56c0fcbea8bbd5 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 21 Jan 2022 03:16:27 +0200
Subject: [PATCH 40/40] installer_cross: Rename qt gui as qt5

See osdn #43619

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../installer_cross/build_all_installers.sh   | 10 +++---
 .../create-freeciv-gtk-qt-nsi.sh              | 31 ++++++++++++-------
 windows/installer_cross/installer_build.sh    | 28 +++++++++++------
 windows/installer_cross/winbuild.sh           | 13 ++++----
 4 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/windows/installer_cross/build_all_installers.sh b/windows/installer_cross/build_all_installers.sh
index e72bb23249..592ed06b79 100755
--- a/windows/installer_cross/build_all_installers.sh
+++ b/windows/installer_cross/build_all_installers.sh
@@ -59,12 +59,12 @@ else
 fi
 
 if test "x$CROSSER_QT5" != "xyes" ; then
-  QT="N/A"
-elif ! ./installer_build.sh $DLLSPATH qt ; then
+  QT5="N/A"
+elif ! ./installer_build.sh $DLLSPATH qt5 ; then
   RET=1
-  QT="Fail"
+  QT5="Fail"
 else
-  QT="Success"
+  QT5="Success"
 fi
 
 # sdl2-client comes with gtk4 modpack installer
@@ -87,7 +87,7 @@ else
 fi
 
 echo "Gtk3.22: $GTK322"
-echo "Qt:      $QT"
+echo "Qt5:     $QT5"
 echo "Sdl2:    $SDL2"
 echo "Ruledit: $RULEDIT"
 
diff --git a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh b/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
index 0e89c69db8..d177731b4e 100755
--- a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
+++ b/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
@@ -1,15 +1,21 @@
 #!/bin/sh
 
-# ./create-freeciv-gtk-qt-nsi.sh <Freeciv files directory> <version> <gtk3.22|qt> <GTK+3|Qt> <win32|win64|win> [mp gui] [unistall setup script]
+# ./create-freeciv-gtk-qt-nsi.sh <Freeciv files directory> <version> <gtk3.22|qt5> <GTK+3|Qt5> <win32|win64|win> [mp gui] [exe id] [unistall setup script]
+
+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
 
-if test "x$7" != "x" && ! test -x "$7" ; then
-  echo "$7 not an executable script" >&2
+if test "x$8" != "x" && ! test -x "$8" ; then
+  echo "$8 not an executable script" >&2
   exit 1
 fi
 
@@ -23,7 +29,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}"
@@ -120,12 +127,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
 
@@ -284,7 +291,7 @@ Function HelperScriptFunction
 FunctionEnd
 
 Function RunFreeciv
-  nsExec::Exec '"\$INSTDIR\freeciv-\${GUI_ID}.cmd" \$DefaultLanguageCode'
+  nsExec::Exec '"\$INSTDIR\freeciv-\${EXE_ID}.cmd" \$DefaultLanguageCode'
 FunctionEnd
 
 EOF
@@ -322,8 +329,8 @@ do
 echo "  RMDir \"\$INSTDIR$name\"" | sed 's,/,\\,g'
 done
 
-if test "x$7" != "x" ; then
-  $7
+if test "x$8" != "x" ; then
+  $8
 fi
 
 cat <<EOF
diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh
index 3a068a5fad..1d0530aa2f 100755
--- a/windows/installer_cross/installer_build.sh
+++ b/windows/installer_cross/installer_build.sh
@@ -71,7 +71,7 @@ add_sdl2_env() {
   cp $1/bin/libtiff-5.dll $2/
 }
 
-add_qt_env() {
+add_qt5_env() {
   cp -R $1/plugins $2/ &&
   cp $1/bin/Qt5Core.dll $2/ &&
   cp $1/bin/Qt5Gui.dll $2/ &&
@@ -109,8 +109,9 @@ case $GUI in
     GUINAME="GTK3.22"
     MPGUI="gtk3"
     FCMP="gtk3" ;;
-  qt)
+  qt5)
     GUINAME="Qt"
+    CLIENT="qt"
     MPGUI="qt"
     FCMP="qt" ;;
   sdl2)
@@ -126,6 +127,10 @@ case $GUI in
     exit 1 ;;
 esac
 
+if test "x$CLIENT" = "x" ; then
+  CLIENT="$GUI"
+fi
+
 if ! test -d "$DLLSPATH" ; then
   echo "Dllstack directory \"$DLLSPATH\" not found!" >&2
   exit 1
@@ -187,8 +192,8 @@ if test "x$GUI" = "xruledit" ; then
     exit 1
   fi
 
-  if ! add_qt_env $DLLSPATH $INSTDIR ; then
-    echo "Copying Qt environment failed!" >&2
+  if ! add_qt5_env $DLLSPATH $INSTDIR ; then
+    echo "Copying Qt5 environment failed!" >&2
     exit 1
   fi
 
@@ -204,7 +209,7 @@ if test "x$GUI" = "xruledit" ; then
     exit 1
   fi
 else
-  if ! cp freeciv-server.cmd freeciv-$GUI.cmd freeciv-mp-$FCMP.cmd $INSTDIR/
+  if ! cp freeciv-server.cmd freeciv-$CLIENT.cmd freeciv-mp-$FCMP.cmd $INSTDIR/
   then
     echo "Adding cmd-files failed!" >&2
     exit 1
@@ -230,14 +235,14 @@ else
         echo "Copying SDL2 environment failed!" >&2
         exit 1
       fi ;;
-    qt)
+    qt5)
       if ! cp freeciv-ruledit.cmd $INSTDIR/
       then
         echo "Adding cmd-file failed!" >&2
         exit 1
       fi
-      if ! add_qt_env $DLLSPATH $INSTDIR ; then
-        echo "Copying Qt environment failed!" >&2
+      if ! add_qt5_env $DLLSPATH $INSTDIR ; then
+        echo "Copying Qt5 environment failed!" >&2
         exit 1
       fi ;;
     gtk4)
@@ -254,13 +259,18 @@ else
       exit 1
     fi
   else
+    if test "x$GUI" = "xqt5" ; then
+      EXE_ID="qt"
+    else
+      EXE_ID="$GUI"
+    fi
     if test "x$GUI" = "xgtk3.22" || test "x$GUI" = "xgtk4" ; then
       UNINSTALLER="helpers/uninstaller-helper-gtk3.sh"
     else
       UNINSTALLER=""
     fi
     if ! ./create-freeciv-gtk-qt-nsi.sh $INSTDIR $VERREV $GUI $GUINAME \
-         $SETUP $MPGUI $UNINSTALLER > Freeciv-$SETUP-$VERREV-$GUI.nsi
+         $SETUP $MPGUI $EXE_ID $UNINSTALLER > Freeciv-$SETUP-$VERREV-$GUI.nsi
     then
       exit 1
     fi
diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh
index b2751d3be6..022b287589 100755
--- a/windows/installer_cross/winbuild.sh
+++ b/windows/installer_cross/winbuild.sh
@@ -7,9 +7,9 @@
 # This script is licensed under Gnu General Public License version 2 or later.
 # See COPYING available from the same location you got this script.
 
-# Version 2.3.5 (13-Jan-22)
+# Version 2.3.6 (21-Jan-22)
 
-WINBUILD_VERSION="2.3.5"
+WINBUILD_VERSION="2.3.6"
 MIN_WINVER=0x0601 # Windows 7
 CROSSER_FEATURE_LEVEL=2.2
 
@@ -70,19 +70,20 @@ elif test "x$2" != "x" ; then
   SINGLE_GUI=true
   GUIP="-$2"
   SERVER="yes"
-  if test "x$2" = "xqt" ; then
+  if test "x$2" = "xqt5" ; then
     RULEDIT="yes"
+    CLIENTS="qt"
   else
     RULEDIT="no"
+    CLIENTS="$2"
   fi
-  CLIENTS="$2"
   case $2 in
     gtk3) FCMP="gtk3" ;;
     sdl2) FCMP="gtk4" ;;
     gtk3.22) FCMP="gtk3" ;;
     gtk4) FCMP="gtk4" ;;
-    qt) FCMP="qt"
-        NLS="--disable-nls" ;;
+    qt5) FCMP="qt"
+         NLS="--disable-nls" ;;
     *) echo "Unknown gui \"$2\"!" >&2
        exit 1 ;;
   esac
-- 
2.34.1