X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=9d6b6b29f88ebc12a0b39b86826b15102e13eda5;hp=6e4a3638a215945ddca892e7a2733b62538778a0;hb=17ee74dbb9d3b3068c79429e3f3118a948752264;hpb=5df4279b76015f1e07d10b1fd69ee2efcb1406bb

diff --git a/all b/all
index 6e4a3638..9d6b6b29 100755
--- a/all
+++ b/all
@@ -539,7 +539,7 @@ case "$cmd" in
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			client=
-			export PATH="$d0/misc/buildfiles/w32:$PATH"
+			export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
 			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
@@ -804,22 +804,20 @@ case "$cmd" in
 		;;
 
 	# release building goes here
-	release-mkdir)
-		mkdir -p Xonotic/"$1"
-		;;
 	release-prepare)
-#"$SELF" each git clean -fxd
+		#"$SELF" each git clean -fxd
+		rm -rf Xonotic
 		mkdir -p Xonotic
-		"$SELF" release-copy Docs/
-		"$SELF" release-copy misc/
-		"$SELF" release-copy server/
-		"$SELF" release-copy xonotic-linux-glx.sh
-		"$SELF" release-copy xonotic-linux-sdl.sh
-		"$SELF" release-mkdir data
-		"$SELF" release-mkdir fteqcc
-		;;
-	release-copy)
-		rsync --exclude=.git -vaSHPAX "$1" Xonotic/"$1"
+		git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
+			cd Xonotic
+			mkdir data fteqcc
+			tar xvf -
+			rm -rf misc/builddeps
+			mv misc/buildfiles/win32/* .
+			mv misc/buildfiles/win64/* .
+			mv misc/buildfiles/osx/* .
+			rm -rf misc/buildfiles
+		}
 		;;
 	release-compile-run)
 		host=$1
@@ -845,21 +843,18 @@ case "$cmd" in
 		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "fteqcc" "$darkplaces_files"
 		;;
 	release-engine-win32)
-		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
 		"$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/db.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \
+			'"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'
 		;;
 	release-engine-win64)
-		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
-		"$SELF" release-compile win32 \
-			'"DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/db.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config"' \
-			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
+		"$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'
 		;;
 	release-engine-osx)
-		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/
 		"$SELF" release-compile osx \
 			'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"' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
@@ -869,13 +864,13 @@ case "$cmd" in
 		"$SELF" release-compile linux32 \
 			'CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib DP_LINK_TO_LIBJPEG=1' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
-			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux32-dedicated'
+			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
 		;;
 	release-engine-linux64)
 		"$SELF" release-compile linux64 \
 			'CC="gcc -m64 -g -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib DP_LINK_TO_LIBJPEG=1' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
-			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux64-dedicated'
+			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
 		;;
 	release-engine)
 		"$SELF" release-engine-win32 &
@@ -899,7 +894,7 @@ case "$cmd" in
 		# version numnber and stuff like that
 		;;
 	release-qc)
-		verbose make -C Xonotic/data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
+		verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
 		;;
 	release-buildpk3-transform-raw)
 		dir=$1
@@ -941,7 +936,19 @@ case "$cmd" in
 				;;
 		esac
 		rm -rf Xonotic/temp
-		rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
+		mkdir -p Xonotic/temp
+		{
+			cd "$src"
+			git archive --format=tar HEAD
+		} | {
+			cd Xonotic/temp
+			tar xvf -
+		}
+		if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
+			cp "$src"/progs.dat Xonotic/temp/
+			cp "$src"/csprogs.dat Xonotic/temp/
+			cp "$src"/menu.dat Xonotic/temp/
+		fi
 		"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
 		cd Xonotic/temp
 		zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
@@ -966,12 +973,13 @@ case "$cmd" in
 		;;
 	release)
 		"$SELF" release-prepare
+		"$SELF" release-engine
 		"$SELF" release-maps
 		"$SELF" release-finish
 		"$SELF" release-qc
 		"$SELF" release-pack
-		"$SELF" release-engine
 		;;
+
 	*)
 		echo "Usage:"
 		echo "  $SELF pull"