X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=864f0b098a51f39d4f3c973d1425b89ccc01f1d0;hp=2548b35339ab5374936eca6292677b365d4550e0;hb=e4739f5dfbc1e7fd9b945c6e86083eed5fec7667;hpb=1a8401d1a9e525a62e5f8399a1d44e829a8e5d88

diff --git a/all b/all
index 2548b353..864f0b09 100755
--- a/all
+++ b/all
@@ -3,9 +3,11 @@
 set -e
 
 repos="
+	.
 	data/xonotic-data.pk3dir
 	data/xonotic-maps.pk3dir
 	data/xonotic-music.pk3dir
+	data/xonotic-nexcompat.pk3dir
 	darkplaces
 "
 
@@ -19,19 +21,25 @@ d0=`pwd`
 case "$cmd" in
 	update|pull)
 		base=`git config remote.origin.url`
-		base=${base%/xonotic.git}
+		base=${base%xonotic.git}
 		for d in $repos; do
 			if [ -d "$d0/$d" ]; then
 				cd "$d0/$d"
-				git config remote.origin.url "$base/${d##*/}.git"
+				case "$d" in
+					.)
+						;;
+					*)
+						git config remote.origin.url "$base${d##*/}.git"
+						;;
+				esac
 				git pull
 				cd "$d0"
 			else
-				git clone "$base/${d##*/}.git" "$d0/$d"
+				git clone "$base${d##*/}.git" "$d0/$d"
 			fi
 		done
 		;;
-	checkout)
+	checkout|switch)
 		remote=$1
 		branch=$2
 		if [ -z "$branch" ]; then
@@ -55,7 +63,13 @@ case "$cmd" in
 		"$0" branch
 		;;
 	branch)
-		if [ $# = 0 ]; then
+		remote=$1
+		branch=$2
+		if [ -z "$branch" ]; then
+			branch=$remote
+			remote=origin
+		fi
+		if [ -z "$branch" ]; then
 			for d in $repos; do
 				cd "$d0/$d"
 				r=`git symbolic-ref HEAD`
@@ -71,8 +85,9 @@ case "$cmd" in
 					echo "Branch in $d?"
 					read -r a
 				done
-				if [ x"$a" = "y" ]; then
-					git branch "$1"
+				if [ x"$a" = x"y" ]; then
+					git push "$remote" HEAD:"$branch"
+					git checkout --track -b "$branch" "$remote/$branch"
 				fi
 				cd "$d0"
 			done
@@ -83,7 +98,7 @@ case "$cmd" in
 		for d in $repos; do
 			cd "$d0/$d"
 			echo "In $d:"
-			git branch -a | sed 's/^/  /'
+			git branch -a | sed 's/^/  /; /->/d'
 			cd "$d0"
 		done
 		;;
@@ -93,23 +108,76 @@ case "$cmd" in
 			r=`git symbolic-ref HEAD`
 			r=${r#refs/heads/}
 			a=
-			while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-				git log "origin/$r".."$r"
-				echo "Push $r in $d?"
-				read -r a
-			done
-			if [ x"$a" = "y" ]; then
-				git push -u origin HEAD
+			if git log "origin/$r".."$r" | grep .; then
+				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+					echo "Push $r in $d?"
+					read -r a
+				done
+				if [ x"$a" = x"y" ]; then
+					git push `git config "branch.$r.remote" || echo origin` HEAD
+				fi
 			fi
 			cd "$d0"
 		done
 		;;
+	compile)
+		(
+			cd data/xonotic-data.pk3dir
+			make $MAKEFLAGS
+		) || exit $?
+		(
+			if [ -z "$MAKEFLAGS" ]; then
+				if [ -f /proc/cpuinfo ]; then
+					ncpus=$((`grep -c '^processor	:' /proc/cpuinfo`+0))
+					if [ $ncpus -gt 1 ]; then
+						MAKEFLAGS=-j$ncpus
+					fi
+				fi
+			fi
+			cd darkplaces
+			make $MAKEFLAGS sv-debug
+			make $MAKEFLAGS cl-debug
+			make $MAKEFLAGS sdl-debug
+		) || exit $?
+		;;
+	run)
+		client=-sdl
+		case "$1" in
+			sdl|glx|agl|dedicated)
+				client=-$1
+				shift
+				;;
+			wgl)
+				client=
+				shift
+				;;
+		esac
+		if ! [ -x "darkplaces/darkplaces$client" ]; then
+			if [ -x "darkplaces/darkplaces$client.exe" ]; then
+				client=$client.exe
+			else
+				echo "Client darkplaces/darkplaces$client not found, aborting"
+				exit 1
+			fi
+		fi
+		exec "darkplaces/darkplaces$client" -xonotic $@
+		;;
+	each|foreach)
+		for d in $repos; do
+			cd "$d0/$d"
+			"$@"
+			cd "$d0"
+		done
+		;;
 	*)
 		echo "Usage:"
 		echo "  $0 pull"
 		echo "  $0 push"
 		echo "  $0 branches"
-		echo "  $0 branch"
+		echo "  $0 branch <remote> <branchname>"
 		echo "  $0 checkout"
+		echo "  $0 compile"
+		echo "  $0 run <client> <options>"
+		echo "  $0 each <command>"
 		;;
 esac