X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=e5260071168ef9e79bd7cf6e8db36a37f9f458a0;hp=a9208f001e823ba25ef8764415644c00abdcb70e;hb=a6f630181878fcbee62cbfa2b253ac317ff15d6e;hpb=c2ed283428ee4e6c12272b23d5a5e26c35e0d13c

diff --git a/all b/all
index a9208f00..e5260071 100755
--- a/all
+++ b/all
@@ -2,6 +2,61 @@
 
 set -e
 
+d00=`pwd`
+while ! [ -f ./all ]; do
+	if [ x"`pwd`" = x"/" ]; then
+		echo "Cannot find myself."
+		echo "Please run this script with the working directory inside a Xonotic checkout."
+		exit 1
+	fi
+	cd ..
+done
+d0=`pwd`
+SELF="$d0/all"
+
+# If we are on WINDOWS:
+case "$0" in
+	all|*/all)
+		case "`uname`" in
+			MINGW*)
+				# Windows hates users. So this script has to copy itself elsewhere first...
+				tname=
+				cp "$0" ../all.xonotic.sh
+				exec ../all.xonotic.sh "$@"
+				;;
+		esac
+		;;
+esac
+
+msg()
+{
+	echo "$*"
+}
+
+self=`cksum "$SELF"`
+checkself()
+{
+	self_new=`cksum "$SELF"`
+	if [ x"$self" != x"$self_new" ]; then
+		msg "./all has changed."
+		if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
+			msg "Rerunning the requested operation to make sure."
+			export XONOTIC_FORBID_RERUN_ALL=1
+			exec "$SELF" "$@"
+		else
+			msg "Please try $SELF update, and then retry your requested operation."
+			exit 1
+		fi
+	fi
+	return 0
+}
+
+verbose()
+{
+	msg "+ $*"
+	"$@"
+}
+
 repos_urls="
 	.
 	data/xonotic-data.pk3dir
@@ -10,6 +65,8 @@ repos_urls="
 	data/xonotic-nexcompat.pk3dir
 	darkplaces
 	fteqcc@git://github.com/Blub/qclib.git
+	div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
+	netradiant
 "
 
 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
@@ -20,7 +77,6 @@ fi
 cmd=$1
 shift
 
-d0=`pwd`
 case "$cmd" in
 	update|pull)
 		base=`git config remote.origin.url`
@@ -39,20 +95,24 @@ 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
+				cd "$d00"
+				checkself "$SELF" "$@"
+				cd "$d0/$d"
+				verbose git remote prune origin
 				cd "$d0"
 			else
-				git clone "$base${d##*/}.git" "$d0/$d"
+				verbose git clone "$url" "$d0/$d"
 			fi
 		done
 		;;
@@ -65,19 +125,24 @@ 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 "$d00"
+			checkself "$SELF" "$@"
 			cd "$d0"
 		done
-		"$0" branch
+		if ! $exists; then
+			echo "The requested branch was not found in any repository."
+		fi
+		exec "$SELF" branch
 		;;
 	branch)
 		remote=$1
@@ -99,16 +164,16 @@ case "$cmd" in
 				cd "$d0/$d"
 				a=
 				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-					echo "Branch in $d?"
+					echo "Branch in \"$d\"?"
 					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
+			"$SELF" branch
 		fi
 		;;
 	branches)
@@ -124,38 +189,47 @@ case "$cmd" in
 			cd "$d0/$d"
 			r=`git symbolic-ref HEAD`
 			r=${r#refs/heads/}
-			a=
+			if git diff HEAD | grep .; then
+				# we have uncommitted changes
+				a=
+				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+					echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+					read -r a
+				done
+				if [ x"$a" = x"y" ]; then
+					verbose git commit -a
+				fi
+			fi
 			if git log "origin/$r".."$r" | grep .; then
+				a=
 				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-					echo "Push $r in $d?"
+					echo "Push \"$r\" in \"$d\"?"
 					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
@@ -177,24 +251,25 @@ 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 "$@"
 		;;
 	each|foreach)
 		for d in $repos; do
-			cd "$d0/$d"
-			"$@"
+			verbose cd "$d0/$d"
+			verbose "$@"
 			cd "$d0"
 		done
 		;;
 	*)
 		echo "Usage:"
-		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>"
+		echo "  $SELF pull"
+		echo "  $SELF push"
+		echo "  $SELF branches"
+		echo "  $SELF branch <remote> <branchname>"
+		echo "  $SELF checkout"
+		echo "  $SELF compile"
+		echo "  $SELF run <client> <options>"
+		echo "  $SELF each <command>"
 		;;
 esac