X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=1cb555a46eae7b7c7d0363d62d74fe87e7e8a113;hp=6c5018d8148ee86d1f1a4f2e9315102e09fc2d0b;hb=32a3364b398bbacdb05b66c381a4fc79685b4e21;hpb=40ce12279af673d92cf2dcf0961e5f2722f09924

diff --git a/all b/all
index 6c5018d8..1cb555a4 100755
--- a/all
+++ b/all
@@ -860,7 +860,7 @@ case "$cmd" in
 	# release building goes here
 	release-prepare)
 		#"$SELF" each git clean -fxd
-		rm -rf Xonotic
+		rm -rf Xonotic Xonotic*.zip
 		mkdir -p Xonotic
 		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 | {
@@ -966,9 +966,6 @@ case "$cmd" in
 	release-maps)
 		"$SELF" update-maps
 		;;
-	release-finish)
-		# version number and stuff like that
-		;;
 	release-qc)
 		verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
 		;;
@@ -1053,6 +1050,18 @@ case "$cmd" in
 				fi
 			done
 		fi
+		if [ -f "defaultXonotic.cfg" ]; then
+			gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
+			major=$(($gv / 10000))
+			minor=$(($gv / 100 - $major * 100))
+			patch=$(($gv - $major * 10000 - $minor * 100))
+			sed -i "
+				s/^set g_xonoticversion [^ ]* /set g_xonoticversion $major.$minor.$patch /;
+				s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
+				s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
+			" defaultXonotic.cfg
+			echo "r_texture_dds_load 1" >> quake.rc
+		fi
 		"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
 		cd Xonotic/temp
 		zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
@@ -1066,7 +1075,7 @@ case "$cmd" in
 		dst=${src%.pk3dir}
 		case "$dst" in
 			data/xonotic-*)
-				dst="xonotic-$stamp-${dst#data/xonotic-}"
+				dst="data/xonotic-$stamp-${dst#data/xonotic-}"
 				;;
 			*)
 				dst="$dst-$stamp"
@@ -1137,9 +1146,8 @@ case "$cmd" in
 		"$SELF" release-prepare
 		"$SELF" release-maps &
 		"$SELF" release-engine &
-		"$SELF" release-finish &
-		"$SELF" release-qc &
 		wait
+		"$SELF" release-qc
 		"$SELF" release-pack-needsx11
 		"$SELF" release-zip
 		;;