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

diff --git a/all b/all
index 4e1a63e1..f164928c 100755
--- a/all
+++ b/all
@@ -2,15 +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
@@ -22,20 +31,35 @@ 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"
+				verbose cd "$d0/$d"
 				case "$d" in
 					.)
 						;;
 					*)
-						git config remote.origin.url "$base${d##*/}.git"
+						if $switch; then
+							verbose git config remote.origin.url "$url"
+						fi
 						;;
 				esac
-				git pull
+				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
 		;;
@@ -48,18 +72,21 @@ 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)
@@ -86,8 +113,8 @@ case "$cmd" in
 					read -r a
 				done
 				if [ x"$a" = x"y" ]; then
-					git push "$remote" HEAD:"$branch"
-					git checkout --track -b "$branch" "$remote/$branch"
+					verbose git push "$remote" HEAD:"$branch"
+					verbose git checkout --track -b "$branch" "$remote/$branch"
 				fi
 				cd "$d0"
 			done
@@ -114,31 +141,29 @@ case "$cmd" in
 					read -r a
 				done
 				if [ x"$a" = x"y" ]; then
-					git push `git config "branch.$r.remote" || echo origin` HEAD
+					verbose 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
+		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
-			cd darkplaces
-			make $MAKEFLAGS sv-debug
-			make $MAKEFLAGS cl-debug
-			make $MAKEFLAGS sdl-debug
-		) || exit $?
+		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
@@ -160,7 +185,14 @@ case "$cmd" in
 				exit 1
 			fi
 		fi
-		exec "darkplaces/darkplaces$client" -xonotic $@
+		verbose "darkplaces/darkplaces$client" -xonotic $@
+		;;
+	each|foreach)
+		for d in $repos; do
+			verbose cd "$d0/$d"
+			verbose "$@"
+			cd "$d0"
+		done
 		;;
 	*)
 		echo "Usage:"
@@ -171,5 +203,6 @@ case "$cmd" in
 		echo "  $0 checkout"
 		echo "  $0 compile"
 		echo "  $0 run <client> <options>"
+		echo "  $0 each <command>"
 		;;
 esac