X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=d85c09701ec77e6c6f76fb28d4c6098e383693b8;hp=c9de1c4641b4e697dda57493c06993692f7efcfc;hb=13e85619f2a647fc7bfc4d98788cd6f5b1cd2199;hpb=c68423b1ef3a36ade0650cdfd1b50e2f676988e9

diff --git a/all b/all
index c9de1c46..d85c0970 100755
--- a/all
+++ b/all
@@ -25,7 +25,6 @@ case "$0" in
 		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,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
 
@@ -138,14 +138,14 @@ esac
 
 repourl()
 {
-	t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
-	if [ -n "$t" ]; then
-		case "$t" in
+	repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
+	if [ -n "$repo_t" ]; then
+		case "$repo_t" in
 			*://*)
-				echo "$t"
+				echo "$repo_t"
 				;;
 			*)
-				echo "$base$t"
+				echo "$base$repo_t"
 				;;
 		esac
 	else
@@ -159,9 +159,9 @@ repourl()
 
 repobranch()
 {
-	t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
-	if [ -n "$t" ]; then
-		echo "$t"
+	repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
+	if [ -n "$repo_t" ]; then
+		echo "$repo_t"
 	else
 		echo "master"
 	fi
@@ -170,7 +170,6 @@ repobranch()
 repoflags()
 {
 	echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
-	echo "$t"
 }
 
 repos=`for d in $repos; do
@@ -400,7 +399,7 @@ case "$cmd" in
 			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,26 +425,37 @@ case "$cmd" in
 			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
@@ -457,18 +467,16 @@ case "$cmd" in
 				case "$X" in
 					sdl)
 						TARGETS="sdl-debug $TARGETS"
-						shift
 						;;
 					glx|agl|wgl)
 						TARGETS="cl-debug $TARGETS"
-						shift
 						;;
 					dedicated)
 						TARGETS="sv-debug $TARGETS"
-						shift
 						;;
 				esac
 			done
+			shift
 		fi
 		if [ -z "$MAKEFLAGS" ]; then
 			if [ -f /proc/cpuinfo ]; then
@@ -487,6 +495,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
@@ -512,11 +530,13 @@ case "$cmd" in
 	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
@@ -537,7 +557,7 @@ case "$cmd" in
 				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
@@ -704,13 +724,13 @@ case "$cmd" in
 							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"
@@ -734,6 +754,7 @@ case "$cmd" in
 								reportecho4 "--> test failed, postponed"
 							fi
 						else
+							echo "MERGING"
 							case ",`repoflags "$d"`," in
 								*,svn,*)
 									# we do quite a mess here... luckily we know $org