From 734940c29136ebb9e281d6308513547c6e324ed2 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 21 Apr 2023 19:16:27 +0300
Subject: [PATCH 16/16] installer_cross meson: Move .nsi files under meson/

See osdn #47893

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../installer_cross/meson-installer_build.sh  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/windows/installer_cross/meson-installer_build.sh b/windows/installer_cross/meson-installer_build.sh
index 643bf9f652..7ae10aad82 100755
--- a/windows/installer_cross/meson-installer_build.sh
+++ b/windows/installer_cross/meson-installer_build.sh
@@ -191,6 +191,13 @@ if ! add_common_env "$DLLSPATH" "$INSTDIR" ; then
   exit 1
 fi
 
+NSI_DIR="meson/nsi"
+
+if ! mkdir -p "$NSI_DIR" ; then
+  echo "Creating \"$NSI_DIR\" directory failed" >&2
+  exit 1
+fi
+
 if test "$GUI" = "ruledit" ; then
   if ! cp freeciv-ruledit.cmd "$INSTDIR"
   then
@@ -202,11 +209,11 @@ if test "$GUI" = "ruledit" ; then
     exit 1
   fi
 
-  NSIFILE="meson-freeciv-ruledit-$SETUP-$VERREV.nsi"
+  NSI_FILE="${NSI_DIR}/ruledit-${SETUP}-${VERREV}.nsi"
 
   if ! ./create-freeciv-ruledit-nsi.sh \
          "$INSTDIR" "meson/Output" "$VERREV" "$SETUP" \
-           > "$NSIFILE"
+           > "$NSI_FILE"
   then
     exit 1
   fi
@@ -283,12 +290,12 @@ else
     UNINSTALLER=""
   fi
 
-  NSIFILE="meson-freeciv-$SETUP-$VERREV-$GUI.nsi"
+  NSI_FILE="${NSI_DIR}/client-${SETUP}-${VERREV}-${GUI}.nsi"
 
   if test "$GUI" = "sdl2" ; then
     if ! ./create-freeciv-sdl2-nsi.sh \
            "$INSTDIR" "meson/Output" "$VERREV" "$SETUP" "$UNINSTALLER" \
-             > "$NSIFILE"
+             > "$NSI_FILE"
     then
       exit 1
     fi
@@ -296,7 +303,7 @@ else
     if ! ./create-freeciv-gtk-qt-nsi.sh \
            "$INSTDIR" "meson/Output" "$VERREV" "$GUI" "$GUINAME" \
            "$SETUP" "$MPGUI" "$EXE_ID" "$UNINSTALLER" \
-             > "$NSIFILE"
+             > "$NSI_FILE"
     then
       exit 1
     fi
@@ -308,7 +315,7 @@ if ! mkdir -p meson/Output ; then
   exit 1
 fi
 
-if ! makensis "$NSIFILE"
+if ! makensis -NOCD "$NSI_FILE"
 then
   echo "Creating installer failed!" >&2
   exit 1
-- 
2.39.2