X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=57fb07b66457d5fef38cf549da0aa0a96c5bf96b;hb=344cbae797415c32136298dfadf65c011c66ba1e;hp=8a8f82f98b6fda29c0979f384236c583efdb6bc0;hpb=96899d108f5ab0d3b5905136709f3f0f4ee6e2d5;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 8a8f82f9..57fb07b6 100755
--- a/all
+++ b/all
@@ -250,7 +250,7 @@ case "$cmd" in
 					verbose git config remote.origin.url "$url"
 					verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 
-					verbose git config remote.origin.autocrlf input
+					verbose git config core.autocrlf input
 
 					r=`git symbolic-ref HEAD`
 					r=${r#refs/heads/}
@@ -285,6 +285,11 @@ case "$cmd" in
 		misc/tools/xonotic-map-compiler-autobuild download
 		;;
 	checkout|switch)
+		checkoutflags=
+		if [ x"$1" = x"-f" ]; then
+			checkoutflags=-f
+			shift
+		fi
 		remote=$1
 		branch=$2
 		if [ -z "$branch" ]; then
@@ -305,18 +310,18 @@ case "$cmd" in
 			b=$branch
 			if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
 				exists=true
-				verbose git checkout "$b"
+				verbose git checkout $checkoutflags "$b"
 			elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
 				exists=true
-				verbose git checkout --track -b "$b" "$remote/$b"
+				verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
 			else
 				b=`repobranch "$d"`
 				if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
 					exists=true
-					verbose git checkout "$b"
+					verbose git checkout $checkoutflags "$b"
 				elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
 					exists=true
-					verbose git checkout --track -b "$b" "$remote/$b"
+					verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
 				else
 					echo "WTF? Not even branch $b doesn't exist in $d"
 					exit 1
@@ -980,7 +985,7 @@ case "$cmd" in
 	release-engine-osx)
 		# gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
 		verbose "$SELF" release-compile osx \
-			'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -I$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks" -fno-reorder-blocks' \
+			'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
 			'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin' 'darkplaces-dedicated:xonotic-osx-dedicated'
 		;;
@@ -999,7 +1004,7 @@ case "$cmd" in
 	release-engine)
 		verbose "$SELF" release-engine-osx
 		verbose "$SELF" release-engine-win32
-		verbose "$SELF" release-engine-win64
+		# verbose "$SELF" release-engine-win64
 		verbose "$SELF" release-engine-linux32
 		verbose "$SELF" release-engine-linux64
 		;;
@@ -1170,14 +1175,12 @@ case "$cmd" in
 		verbose zip -0yr Xonotic-$stamp-low.zip \
 			Xonotic/data/xonotic-$stamp-data-low.pk3 \
 			Xonotic/data/xonotic-$stamp-maps-low.pk3 \
-			Xonotic/data/xonotic-$stamp-music-low.pk3 \
-			Xonotic/data/xonotic-$stamp-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-music-low.pk3
 		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
 		verbose zip -0yr Xonotic-$stamp-lowdds.zip \
 			Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \
 			Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \
-			Xonotic/data/xonotic-$stamp-music-low.pk3 \
-			Xonotic/data/xonotic-$stamp-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-music-low.pk3
 		verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
 		verbose zip -0yr Xonotic-$stamp-high.zip \
 			Xonotic/data/xonotic-$stamp-data-raw.pk3 \