X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;h=3785d61c7c3b8c077a85f1fb14cd6721a22acbab;hb=edd17c8b7d432326e294c1df018b5ddb62f73b06;hp=104b8ccb77da222a3e801813199f7a1d94a940da;hpb=524db2b01ad2fb35b64741be812eecab3e8979dc;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 104b8ccb..3785d61c 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -172,7 +172,7 @@ case "$cmd" in
 		release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh xonotic-linux-dedicated.sh Makefile misc/buildfiles key_0.d0pk COPYING GPL-2 GPL-3
 		(
 			verbose cd Xonotic
-			verbose mkdir data gmqcc source source/darkplaces source/gmqcc source/d0_blind_id mapping
+			verbose mkdir data source source/darkplaces source/gmqcc source/d0_blind_id mapping
 			verbose rm -rf misc/builddeps
 			verbose mv misc/buildfiles/win32 bin32 || true
 			verbose mv bin32/SDL.dll . || true
@@ -262,8 +262,8 @@ case "$cmd" in
 		;;
 	release-qc)
 		release_common
-		verbose make -C "$d0/gmqcc" all
-		verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/gmqcc/gmqcc" XON_BUILDSYSTEM=1 clean all
+		verbose make -C "$d0/gmqcc" gmqcc
+		verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/gmqcc/gmqcc" XON_BUILDSYSTEM=1 clean qc
 		;;
 	release-buildpk3-transform-raw)
 		release_common
@@ -392,6 +392,10 @@ case "$cmd" in
 			verbose cp ../source/progs.dat .
 			verbose cp ../source/csprogs.dat .
 			verbose cp ../source/menu.dat .
+			# Include line numbers in qc errors
+			verbose cp ../source/progs.lno .
+			verbose cp ../source/csprogs.lno .
+			verbose cp ../source/menu.lno .
 			verbose rm -rf qcsrc
 			getversion .
 			case "$RELEASETYPE" in
@@ -480,7 +484,7 @@ case "$cmd" in
 		verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir             low '-low' normaldds ''                    normal '-high'
 		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             low '-low' normaldds '' mapping '-mapping' normal '-high'
 		verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir     raw '' low '-low'
-		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                   normaldds ''
+		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir        low '-low' normaldds ''                    normal '-high'
 		;;
 	release-pack-needsx11)
 		release_common
@@ -541,14 +545,14 @@ case "$cmd" in
 			verbose mkzip0 Xonotic-$stamp-low$suffix.zip \
 				Xonotic/data/xonotic-$pk3stamp-data-low.pk3 \
 				Xonotic/data/xonotic-$pk3stamp-maps-low.pk3 \
-				Xonotic/data/xonotic-$pk3stamp-music-low.pk3
+				Xonotic/data/xonotic-$pk3stamp-music-low.pk3 \
+				Xonotic/data/xonotic-$pk3stamp-nexcompat-low.pk3
 			verbose mv Xonotic-$stamp-common$suffix.zip Xonotic-$stamp-high$suffix.zip
 			verbose mkzip0 Xonotic-$stamp-high$suffix.zip \
 				Xonotic/data/xonotic-$pk3stamp-data-high.pk3 \
 				Xonotic/data/xonotic-$pk3stamp-maps-high.pk3 \
-				Xonotic/data/xonotic-$pk3stamp-music.pk3
-			# let's pass crypto import laws of some nasty countries
-			find Xonotic -name \*d0_rijndael\*.so -o -name \*d0_rijndael\*.dylib -o -name \*d0_rijndael\*.dll -o -name \*d0_rijndael\*.c -delete
+				Xonotic/data/xonotic-$pk3stamp-music.pk3 \
+				Xonotic/data/xonotic-$pk3stamp-nexcompat-high.pk3
 		done
 		verbose mkzip Xonotic-$stamp-mappingsupport.zip \
 			Xonotic/mapping