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

diff --git a/all b/all
index d485f00e..864f0b09 100755
--- a/all
+++ b/all
@@ -7,6 +7,7 @@ repos="
 	data/xonotic-data.pk3dir
 	data/xonotic-maps.pk3dir
 	data/xonotic-music.pk3dir
+	data/xonotic-nexcompat.pk3dir
 	darkplaces
 "
 
@@ -20,7 +21,7 @@ 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"
@@ -28,17 +29,17 @@ case "$cmd" in
 					.)
 						;;
 					*)
-						git config remote.origin.url "$base/${d##*/}.git"
+						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
@@ -97,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
 		;;
@@ -119,12 +120,64 @@ case "$cmd" in
 			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