X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=5f70b4a25a3147987a8918d73a9d56896c9cfaa5;hp=9480f29f64ab5508a1095ecc7cdc0bdd6101b18a;hb=b730d3b2c80ed87a0e13353be2a35529ba37d278;hpb=f3e2327008ef947a37bb81fad3219cff8a53c409

diff --git a/all b/all
index 9480f29f..5f70b4a2 100755
--- a/all
+++ b/all
@@ -104,7 +104,7 @@ yesno()
 
 enter()
 {
-	$2 cd "$1"
+	$2 cd "$1" || exit 1
 	check_mergeconflict "$1"
 }
 
@@ -398,7 +398,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
@@ -424,9 +424,17 @@ 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
@@ -511,6 +519,7 @@ case "$cmd" in
 			export PATH="$d0/misc/buildfiles/w32:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
 			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
+			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
 			client=-sdl
 		else
 			client=-sdl
@@ -700,13 +709,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"