Author: cazfi
Date: Sat Nov 19 03:32:47 2016
New Revision: 34561

URL: http://svn.gna.org/viewcvs/freeciv?rev=34561&view=rev
Log:
Winbuild.sh now errors out all the way when build fails.

See bug #25308

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=34561&r1=34560&r2=34561&view=diff
==============================================================================
--- trunk/windows/installer_cross/winbuild.sh   (original)
+++ trunk/windows/installer_cross/winbuild.sh   Sat Nov 19 03:32:47 2016
@@ -81,7 +81,7 @@
 
 INSTALL_DIR="$(pwd)/freeciv-${VERREV}"
 
-(
+if ! (
 cd build-$SETUP
 
 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
@@ -100,7 +100,9 @@
   echo "Storing fc_config.h failed" >&2
   exit 1
 fi
-)
+) then
+  exit 1
+fi
 
 if ! 7z a -r freeciv-${VERREV}.7z freeciv-${VERREV}
 then


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to