X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=3cf531cb8ae654b2755efc0831918df8f6968aa8;hp=468406bea678a288ef400cf36a516077cb605056;hb=68d15718f43220af0480dd2183df1921dedec6b1;hpb=e17b0dab5c0e5fe344eadbcb59c58f28e1b9d70a

diff --git a/all b/all
index 468406be..3cf531cb 100755
--- a/all
+++ b/all
@@ -865,7 +865,7 @@ case "$cmd" in
 		date +%Y%m%d > Xonotic/stamp.txt
 		git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
 			cd Xonotic
-			mkdir data fteqcc darkplaces-src fteqcc-src
+			mkdir data fteqcc source source/darkplaces source/fteqcc
 			tar xvf -
 			rm -rf misc/builddeps
 			mv misc/buildfiles/win32/* . || true
@@ -877,14 +877,21 @@ case "$cmd" in
 			cd darkplaces
 			git archive --format=tar HEAD
 		} | {
-			cd Xonotic/darkplaces-src
+			cd Xonotic/source/darkplaces
 			tar xvf -
 		}
 		{
 			cd fteqcc
 			git archive --format=tar HEAD
 		} | {
-			cd Xonotic/fteqcc-src
+			cd Xonotic/source/fteqcc
+			tar xvf -
+		}
+		{
+			cd data/xonotic-data.pk3dir
+			git archive --format=tar HEAD -- qcsrc
+		} | {
+			cd Xonotic/source
 			tar xvf -
 		}
 		;;
@@ -926,8 +933,8 @@ 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" "Xonotic/fteqcc-src" "$fteqcc_files"
-		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/darkplaces-src" "$darkplaces_files"
+		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/source/fteqcc" "$fteqcc_files"
+		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$darkplaces_files"
 		;;
 	release-engine-win32)
 		"$SELF" release-compile win32 \
@@ -1046,18 +1053,7 @@ case "$cmd" in
 			cp "$src"/progs.dat Xonotic/temp/
 			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/temp
-						unzip ../../"$X"
-					)
-				fi
-			done
-		fi
-		if [ -f "defaultXonotic.cfg" ]; then
+			rm -rf qcsrc
 			gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
 			major=$(($gv / 10000))
 			minor=$(($gv / 100 - $major * 100))
@@ -1069,9 +1065,19 @@ case "$cmd" in
 			" defaultXonotic.cfg
 			echo "r_texture_dds_load 1" >> quake.rc
 		fi
+		if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
+			for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+				if [ -f "$X" ]; then
+					(
+						cd Xonotic/temp
+						unzip ../../"$X"
+					)
+				fi
+			done
+		fi
 		"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
 		cd Xonotic/temp
-		zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
+		zip -9yr "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
 		cd ../..
 		rm -rf Xonotic/temp
 		;;
@@ -1113,42 +1119,41 @@ case "$cmd" in
 		;;
 	release-zip)
 		stamp=`cat Xonotic/stamp.txt`
-		zip -9r Xonotic-common.zip \
+		zip -9yr Xonotic-common.zip \
 			Xonotic/*.dll \
-			Xonotic/darkplaces-src \
+			Xonotic/source \
 			Xonotic/Docs \
-			Xonotic/fteqcc-src \
 			Xonotic/misc \
 			Xonotic/fteqcc \
 			Xonotic/server \
 			Xonotic/*.app \
 			Xonotic/xonotic-* \
+			Xonotic/xonotic.exe \
 			Xonotic/data/font-nimbussansl-$stamp.pk3
 		cp Xonotic-common.zip Xonotic.zip
-		zip -0r Xonotic.zip \
+		zip -0yr Xonotic.zip \
 			Xonotic/data/xonotic-$stamp-data.pk3 \
 			Xonotic/data/xonotic-$stamp-maps.pk3 \
 			Xonotic/data/xonotic-$stamp-music.pk3 \
 			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		cp Xonotic-common.zip Xonotic-low.zip
-		zip -0r Xonotic-low.zip \
+		zip -0yr Xonotic-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
 		cp Xonotic-common.zip Xonotic-lowdds.zip
-		zip -0r Xonotic-lowdds.zip \
+		zip -0yr Xonotic-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
-		cp Xonotic-common.zip Xonotic-high.zip
-		zip -0r Xonotic-high.zip \
+		mv Xonotic-common.zip Xonotic-high.zip
+		zip -0yr Xonotic-high.zip \
 			Xonotic/data/xonotic-$stamp-data-raw.pk3 \
 			Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
 			Xonotic/data/xonotic-$stamp-music.pk3 \
 			Xonotic/data/xonotic-$stamp-nexcompat.pk3
-		rm -f Xonotic-common.zip
 		;;
 	release)
 		"$SELF" release-prepare