From 6f2a0ff4e3fa91ff0aec05266a2d8b3c8abc1ecb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 16 Dec 2022 22:22:08 +0200 Subject: [PATCH 23/23] installer_cross: Always print build errors to stderr Some errors were being printed to stdout See osdn #46127 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 4 ++-- windows/installer_cross/winbuild.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index 4c1d5ae0d2..36d1a9eeda 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -114,7 +114,7 @@ if ! test -d "$DLLSPATH" ; then exit 1 fi -if ! ./winbuild.sh "$DLLSPATH" $GUI ; then +if ! ./winbuild.sh "$DLLSPATH" "$GUI" ; then exit 1 fi @@ -131,7 +131,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/winbuild.sh b/windows/installer_cross/winbuild.sh index b42872646d..72941315f2 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.4 (01-Jun-21) +# Version 2.3.5 (16-Dec-22) -WINBUILD_VERSION="2.3.4" +WINBUILD_VERSION="2.3.5" MIN_WINVER=0x0601 # Windows 7 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