X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=54452f88ba9292b44765cf479f141373fc48e6fb;hp=12d312afbc8ffca5b09203bc66687b9f1da4335a;hb=851b96062ead2bac361ce5aadbe46f44a7ecc5fc;hpb=2e181ded77e2754e651cac550b7e60fe4686bf26

diff --git a/all b/all
index 12d312af..54452f88 100755
--- a/all
+++ b/all
@@ -135,6 +135,18 @@ case "$base" in
 		exit 1
 		;;
 esac
+pushbase=`git config remote.origin.pushurl || true`
+case "$pushbase" in
+	*/xonotic.git)
+		pushbase=${pushbase%xonotic.git}
+		;;
+	'')
+		;;
+	*)
+		echo "The main repo is not xonotic.git, what have you done?"
+		exit 1
+		;;
+esac
 
 repourl()
 {
@@ -157,6 +169,27 @@ repourl()
 	fi
 }
 
+repopushurl()
+{
+	[ -n "$pushbase" ] || return 0
+	repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
+	if [ -n "$repo_t" ]; then
+		case "$repo_t" in
+			*://*)
+				;;
+			*)
+				echo "$pushbase$repo_t"
+				;;
+		esac
+	else
+		if [ x"$1" = x"." ]; then
+			echo "$pushbase""xonotic.git"
+		else
+			echo "$pushbase${1##*/}.git"
+		fi
+	fi
+}
+
 repobranch()
 {
 	repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
@@ -267,6 +300,13 @@ fix_upstream_rebase_mergefail()
 
 fix_git_config()
 {
+	verbose git config remote.origin.url "$1"
+	if [ -n "$2" ]; then
+		verbose git config remote.origin.pushurl "$2"
+	else
+		verbose git config --unset remote.origin.pushurl || true
+	fi
+	verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 	verbose git config core.autocrlf input
 	if [ -z "`git config push.default`" ]; then
 		verbose git config push.default current # or is tracking better?
@@ -296,20 +336,33 @@ case "$cmd" in
 			verbose fix_upstream_rebase_mergefail && verbose fix_upstream_rebase_mergeok
 		done
 		;;
+	fix_config)
+		for d in $repos; do
+			url=`repourl "$d"`
+			pushurl=`repopushurl "$d"`
+			branch=`repobranch "$d"`
+			if [ -d "$d0/$d" ]; then
+				verbose cd "$d0/$d"
+				fix_git_config "$url" "$pushurl"
+				cd "$d0"
+			fi
+		done
+		;;
 	update|pull)
 		allow_pull=true
 		if [ x"$1" = x"-N" ]; then
 			allow_pull=false
 		fi
+		if $allow_pull; then
+			"$SELF" fix_config
+		fi
 		for d in $repos; do
 			url=`repourl "$d"`
+			pushurl=`repopushurl "$d"`
 			branch=`repobranch "$d"`
 			if [ -d "$d0/$d" ]; then
 				if $allow_pull; then
 					enter "$d0/$d" verbose
-					fix_git_config
-					verbose git config remote.origin.url "$url"
-					verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 					r=`git symbolic-ref HEAD`
 					r=${r#refs/heads/}
 					if git config branch.$r.remote >/dev/null 2>&1; then
@@ -332,7 +385,7 @@ case "$cmd" in
 			else
 				verbose git clone "$url" "$d0/$d"
 				enter "$d0/$d" verbose
-				fix_git_config
+				fix_git_config "$url" "$pushurl"
 				if [ "$branch" != "master" ]; then
 					verbose git checkout --track -b "$branch" origin/"$branch"
 				fi
@@ -521,40 +574,49 @@ case "$cmd" in
 		done
 		;;
 	compile)
+		cleand0=false
+		cleandp=false
+		cleanqcc=false
+		cleanqc=false
+		debug=debug
 		if [ -z "$CC" ]; then
-			export CC="gcc -DSUPPORT_IPV6"
+			export CC="gcc -DSUPPORTIPV6"
 		fi
+		while :; do
+			case "$1" in
+				-c)
+					cleand0=true
+					cleandp=true
+					cleanqcc=true
+					cleanqc=true
+					shift
+					;;
+				-r)
+					debug=release
+					export CC="$CC -mtune=native -march=native"
+					shift
+					;;
+				*)
+					break
+					;;
+			esac
+		done
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
-			TARGETS="sv-debug cl-debug"
+			TARGETS="sv-$debug cl-$debug"
 		elif [ x"`uname`" = x"Darwin" ]; then
 			case "`uname -r`" in
 				?.*)
-					TARGETS="sv-debug cl-debug sdl-debug"
+					TARGETS="sv-$debug cl-$debug sdl-$debug"
 					;;
 				*)
 					# AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
-					TARGETS="sv-debug sdl-debug"
+					TARGETS="sv-$debug sdl-$debug"
 					;;
 			esac
 			export CC="$CC -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
 		else
-			TARGETS="sv-debug cl-debug sdl-debug"
+			TARGETS="sv-$debug cl-$debug sdl-$debug"
 		fi
-		case "$1" in
-			-c)
-				cleand0=true
-				cleandp=true
-				cleanqcc=true
-				cleanqc=true
-				shift
-				;;
-			*)
-				cleand0=false
-				cleandp=false
-				cleanqcc=false
-				cleanqc=false
-				;;
-		esac
 		if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
 			# if we give the command make the arg "", it will surely fail (invalid filename),
 			# so better handle it as an empty client option
@@ -924,6 +986,8 @@ case "$cmd" in
 		echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
 		;;
 	clean)
+		"$SELF" fix_config
+		"$SELF" update -N
 		force=false
 		gotoupstream=false
 		fetchupstream=false
@@ -1026,6 +1090,8 @@ case "$cmd" in
 						verbose git branch -D "${B#refs/heads/}"
 					fi
 				done
+				git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch -t master origin/master || true
+				git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch -t "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
 			fi
 		done
 		;;
@@ -1153,7 +1219,7 @@ case "$cmd" in
 		;;
 	release-engine-win32)
 		verbose "$SELF" release-compile win32 \
-			'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
+			'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -march=i686 -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
 			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
 			'' ''
 		verbose "$SELF" release-compile win32 \
@@ -1184,7 +1250,7 @@ case "$cmd" in
 		;;
 	release-engine-linux32)
 		verbose "$SELF" release-compile linux32 \
-			'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
+			'STRIP=: CC="gcc -m32 -march=i686 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
 			release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
 		;;