From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 13 Jun 2018 20:01:44 +0000 (+0200)
Subject: Add a way to not compile d0_blind_id (./all compile -1).
X-Git-Tag: xonotic-v0.8.5~160
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=06ce68022c300cccc41414a18323f6c837eac1ca;p=xonotic%2Fxonotic.git

Add a way to not compile d0_blind_id (./all compile -1).
---

diff --git a/misc/infrastructure/transifex.cron b/misc/infrastructure/transifex.cron
index d18ba320..1e5b08fe 100755
--- a/misc/infrastructure/transifex.cron
+++ b/misc/infrastructure/transifex.cron
@@ -16,6 +16,7 @@ git reset --hard origin/master
 # Mode parameter:
 #   po:  just update the translations.
 #   all: also update the translation template. Will create a new commit every time, as the date header changes.
+export BATCH=true
 sh tx.sh po
 
 if [ x"`git ls-files -dm`" = x".tx/merge-base" ]; then
diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 1bd94099..1c24f3bf 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -26,7 +26,7 @@ case "$cmd" in
 		cleandp=false
 		cleanqcc=false
 		cleanqc=false
-		compiled0=false
+		compiled0=
 		debug=debug
 		if [ -z "$CC" ]; then
 			export CC="gcc"
@@ -38,6 +38,10 @@ case "$cmd" in
 					compiled0=true
 					shift
 					;;
+				-1)
+					compiled0=false
+					shift
+					;;
 				-c)
 					cleand0=true
 					cleandp=true
@@ -183,7 +187,10 @@ case "$cmd" in
 		rm -f conftest
 
 		verbose cd "$d0/d0_blind_id"
-		if ! $compiled0; then
+		if [ -z "$compiled0" ]; then
+			# In doubt, compile.
+			compiled0=true
+
 			# compilation of crypto library failed
 			# use binaries then, if we can...
 			mkdir -p .libs
@@ -191,6 +198,7 @@ case "$cmd" in
 				verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/
 				verbose cp "$d0/misc/buildfiles/win32/libd0_rijndael"-* .libs/
 				verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
+				compiled0=false
 			else
 				case "`uname`" in
 					Linux)
@@ -204,20 +212,20 @@ case "$cmd" in
 								export CC="$CC -L../../../../misc/builddeps/linux32/gmp/lib"
 								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux32/gmp/lib"
 								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux32/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_rijndael.a"
+								compiled0=false
 								;;
 							*)
 								msg "Always need to compile libd0_blind_id on Linux `uname -m`."
-								compiled0=true
 								;;
 						esac
 						;;
 					Darwin)
 						verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id".* .libs/
 						verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael".* .libs/
+						compiled0=false
 						;;
 					*)
 						msg "Always need to compile libd0_blind_id on `uname`."
-						compiled0=true
 						;;
 				esac
 			fi