X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=338c0237fb287e18d03200a1fb1b246338328c45;hp=0727316c67ed45f0e066411f2f9c8ce7e2f9737b;hb=09956394ea59fd374e8eef617876e76684552787;hpb=44277d7fa6b8268f9247c3bf8a49a4b17e99687d

diff --git a/all b/all
index 0727316c..338c0237 100755
--- a/all
+++ b/all
@@ -2,15 +2,18 @@
 
 set -e
 
-repos="
+repos_urls="
 	.
 	data/xonotic-data.pk3dir
 	data/xonotic-maps.pk3dir
 	data/xonotic-music.pk3dir
 	data/xonotic-nexcompat.pk3dir
 	darkplaces
+	fteqcc@git://github.com/Blub/qclib.git
 "
 
+repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
+
 if [ "$#" = 0 ]; then
 	set -- help
 fi
@@ -22,14 +25,28 @@ case "$cmd" in
 	update|pull)
 		base=`git config remote.origin.url`
 		base=${base%xonotic.git}
-		for d in $repos; do
+		for dcomplete in $repos_urls; do
+			case "$dcomplete" in
+				*@*)
+					d=${dcomplete%%@*}
+					url=${dcomplete#*@}
+					switch=false
+					;;
+				*)
+					d=${dcomplete%%@*}
+					url=$base${d##*/}.git
+					switch=true
+					;;
+			esac
 			if [ -d "$d0/$d" ]; then
 				cd "$d0/$d"
 				case "$d" in
 					.)
 						;;
 					*)
-						git config remote.origin.url "$base${d##*/}.git"
+						if $switch; then
+							git config remote.origin.url "$base${d##*/}.git"
+						fi
 						;;
 				esac
 				git pull
@@ -39,7 +56,7 @@ case "$cmd" in
 			fi
 		done
 		;;
-	checkout)
+	checkout|switch)
 		remote=$1
 		branch=$2
 		if [ -z "$branch" ]; then
@@ -121,22 +138,55 @@ case "$cmd" in
 		done
 		;;
 	compile)
-		(
-			cd darkplaces
-			make nexuiz
-		)
 		(
 			cd data/xonotic-data.pk3dir
-			make
-		)
+			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 $@
 		;;
 	*)
 		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>"
 		;;
 esac