From a56ba89475a7848d585b5f2e0cc0d803fc6060e6 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 16 Dec 2022 22:18:11 +0200
Subject: [PATCH 47/47] installer_cross: Always print build errors to stderr

Some errors were being printed to stdout

See osdn #46127

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_cross/installer_build.sh |  4 ++--
 windows/installer_cross/meson-winbuild.sh  |  8 ++++----
 windows/installer_cross/winbuild.sh        | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh
index 7e16f9c05e..bf1aa3ee62 100755
--- a/windows/installer_cross/installer_build.sh
+++ b/windows/installer_cross/installer_build.sh
@@ -153,7 +153,7 @@ if ! test -d "$DLLSPATH" ; then
   exit 1
 fi
 
-if ! ./winbuild.sh "$DLLSPATH" $GUI ; then
+if ! ./winbuild.sh "$DLLSPATH" "$GUI" ; then
   exit 1
 fi
 
@@ -170,7 +170,7 @@ fi
 
 INSTDIR="freeciv-$SETUP-${VERREV}-${GUI}"
 
-if test "x$GUI" = "xruledit" ; then
+if test "$GUI" = "ruledit" ; then
   if ! make -C build-${SETUP}-${GUI}/translations/ruledit update-po ||
      ! make -C build-${SETUP}-${GUI}/bootstrap langstat_ruledit.txt
   then
diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh
index 23c8c10c74..7e64ede074 100755
--- a/windows/installer_cross/meson-winbuild.sh
+++ b/windows/installer_cross/meson-winbuild.sh
@@ -51,15 +51,15 @@ fi
 
 FLVL=$(grep "CrosserFeatureLevel=" $DLLSPATH/crosser.txt | sed -e 's/CrosserFeatureLevel="//' -e 's/"//')
 
-if test "x$FLVL" != "x$CROSSER_FEATURE_LEVEL" ; then
-  echo "Crosser feature level \"$FLVL\", required \"$CROSSER_FEATURE_LEVEL\"!"
+if test "$FLVL" != "$CROSSER_FEATURE_LEVEL" ; then
+  echo "Crosser feature level \"$FLVL\", required \"$CROSSER_FEATURE_LEVEL\"!" >&2
   exit 1
 fi
 
 CSET=$(grep "CrosserSet=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSet="//' -e 's/"//')
 
-if test "x$CSET" != "xcurrent" ; then
-  echo "Crosser set is \"$CSET\", only \"current\" is supported!"
+if test "$CSET" != "current" ; then
+  echo "Crosser set is \"$CSET\", only \"current\" is supported!" >&2
   exit 1
 fi
 
diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh
index cc01877e18..1aa776de50 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.4.1 (09-Jun-22)
+# Version 2.4.2 (16-Dec-22)
 
-WINBUILD_VERSION="2.4.0"
+WINBUILD_VERSION="2.4.2"
 MIN_WINVER=0x0601 # Windows 7, Qt6-client build overrides this
 CROSSER_FEATURE_LEVEL=2.5
 
@@ -44,15 +44,15 @@ fi
 
 FLVL=$(grep "CrosserFeatureLevel=" $DLLSPATH/crosser.txt | sed -e 's/CrosserFeatureLevel="//' -e 's/"//')
 
-if test "x$FLVL" != "x$CROSSER_FEATURE_LEVEL" ; then
-  echo "Crosser feature level \"$FLVL\", required \"$CROSSER_FEATURE_LEVEL\"!"
+if test "$FLVL" != "$CROSSER_FEATURE_LEVEL" ; then
+  echo "Crosser feature level \"$FLVL\", required \"$CROSSER_FEATURE_LEVEL\"!" >&2
   exit 1
 fi
 
 CSET=$(grep "CrosserSet=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSet="//' -e 's/"//')
 
-if test "x$CSET" != "xcurrent" ; then
-  echo "Crosser set is \"$CSET\", only \"current\" is supported!"
+if test "$CSET" != "current" ; then
+  echo "Crosser set is \"$CSET\", only \"current\" is supported!" >&2
   exit 1
 fi
 
-- 
2.35.1