From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 7 Sep 2010 07:34:00 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~42^2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=13a74ed2c1aab7221c7512e3040966bc47b6ca42;hp=-c

Merge remote branch 'origin/master' into divVerent/crypto2
---

13a74ed2c1aab7221c7512e3040966bc47b6ca42
diff --combined all
index 55fba078,01857ae9..74b4f3d4
--- a/all
+++ b/all
@@@ -119,7 -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
  
@@@ -544,14 -543,12 +544,14 @@@ case "$cmd" i
  		fi
  		case "$1" in
  			-c)
 +				cleand0=true
  				cleandp=true
  				cleanqcc=true
  				cleanqc=true
  				shift
  				;;
  			*)
 +				cleand0=false
  				cleandp=false
  				cleanqcc=false
  				cleanqc=false
@@@ -601,16 -598,6 +601,16 @@@
  			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
@@@ -642,13 -629,12 +642,13 @@@
  	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
@@@ -952,7 -938,7 +952,7 @@@
  		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 -
@@@ -961,7 -947,6 +961,7 @@@
  			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
@@@ -984,7 -969,6 +984,7 @@@
  			verbose cd Xonotic/source
  			verbose tar xvf -
  		}
 +		rm -f Xonotic/key_15.d0pk
  		;;
  	release-compile-run)
  		host=$1
@@@ -1073,22 -1057,28 +1073,28 @@@
  		;;
  	release-engine-linux32)
  		verbose "$SELF" release-compile linux32 \
 -			'STRIP=: CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib LIB_JPEG=$HOME/dp.linux32/lib/libjpeg.a' \
 +			'STRIP=: CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib LIB_JPEG=$HOME/dp.linux32/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=$HOME/dp.linux32/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 -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib LIB_JPEG=$HOME/dp.linux64/lib/libjpeg.a' \
 +			'STRIP=: CC="gcc -m64 -g -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib LIB_JPEG=$HOME/dp.linux64/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=$HOME/dp.linux64/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'
  		;;
  	release-engine)
- 		verbose "$SELF" release-engine-win64
- 		verbose "$SELF" release-engine-osx
- 		verbose "$SELF" release-engine-win32
- 		verbose "$SELF" release-engine-linux32
- 		verbose "$SELF" release-engine-linux64
+ 		verbose "$SELF" release-engine-linux32 &
+ 		verbose "$SELF" release-engine-linux64 &
+ 		verbose "$SELF" release-engine-win32 &
+ 		verbose "$SELF" release-engine-win64 &
+ 		verbose "$SELF" release-engine-osx &
+ 		wait %1
+ 		wait %2
+ 		wait %3
+ 		wait %4
+ 		wait %5
+ 		wait
  		;;
  	release-maps)
  		verbose "$SELF" update-maps
@@@ -1193,6 -1183,7 +1199,7 @@@
  				fi
  			done
  		fi
+ 		verbose export git_src_repo="$d0/$src" # skip hash-object
  		verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
  		verbose zip -9yr "../../$dst" .
  		verbose cd ../..
@@@ -1249,7 -1240,6 +1256,7 @@@
  			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 zip -0yr Xonotic-$stamp.zip \