From b31e406b7134ae1fd470e07eb043cb99261aa104 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 7 Feb 2022 02:39:41 +0200
Subject: [PATCH 42/42] installer_cross: Add Qt6-client installer build support

See osdn #43799

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

diff --git a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh b/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
index d177731b4e..d3695f5331 100755
--- a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
+++ b/windows/installer_cross/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] [unistall setup script]
+# ./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] [unistall setup script]
 
 if test "x$7" != "x" ; then
   EXE_ID="$7"
@@ -132,7 +132,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_cross/installer_build.sh b/windows/installer_cross/installer_build.sh
index 1d0530aa2f..b6f28044ec 100755
--- a/windows/installer_cross/installer_build.sh
+++ b/windows/installer_cross/installer_build.sh
@@ -81,6 +81,15 @@ add_qt5_env() {
   cp ./helpers/installer-helper-qt.cmd $2/bin/installer-helper.cmd
 }
 
+add_qt6_env() {
+  cp -R $1/plugins $2/ &&
+  cp $1/bin/Qt6Core.dll $2/ &&
+  cp $1/bin/Qt6Gui.dll $2/ &&
+  cp $1/bin/Qt6Widgets.dll $2/ &&
+  mkdir -p $2/bin &&
+  cp ./helpers/installer-helper-qt.cmd $2/bin/installer-helper.cmd
+}
+
 add_common_env() {
   cp $1/bin/libcurl-4.dll $2/ &&
   cp $1/bin/liblzma-5.dll $2/ &&
@@ -110,7 +119,12 @@ case $GUI in
     MPGUI="gtk3"
     FCMP="gtk3" ;;
   qt5)
-    GUINAME="Qt"
+    GUINAME="Qt5"
+    CLIENT="qt"
+    MPGUI="qt"
+    FCMP="qt" ;;
+  qt6)
+    GUINAME="Qt6"
     CLIENT="qt"
     MPGUI="qt"
     FCMP="qt" ;;
@@ -245,6 +259,16 @@ else
         echo "Copying Qt5 environment failed!" >&2
         exit 1
       fi ;;
+    qt6)
+      if ! cp freeciv-ruledit.cmd $INSTDIR/
+      then
+        echo "Adding cmd-file failed!" >&2
+        exit 1
+      fi
+      if ! add_qt6_env $DLLSPATH $INSTDIR ; then
+        echo "Copying Qt6 environment failed!" >&2
+        exit 1
+      fi ;;
     gtk4)
       if ! add_gtk4_env $DLLSPATH $INSTDIR ; then
         echo "Copying gtk4 environment failed!" >&2
@@ -259,7 +283,7 @@ else
       exit 1
     fi
   else
-    if test "x$GUI" = "xqt5" ; then
+    if test "x$GUI" = "xqt5" || test "x$GUI" = "xqt6" ; then
       EXE_ID="qt"
     else
       EXE_ID="$GUI"
-- 
2.34.1