X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=all;h=2592fde5e36e60cb491f69b7cb91e7eeb0d2429c;hb=0241e4415badd2c570f6711ee605e51fc69c876a;hp=41040a1290bb0e4105a164454fca0d755818123d;hpb=ad9d4b2c72a3532bca59b988ceb10b7601b49de6;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 41040a12..2592fde5 100755
--- a/all
+++ b/all
@@ -119,6 +119,7 @@ darkplaces                    |
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
 div0-gittools                 |                                                   | master      | no
 netradiant                    |                                                   | master      |
+d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -278,8 +279,8 @@ mkzip()
 	shift
 	ziplist=`mktemp`
 	find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
-	7za a -tzip -mx=9 -x@"$ziplist" "$archive" || true
-	zip         -9y   -@<"$ziplist" "$archive" || true
+	7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
+	zip         -9y   -@<"$ziplist" "$archive"      || true
 	rm -f "$ziplist"
 }
 
@@ -559,12 +560,14 @@ case "$cmd" in
 		fi
 		case "$1" in
 			-c)
+				cleand0=true
 				cleandp=true
 				cleanqcc=true
 				cleanqc=true
 				shift
 				;;
 			*)
+				cleand0=false
 				cleandp=false
 				cleanqcc=false
 				cleanqc=false
@@ -614,6 +617,16 @@ case "$cmd" in
 			fi
 		fi
 
+		enter "$d0/d0_blind_id" verbose
+		if ! [ -f Makefile ]; then
+			verbose sh autogen.sh
+			verbose ./configure
+		fi
+		if $cleand0; then
+			verbose make $MAKEFLAGS clean
+		fi
+		verbose make $MAKEFLAGS
+
 		enter "$d0/fteqcc" verbose
 		if $cleanqcc; then
 			verbose make $MAKEFLAGS clean
@@ -645,12 +658,13 @@ case "$cmd" in
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			client=
-			export PATH="$d0/misc/buildfiles/win32:$PATH"
+			export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
-			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
+			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
 			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
 			client=-sdl
 		else
+			export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
 			client=-sdl
 		fi
 		case "$1" in
@@ -954,7 +968,7 @@ case "$cmd" in
 		else
 			verbose date +%Y%m%d > Xonotic/stamp.txt
 		fi
-		verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
+		verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
 			verbose cd Xonotic
 			verbose mkdir data fteqcc source source/darkplaces source/fteqcc
 			verbose tar xvf -
@@ -963,6 +977,7 @@ case "$cmd" in
 			verbose mv misc/buildfiles/win64 bin64 || true
 			verbose mv misc/buildfiles/osx/* . || true
 			verbose rm -rf misc/buildfiles
+			verbose rm -rf misc/pki
 		}
 		{
 			verbose cd darkplaces
@@ -985,6 +1000,7 @@ case "$cmd" in
 			verbose cd Xonotic/source
 			verbose tar xvf -
 		}
+		rm -f Xonotic/key_15.d0pk
 		;;
 	release-compile-run)
 		host=$1
@@ -1086,13 +1102,13 @@ case "$cmd" in
 		;;
 	release-engine-linux32)
 		verbose "$SELF" release-compile linux32 \
-			'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
+			'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
 			release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
 		;;
 	release-engine-linux64)
 		verbose "$SELF" release-compile linux64 \
-			'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
+			'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
 			release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
 		;;
@@ -1227,7 +1243,7 @@ case "$cmd" in
 		fi
 		verbose export git_src_repo="$d0/$src" # skip hash-object
 		verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
-		verbose mkzip "../../$dst" .
+		verbose mkzip "../../$dst" *
 		verbose cd ../..
 		verbose rm -rf Xonotic/temp
 		;;
@@ -1269,6 +1285,8 @@ case "$cmd" in
 		;;
 	release-zip)
 		stamp=`cat Xonotic/stamp.txt`
+		# exe and dll files do not need +x, so this makes them eligible for 7zip compression too
+		chmod a-x Xonotic/*.exe Xonotic/*.dll || true
 		# need to use infozip for these (+x bits)
 		verbose mkzip Xonotic-$stamp-engine.zip \
 			Xonotic/*.dll \
@@ -1283,6 +1301,7 @@ case "$cmd" in
 			Xonotic/misc \
 			Xonotic/fteqcc \
 			Xonotic/server \
+			Xonotic/key_0.d0pk \
 			Xonotic/data/font-nimbussansl-$stamp.pk3
 		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
 		verbose mkzip0 Xonotic-$stamp.zip \