X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=5d38877d75f0f98390a6206f80bf65ed0bb919d5;hp=a24b92af4c19e22c96559d568f4081cf0c10bd9f;hb=ffc605ed11c3269d728bfa433c6640248f2cb58d;hpb=a675524294f3da80f63b45b69afc2006b779a45f

diff --git a/all b/all
index a24b92af..5d38877d 100755
--- a/all
+++ b/all
@@ -792,7 +792,7 @@ case "$cmd" in
 					elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
 						git checkout "$realbase"
 						org=`git rev-parse HEAD`
-						if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
+						if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1	' >/dev/null; }; then
 							git reset --hard "$org"
 							GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
 							reportdo4 cat "$t"
@@ -934,26 +934,28 @@ case "$cmd" in
 		makeflags=$4
 		srcdir=$5
 		targetfiles=$6
-		case " $HOSTS_THAT_ARE_MYSELF " in
-			*\ $host\ *)
-				verbose rsync --delete -zvaSHP "$srcdir"/ "$buildpath/"
-				verbose eval make -C "$buildpath" clean $maketargets $makeflags
-				for f in $targetfiles; do
-					verbose mv "$buildpath/${f%:*}" "${f##*:}" || true
-				done
-				;;
-			*)
-				verbose rsync --delete -zvaSHP "$srcdir"/ "$host:$buildpath/"
-				verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
-				for f in $targetfiles; do
-					verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
-				done
-				;;
-		esac
-		# now rebrand the binaries...
-		for f in $targetfiles; do
-			verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "$d0/misc/tools/xonotic.brand" "${f##*:}" || true
-		done
+		if [ -n "$targetfiles" ]; then
+			case " $HOSTS_THAT_ARE_MYSELF " in
+				*\ $host\ *)
+					verbose rsync --delete -zvaSHP "$srcdir"/ "$buildpath/"
+					verbose eval make -C "$buildpath" clean $maketargets $makeflags
+					for f in $targetfiles; do
+						verbose mv "$buildpath/${f%:*}" "${f##*:}" || true
+					done
+					;;
+				*)
+					verbose rsync --delete -zvaSHP "$srcdir"/ "$host:$buildpath/"
+					verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
+					for f in $targetfiles; do
+						verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
+					done
+					;;
+			esac
+			# now rebrand the binaries...
+			for f in $targetfiles; do
+				verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+			done
+		fi
 		;;
 	release-compile)
 		suffix=$1
@@ -978,12 +980,23 @@ case "$cmd" in
 			'sv-release cl-release' 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
 			# release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
 		;;
-	release-engine-osx)
+	release-engine-osx-sv-sdl)
 		# 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.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks" LIB_JPEG= CFLAGS_LIBJPEG=' \
+			'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'
+			'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
+		;;
+	release-engine-osx-agl)
+		# 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 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
+			'' '' \
+			'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+		;;
+	release-engine-osx)
+		verbose "$SELF" release-engine-osx-sv-sdl
+		verbose "$SELF" release-engine-osx-agl
 		;;
 	release-engine-linux32)
 		verbose "$SELF" release-compile linux32 \