Author: cazfi
Date: Sat Jan 21 21:34:18 2017
New Revision: 34881
URL: http://svn.gna.org/viewcvs/freeciv?rev=34881&view=rev
Log:
Require crosser-1.2 for crosser based builds.
See patch #8078
Modified:
trunk/windows/installer_cross/winbuild.sh
Modified: trunk/windows/installer_cross/winbuild.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/winbuild.sh?rev=34881&r1=34880&r2=34881&view=diff
==============================================================================
--- trunk/windows/installer_cross/winbuild.sh (original)
+++ trunk/windows/installer_cross/winbuild.sh Sat Jan 21 21:34:18 2017
@@ -7,10 +7,11 @@
# 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.0 (31-Oct-16)
+# Version 2.1 (17-Jan-17)
-WINBUILD_VERSION="2.0"
+WINBUILD_VERSION="2.1"
MIN_WINVER=0x0600 # Vista
+CROSSER_FEATURE_LEVEL=1.2
if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then
echo "Usage: $0 <crosser dir>"
@@ -38,6 +39,13 @@
VERREV="$(../../fc_version)-r$(cd ../.. && svn info | grep Revision | sed
's/Revision: //')"
else
VERREV="$(../../fc_version)"
+fi
+
+FLVL=$(grep "FeatureLevel=" $DLLSPATH/crosser.txt | sed -e
's/FeatureLevel="//' -e 's/"//')
+
+if test "x$FLVL" != "x$CROSSER_FEATURE_LEVEL" ; then
+ echo "Crosser feature level \"$FLVL\", required \"$CROSSER_FEATURE_LEVEL\"!"
+ exit 1
fi
SETUP=$(grep "Setup=" $DLLSPATH/crosser.txt | sed -e 's/Setup="//' -e 's/"//')
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
