Author: cazfi
Date: Wed Feb 8 05:52:49 2017
New Revision: 34992
URL: http://svn.gna.org/viewcvs/freeciv?rev=34992&view=rev
Log:
Added gui type specific part to the filenames created by winbuild.sh
See gna patch #8105
Modified:
trunk/windows/installer_cross/installer_build.sh
trunk/windows/installer_cross/winbuild.sh
Modified: trunk/windows/installer_cross/installer_build.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/installer_build.sh?rev=34992&r1=34991&r2=34992&view=diff
==============================================================================
--- trunk/windows/installer_cross/installer_build.sh (original)
+++ trunk/windows/installer_cross/installer_build.sh Wed Feb 8 05:52:49 2017
@@ -41,14 +41,14 @@
VERREV="$(../../fc_version)"
fi
-INSTDIR="freeciv-$SETUP-$VERREV"
+INSTDIR="freeciv-$SETUP-${VERREV}-${GUI}"
if test "x$GUI" = "xruledit" ; then
- make -C build-$SETUP/translations/ruledit update-po
- make -C build-$SETUP/bootstrap langstat_ruledit.txt
+ make -C build-${SETUP}-${GUI}/translations/ruledit update-po
+ make -C build-${SETUP}-${GUI}/bootstrap langstat_ruledit.txt
else
- make -C build-$SETUP/translations/core update-po
- make -C build-$SETUP/bootstrap langstat_core.txt
+ make -C build-${SETUP}-${GUI}/translations/core update-po
+ make -C build-${SETUP}-${GUI}/bootstrap langstat_core.txt
fi
mv $INSTDIR/bin/* $INSTDIR/
Modified: trunk/windows/installer_cross/winbuild.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/winbuild.sh?rev=34992&r1=34991&r2=34992&view=diff
==============================================================================
--- trunk/windows/installer_cross/winbuild.sh (original)
+++ trunk/windows/installer_cross/winbuild.sh Wed Feb 8 05:52:49 2017
@@ -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 (26-Jan-17)
+# Version 2.3.1 (02-Feb-17)
-WINBUILD_VERSION="2.3"
+WINBUILD_VERSION="2.3.1"
MIN_WINVER=0x0600 # Vista
CROSSER_FEATURE_LEVEL=1.2
@@ -52,12 +52,14 @@
if test "x$2" = "xruledit" ; then
SINGLE_GUI=true
+ GUIP="-ruledit"
RULEDIT="yes"
CLIENTS="no"
FCMP="no"
SERVER="no"
elif test "x$2" != "x" ; then
SINGLE_GUI=true
+ GUIP="-$2"
SERVER="yes"
if test "x$2" = "xqt" ; then
RULEDIT="yes"
@@ -74,12 +76,13 @@
exit 1 ;;
esac
else
+ GUIP=""
SERVER="yes"
RULEDIT="yes"
fi
-if ! mkdir -p build-$SETUP ; then
- echo "Can't create build directory \"build-$SETUP\"!" >&2
+if ! mkdir -p build-$SETUP$GUIP ; then
+ echo "Can't create build directory \"build-$SETUP$GUIP\"!" >&2
exit 1
fi
@@ -121,10 +124,10 @@
exit 1
fi
-INSTALL_DIR="$(pwd)/freeciv-${VERREV}"
+INSTALL_DIR="$(pwd)/freeciv-${VERREV}${GUIP}"
if ! (
-cd build-$SETUP
+cd build-$SETUP$GUIP
if ! ../../../configure CPPFLAGS="-I${DLLSPATH}/include
-D_WIN32_WINNT=${MIN_WINVER}" CFLAGS="-Wno-error"
PKG_CONFIG_LIBDIR="${DLLSPATH}/lib/pkgconfig" --enable-sys-tolua-cmd
--with-magickwand="${DLLSPATH}/bin" --prefix="/" --enable-client=$CLIENTS
--enable-fcmp=$FCMP --enable-svnrev --enable-debug --host=$TARGET
--build=$(../../../bootstrap/config.guess) --with-libiconv-prefix=${DLLSPATH}
--with-sqlite3-prefix=${DLLSPATH} --with-followtag="crosser" --enable-crosser
--enable-ai-static=classic --disable-freeciv-manual --enable-sdl-mixer=sdl2
--with-qt5-includes=${DLLSPATH}/include --with-qt5-libs=${DLLSPATH}/lib
--with-tinycthread --enable-server=$SERVER --enable-ruledit=$RULEDIT
then
@@ -146,7 +149,7 @@
exit 1
fi
-if ! 7z a -r freeciv-${VERREV}.7z freeciv-${VERREV}
+if ! 7z a -r freeciv-${VERREV}${GUIP}.7z freeciv-${VERREV}${GUIP}
then
echo "7z failed" >&2
exit 1
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
