X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=964233c0182f704382c3e416bb141ed6cab4d147;hp=8fb6e0d9b8cbbb086d6011b611b45c8ecf9e9de3;hb=8f7e6f1f69a59a8ada4880db5f1680efd5eb91fd;hpb=01ac8add25b75d81c9b3a9b4fbbf6e8f0ef651c3

diff --git a/all b/all
index 8fb6e0d9..964233c0 100755
--- a/all
+++ b/all
@@ -3,6 +3,10 @@
 
 set -e
 
+# I use this in EVERY shell script ;)
+LF="
+"
+
 d00=`pwd`
 while ! [ -f ./all ]; do
 	if [ x"`pwd`" = x"/" ]; then
@@ -105,6 +109,7 @@ yesno()
 {
 	yesno=
 	while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
+		eval "$2"
 		echo "$1"
 		IFS= read -r yesno
 	done
@@ -118,16 +123,16 @@ enter()
 }
 
 repos_urls="
-.                             |                                                   | master
-data/xonotic-data.pk3dir      |                                                   | master
-data/xonotic-maps.pk3dir      |                                                   | master
-data/xonotic-music.pk3dir     |                                                   | master
-data/xonotic-nexcompat.pk3dir |                                                   | master
-mediasource                   |                                                   | master
-darkplaces                    |                                                   | div0-stable
-fteqcc                        | git://github.com/Blub/qclib.git                   | master
-div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master
-netradiant                    |                                                   | master
+.                             |                                                   | master      |
+data/xonotic-data.pk3dir      |                                                   | master      |
+data/xonotic-maps.pk3dir      |                                                   | master      |
+data/xonotic-music.pk3dir     |                                                   | master      |
+data/xonotic-nexcompat.pk3dir |                                                   | master      |
+mediasource                   |                                                   | master      |
+darkplaces                    |                                                   | div0-stable | svn
+fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
+div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
+netradiant                    |                                                   | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -175,6 +180,12 @@ repobranch()
 	fi
 }
 
+repoflags()
+{
+	echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
+	echo "$t"
+}
+
 repos=`for d in $repos; do
 	p="${d%dir}"
 	if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
@@ -202,10 +213,6 @@ case "$cmd" in
 					enter "$d0/$d" verbose
 					verbose git config remote.origin.url "$url"
 					verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-						# TODO remove this line later
-
-					verbose git config core.autocrlf false
-					verbose git config core.safecrlf false # we don't NEED that...
 
 					r=`git symbolic-ref HEAD`
 					r=${r#refs/heads/}
@@ -226,7 +233,9 @@ case "$cmd" in
 			else
 				verbose git clone "$url" "$d0/$d"
 				enter "$d0/$d" verbose
-				verbose git checkout "$branch"
+				if [ "$branch" != "master" ]; then
+					verbose git checkout --track -b "$branch" origin/"$branch"
+				fi
 				cd "$d0"
 			fi
 		done
@@ -241,12 +250,17 @@ case "$cmd" in
 		exists=false
 		for d in $repos; do
 			enter "$d0/$d" verbose
-			if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
+			if [ -z "$branch" ]; then
+				b=`repobranch "$d"`
+			else
+				b=$branch
+			fi
+			if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
 				exists=true
-				verbose git checkout "$branch"
-			elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
+				verbose git checkout "$b"
+			elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
 				exists=true
-				verbose git checkout --track -b "$branch" "$remote/$branch"
+				verbose git checkout --track -b "$b" "$remote/$b"
 			else
 				verbose git checkout "`repobranch "$d"`"
 			fi
@@ -286,11 +300,13 @@ case "$cmd" in
 						if [ -n "$srcbranch" ]; then
 							b=$srcbranch
 						else
-							b="`repobranch "$d"`"
+							b=origin/"`repobranch "$d"`"
+							verbose git fetch origin || true
 						fi
 						# TODO do this without pushing
-						verbose git push "$remote" "$b":"$branch"
-						verbose git checkout --track -b "$branch" "$remote/$branch"
+						verbose git checkout -b "$branch" "$b"
+						verbose git config "branch.$branch.remote" "$remote"
+						verbose git config "branch.$branch.merge" "refs/heads/$branch"
 					fi
 				fi
 				cd "$d0"
@@ -396,7 +412,12 @@ case "$cmd" in
 				fi
 			fi
 			rem=`git config "branch.$r.remote" || echo origin`
-			if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
+			bra=`git config "branch.$r.merge" || echo "$r"`
+			upstream="$rem/$bra"
+			if ! [ git rev-parse "$upstream" ]; then
+				upstream="`repobranch "$d"`"
+			fi
+			if git log "$upstream".."$r" | grep .; then
 				if yesno "Push \"$r\" in $dv?"; then
 					verbose git push "$rem" HEAD
 				fi
@@ -404,7 +425,7 @@ case "$cmd" in
 			if [ x"$submit" = x"-s" ]; then
 				case "$r" in
 					*/*)
-						verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
+						verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
 						;;
 				esac
 			fi
@@ -414,6 +435,12 @@ case "$cmd" in
 	compile)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			TARGETS="sv-debug cl-debug"
+			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
@@ -465,6 +492,7 @@ case "$cmd" in
 		if $clean; then
 			verbose make $MAKEFLAGS clean
 		fi
+		verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
 		verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
 		enter "$d0/darkplaces" verbose
 		if $clean; then
@@ -479,7 +507,7 @@ case "$cmd" in
 			client=
 			export PATH="$d0/misc/buildfiles/w32:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
-			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 			client=-sdl
 		else
 			client=-sdl
@@ -505,9 +533,11 @@ case "$cmd" in
 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
 
 		# if pulseaudio is running: USE IT
-		if ps -C pulseaudio >/dev/null; then
-			if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
-				export SDL_AUDIODRIVER=pulse
+		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
+			if ps -C pulseaudio >/dev/null; then
+				if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
+					export SDL_AUDIODRIVER=pulse
+				fi
 			fi
 		fi
 
@@ -610,44 +640,94 @@ case "$cmd" in
 		;;
 	admin-merge-2)
 		t=`mktemp`
+		report=""
+		reportecho()
+		{
+			report=$report"$*$LF"
+			echo "$*"
+		}
+		reportecho4()
+		{
+			report=$report"    $*$LF"
+			echo "    $*"
+		}
+		reportdo4()
+		{
+			o=`"$@" | sed 's/^/    /' || true`
+			reportecho "$o"
+		}
 		for d in $repos; do
 			enter "$d0/$d" verbose
+			base="`repobranch "$d"`"
+			reportecho "In $d:"
 			for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
 				case "${ref#refs/remotes/origin/}" in
-					"`repobranch "$d"`")
+					"$base")
 						continue
 						;;
 					HEAD|master)
 						continue
 						;;
 				esac
-				echo "$ref"
-				if git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null; then
-					echo "Not merging, already had this one"
-				elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff HEAD.."$ref"; } | less'; then
+				reportecho "  Branch $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 "--> 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
+					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:
-`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:
-`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 HEAD@{1}
-						git notes --ref "refs/notes/admin-merge" add "$ref"
+						git reset --hard "$org"
+						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
-						git push origin HEAD
-						git push origin :"${ref#refs/remotes/origin/}"
+						case ",`repoflags "$d"`," in
+							*,svn,*)
+								# we do quite a mess here... luckily we know $org
+								git pull # svn needs to be current
+								git rebase -i --onto master "$org"
+								git svn dcommit --add-author-from
+								git reset --hard "$org"
+								;;
+							*)
+								git push origin HEAD
+								;;
+						esac
+						reportecho4 "--> MERGED"
+						if yesno "Delete original branch \"$ref\"?"; then
+							git push origin :"${ref#refs/remotes/origin/}"
+							reportecho4 "--> branch deleted"
+						fi
 					fi
 				else
-					git reset --hard HEAD@{1}
 					git notes --ref "refs/notes/admin-merge" add "$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"
+					else
+						reportecho4 "--> postponed"
+					fi
 				fi
+				reportecho ""
 			done
+			reportecho ""
 		done
 		rm -f "$t"
+		echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
 		;;
 	*)
 		echo "Usage:"