X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=f164928cc79a75df3e79f3750aec7aafc8706577;hp=924f75e61ab2fb8cb6a077b05c733108472d7880;hb=a870e86f2e720d051d480a8dd81bd502b04d0c41;hpb=df60018c0be76935b077f30ae8cf1bb4d155ce58

diff --git a/all b/all
index 924f75e6..f164928c 100755
--- a/all
+++ b/all
@@ -2,13 +2,24 @@
 
 set -e
 
-repos="
+verbose()
+{
+	echo "+ $@"
+	"$@"
+}
+
+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
@@ -17,21 +28,42 @@ shift
 
 d0=`pwd`
 case "$cmd" in
-	update)
+	update|pull)
 		base=`git config remote.origin.url`
-		base=${base%/xonotic.git}
-		for d in $repos; do
+		base=${base%xonotic.git}
+		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"
-				git config remote.origin.url "$base/${d##*/}.git"
-				git pull
+				verbose cd "$d0/$d"
+				case "$d" in
+					.)
+						;;
+					*)
+						if $switch; then
+							verbose git config remote.origin.url "$url"
+						fi
+						;;
+				esac
+				verbose git pull
+				verbose git remote prune origin
 				cd "$d0"
 			else
-				git clone "$base/${d##*/}.git" "$d0/$d"
+				verbose git clone "$url" "$d0/$d"
 			fi
 		done
 		;;
-	checkout)
+	checkout|switch)
 		remote=$1
 		branch=$2
 		if [ -z "$branch" ]; then
@@ -40,22 +72,31 @@ case "$cmd" in
 		fi
 		exists=false
 		for d in $repos; do
-			cd "$d0/$d"
+			verbose cd "$d0/$d"
 			if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
 				exists=true
-				git checkout "$branch"
+				verbose git checkout "$branch"
 			elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
 				exists=true
-				git checkout --track -b "$branch" "$remote/$branch"
+				verbose git checkout --track -b "$branch" "$remote/$branch"
 			else
-				git checkout master
+				verbose git checkout master
 			fi
 			cd "$d0"
 		done
+		if ! $exists; then
+			echo "The requested branch was not found in any repository."
+		fi
 		"$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 +112,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
+					verbose git push "$remote" HEAD:"$branch"
+					verbose git checkout --track -b "$branch" "$remote/$branch"
 				fi
 				cd "$d0"
 			done
@@ -83,15 +125,84 @@ 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
+		;;
+	push)
+		for d in $repos; do
+			cd "$d0/$d"
+			r=`git symbolic-ref HEAD`
+			r=${r#refs/heads/}
+			a=
+			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
+					verbose git push `git config "branch.$r.remote" || echo origin` HEAD
+				fi
+			fi
+			cd "$d0"
+		done
+		;;
+	compile)
+		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
+		verbose cd "$d0/fteqcc"
+		verbose make $MAKEFLAGS
+		verbose cd "$d0/data/xonotic-data.pk3dir"
+		verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
+		verbose cd "$d0/darkplaces"
+		verbose make $MAKEFLAGS sv-debug
+		verbose make $MAKEFLAGS cl-debug
+		verbose make $MAKEFLAGS sdl-debug
+		;;
+	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
+		verbose "darkplaces/darkplaces$client" -xonotic $@
+		;;
+	each|foreach)
+		for d in $repos; do
+			verbose cd "$d0/$d"
+			verbose "$@"
 			cd "$d0"
 		done
 		;;
 	*)
 		echo "Usage:"
-		echo "  $0 update"
-		echo "  $0 branch"
+		echo "  $0 pull"
+		echo "  $0 push"
 		echo "  $0 branches"
+		echo "  $0 branch <remote> <branchname>"
 		echo "  $0 checkout"
+		echo "  $0 compile"
+		echo "  $0 run <client> <options>"
+		echo "  $0 each <command>"
 		;;
 esac