X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=afc203f140b6800154e87c06b73cc21e22a8ecdb;hp=b0173fdb6c1ff7a72cd78b0750ae376302f3a35c;hb=3501f1c4f3a19a7fef42535371895afa033a8fb2;hpb=6df5df1c44c1c3eed4e60f4419054edf843cc390

diff --git a/all b/all
index b0173fdb..afc203f1 100755
--- a/all
+++ b/all
@@ -864,14 +864,28 @@ case "$cmd" in
 		mkdir -p Xonotic
 		git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
 			cd Xonotic
-			mkdir data fteqcc
+			mkdir data fteqcc darkplaces-src fteqcc-src
 			tar xvf -
 			rm -rf misc/builddeps
-			mv misc/buildfiles/win32/* .
-			mv misc/buildfiles/win64/* .
-			mv misc/buildfiles/osx/* .
+			mv misc/buildfiles/win32/* . || true
+			mv misc/buildfiles/win64/* . || true
+			mv misc/buildfiles/osx/* . || true
 			rm -rf misc/buildfiles
 		}
+		{
+			cd darkplaces
+			git archive --format=tar HEAD
+		} | {
+			cd Xonotic/darkplaces-src
+			tar xvf -
+		}
+		{
+			cd fteqcc
+			git archive --format=tar HEAD
+		} | {
+			cd Xonotic/fteqcc-src
+			tar xvf -
+		}
 		;;
 	release-compile-run)
 		host=$1
@@ -907,20 +921,20 @@ case "$cmd" in
 		fteqcc_files=$4
 		darkplaces_maketargets=$5
 		darkplaces_files=$6
-		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "fteqcc" "$fteqcc_files"
-		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "darkplaces" "$darkplaces_files"
+		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/fteqcc-src" "$fteqcc_files"
+		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/darkplaces-src" "$darkplaces_files"
 		;;
 	release-engine-win32)
 		"$SELF" release-compile win32 \
 			'DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \
 			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
-			debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
+			debug 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
 		;;
 	release-engine-win64)
 		"$SELF" release-compile win64 \
 			'DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LDFLAGS_WINCOMMON=""' \
 			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-64.exe' \
-			debug 'darkplaces.exe:xonotic-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-64.exe'
+			debug 'darkplaces.exe:Xonotic/xonotic-64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-64.exe'
 		;;
 	release-engine-osx)
 		"$SELF" release-compile osx \
@@ -942,7 +956,7 @@ case "$cmd" in
 		;;
 	release-engine)
 		"$SELF" release-engine-win32 &
-		"$SELF" release-engine-win64 &
+		# "$SELF" release-engine-win64 &
 		"$SELF" release-engine-osx &
 		"$SELF" release-engine-linux32 &
 		"$SELF" release-engine-linux64 &
@@ -950,13 +964,6 @@ case "$cmd" in
 		;;
 	release-maps)
 		"$SELF" update-maps
-		for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
-			if [ -f "$X" ]; then
-				cd Xonotic/data/xonotic-maps.pk3dir
-				unzip ../../../"$X"
-				cd ../../..
-			fi
-		done
 		;;
 	release-finish)
 		# version numnber and stuff like that
@@ -1017,6 +1024,16 @@ case "$cmd" in
 			cp "$src"/csprogs.dat Xonotic/temp/
 			cp "$src"/menu.dat Xonotic/temp/
 		fi
+		if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
+			for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+				if [ -f "$X" ]; then
+					(
+						cd Xonotic/data/xonotic-maps.pk3dir
+						unzip ../../../"$X"
+					)
+				fi
+			done
+		fi
 		"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
 		cd Xonotic/temp
 		zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
@@ -1033,19 +1050,30 @@ case "$cmd" in
 		done
 		;;
 	release-pack)
-		"$SELF" release-buildpk3s data/font-dejavu.pk3dir                  raw ''
+		"$SELF" release-buildpk3s data/font-nimbussansl.pk3dir             raw ''
 		"$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low'
 		"$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low'
 		"$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
 		"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
 		;;
+	release-pack-needsx11)
+		case "$DISPLAY" in
+			'')
+				startx "$SELF" release-pack -- :7
+				;;
+			*)
+				"$SELF" release-pack
+				;;
+		esac
+		;;
 	release)
 		"$SELF" release-prepare
-		"$SELF" release-engine
-		"$SELF" release-maps
-		"$SELF" release-finish
-		"$SELF" release-qc
-		"$SELF" release-pack
+		"$SELF" release-maps &
+		"$SELF" release-engine &
+		"$SELF" release-finish &
+		"$SELF" release-qc &
+		wait
+		"$SELF" release-pack-needsx11
 		;;
 
 	*)