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

diff --git a/all b/all
index 338c0237..a409faa0 100755
--- a/all
+++ b/all
@@ -2,6 +2,14 @@
 
 set -e
 
+self=`cat "$0"`
+
+verbose()
+{
+	echo "+ $@"
+	"$@"
+}
+
 repos_urls="
 	.
 	data/xonotic-data.pk3dir
@@ -39,20 +47,21 @@ case "$cmd" in
 					;;
 			esac
 			if [ -d "$d0/$d" ]; then
-				cd "$d0/$d"
+				verbose cd "$d0/$d"
 				case "$d" in
 					.)
 						;;
 					*)
 						if $switch; then
-							git config remote.origin.url "$base${d##*/}.git"
+							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
 		;;
@@ -65,18 +74,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)
@@ -103,13 +115,14 @@ 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
 			"$0" branch
 		fi
+		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	branches)
 		for d in $repos; do
@@ -118,6 +131,7 @@ case "$cmd" in
 			git branch -a | sed 's/^/  /; /->/d'
 			cd "$d0"
 		done
+		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	push)
 		for d in $repos; do
@@ -131,31 +145,31 @@ 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
+		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	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
+		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	run)
 		client=-sdl
@@ -177,7 +191,17 @@ case "$cmd" in
 				exit 1
 			fi
 		fi
-		exec "darkplaces/darkplaces$client" -xonotic $@
+		#verbose "darkplaces/darkplaces$client" -xonotic "$@"
+		verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
+		export XONOTIC_FORBID_RERUN_ALL=1
+		;;
+	each|foreach)
+		for d in $repos; do
+			verbose cd "$d0/$d"
+			verbose "$@"
+			cd "$d0"
+		done
+		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 	*)
 		echo "Usage:"
@@ -188,5 +212,21 @@ case "$cmd" in
 		echo "  $0 checkout"
 		echo "  $0 compile"
 		echo "  $0 run <client> <options>"
+		echo "  $0 each <command>"
+		export XONOTIC_FORBID_RERUN_ALL=1
 		;;
 esac
+
+self_new=`cat "$0"`
+if [ x"$self" != x"$self_new" ]; then
+	echo "./all has changed."
+	if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
+		echo "Rerunning the requested operation to make sure."
+		export XONOTIC_FORBID_RERUN_ALL=1
+		"$0" update
+		"$0" "$@"
+	else
+		echo "Please try $0 update, and then retry your requested operation."
+		exit 1
+	fi
+fi