From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 17 Jul 2010 15:05:09 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~89
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=14253bf22931c267c5f4399730894b0e015c4df5;hp=-c

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

Conflicts:
	all
---

14253bf22931c267c5f4399730894b0e015c4df5
diff --combined all
index e62d477a,933a51b6..d85c0970
--- a/all
+++ b/all
@@@ -25,7 -25,6 +25,6 @@@ case "$0" i
  		case "`uname`" in
  			MINGW*|Win*)
  				# Windows hates users. So this script has to copy itself elsewhere first...
- 				tname=
  				cp "$SELF" ../all.xonotic.sh
  				export WE_HATE_OUR_USERS=1
  				exec ../all.xonotic.sh "$@"
@@@ -120,7 -119,6 +119,7 @@@ darkplaces                    
  fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
  div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
  netradiant                    |                                                   | master      |
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable
  
@@@ -400,7 -398,7 +399,7 @@@ case "$cmd" i
  			fi
  			rem=`git config "branch.$r.remote" || echo origin`
  			bra=`git config "branch.$r.merge" || echo "$r"`
- 			upstream="$rem/$bra"
+ 			upstream="$rem/${bra#refs/heads/}"
  			if ! git rev-parse "$upstream" >/dev/null 2>&1; then
  				upstream="origin/`repobranch "$d"`"
  			fi
@@@ -426,29 -424,34 +425,37 @@@
  			if [ -z "$CC" ]; then
  				export CC=gcc
  			fi
- 		elif [ x"`uname`" = x"Darwin" ] && { [ -d /Library/Frameworks/SDL.framework ] || [ -d "$HOME/Library/Frameworks/SDL.framework" ]; }; then
- 			# AGL is broken in Snow Leopard, so let's default to SDL if it is available.
- 			TARGETS="sv-debug sdl-debug"
+ 		elif [ x"`uname`" = x"Darwin" ]; then
+ 			case "`uname -r`" in
+ 				?.*)
+ 					TARGETS="sv-debug cl-debug sdl-debug"
+ 					;;
+ 				*)
+ 					# AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
+ 					TARGETS="sv-debug sdl-debug"
+ 					;;
+ 			esac
+ 			export CC="gcc -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
  		else
  			TARGETS="sv-debug cl-debug sdl-debug"
  		fi
  		case "$1" in
  			-c)
 +				cleand0=true
  				cleandp=true
  				cleanqcc=true
  				cleanqc=true
  				shift
  				;;
  			-n)
 +				cleand0=false
  				cleandp=false
  				cleanqcc=false
  				cleanqc=false
  				shift
  				;;
  			*)
 +				cleand0=false
  				cleandp=false
  				cleanqcc=false
  				cleanqc=true # version info
@@@ -488,16 -491,6 +495,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
@@@ -523,12 -516,12 +530,13 @@@
  	run)
  		if [ -n "$WE_HATE_OUR_USERS" ]; then
  			client=
 -			export PATH="$d0/misc/buildfiles/w32:$PATH"
 +			export PATH="$d0/misc/buildfiles/w32:$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
@@@ -549,7 -542,7 +557,7 @@@
  				exit 1
  			fi
  		fi
- 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
+ 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@"
  
  		# if pulseaudio is running: USE IT
  		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@@ -716,13 -709,13 +724,13 @@@
  							git push origin :"${ref#refs/remotes/origin/}"
  							reportecho4 "--> branch deleted"
  						fi
- 					elif [ -n "$note" ]; then
+ 					elif [ -z "$branch" ] && [ -n "$note" ]; then
  						reportdo4 echo "$note"
  						reportecho4 "--> not merging, already had this one rejected before"
  					elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
  						git checkout "$realbase"
  						org=`git rev-parse HEAD`
- 						if ! git merge "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
+ 						if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
  							git reset --hard "$org"
  							GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
  							reportdo4 cat "$t"