X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=1aaef60338a9e4f015df37b8fa726e73bb4b71ad;hp=ab90d98ef394569ffa6d50fe07b4d397db8e3cca;hb=f1c468e0b25928672e07e6c4ade8ee12a791350d;hpb=ec1cee87d1cebe75fcb7b1ca1d14373f251436ae

diff --git a/all b/all
index ab90d98e..1aaef603 100755
--- a/all
+++ b/all
@@ -240,6 +240,9 @@ case "$cmd" in
 			fi
 		done
 		;;
+	update-maps)
+		misc/tools/xonotic-map-compiler-autobuild download
+		;;
 	checkout|switch)
 		remote=$1
 		branch=$2
@@ -438,6 +441,9 @@ 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"
 		else
 			TARGETS="sv-debug cl-debug sdl-debug"
 		fi
@@ -498,13 +504,14 @@ case "$cmd" in
 		for T in $TARGETS; do
 			verbose make $MAKEFLAGS "$@" "$T"
 		done
+		verbose "$SELF" update-maps
 		;;
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			client=
 			export PATH="$d0/misc/buildfiles/w32:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
-			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz-SDL.app/Contents/MacOS"
+			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 			client=-sdl
 		else
 			client=-sdl
@@ -667,27 +674,37 @@ case "$cmd" in
 						;;
 				esac
 				reportecho "  Branch $ref:"
-				note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
-				if [ -n "$note" ]; then
+				note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+				logdata=`git log --color "$base".."$ref"`
+				diffdata=`git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"`
+				if [ -z "$logdata" ]; then
+					reportecho4 "--> not merging, no changes vs master"
+				elif [ -z "$diffdata" ]; then
+					reportecho4 "--> not merging, no changes vs master, branch contains redundant history"
+					if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then
+						git push origin :"${ref#refs/remotes/origin/}"
+						reportecho4 "--> branch deleted"
+					fi
+				elif [ -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?" '{ git log --color "$base".."$ref"; git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"; } | less -r'; then
+				elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
 					git checkout "$base"
 					org=`git rev-parse HEAD`
 					if ! git merge "$ref" 2>&1 | tee "$t"; then
 						git reset --hard "$org"
-						git notes --ref "refs/notes/admin-merge" add -m "Merge failed:$LF`cat "$t"`" "$ref"
+						GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
 						reportdo4 cat "$t"
 						reportecho4 "--> merge failed"
 					elif ! "$SELF" compile 2>&1 | tee "$t"; then
 						git reset --hard "$org"
-						git notes --ref "refs/notes/admin-merge" add -m "Compile failed:$LF`cat "$t"`" "$ref"
+						GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
 						reportdo4 cat "$t"
 						reportecho4 "--> compile failed"
 					elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
 						git reset --hard "$org"
-						git notes --ref "refs/notes/admin-merge" add "$ref"
-						note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+						git notes edit "$ref"
+						note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
 						reportdo4 echo "$note"
 						reportecho4 "--> test failed"
 					else
@@ -710,8 +727,8 @@ case "$cmd" in
 						fi
 					fi
 				else
-					git notes --ref "refs/notes/admin-merge" add "$ref"
-					note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+					GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
+					note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
 					if [ -n "$note" ]; then
 						reportdo4 echo "$note"
 						reportecho4 "--> rejected"