From: Rudolf Polzer <divVerent@gmail.com>
Date: Sun, 30 May 2021 21:31:41 +0000 (+0200)
Subject: Kill the -noaes builds (they're already 100% identical).
X-Git-Tag: xonotic-v0.8.5~62
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f14ac51ce1e06020892b5027dd4bbc5d9a16fb4a;p=xonotic%2Fxonotic.git

Kill the -noaes builds (they're already 100% identical).
---

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 960b0441..b15141dc 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -458,51 +458,49 @@ case "$cmd" in
 		pk3stamp=`cat Xonotic/pk3stamp.txt`
 		# exe and dll files do not need +x, so this makes them eligible for 7zip compression too
 		chmod a-x Xonotic/*.exe Xonotic/*.dll || true
-		for suffix in '' '-noaes'; do
-			# build the archives
-			verbose mkzip Xonotic-$stamp-enginesource$suffix.zip \
-				Xonotic/Makefile \
-				Xonotic/source/darkplaces/ \
-				Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3
-			verbose cp Xonotic-$stamp-enginesource$suffix.zip Xonotic-$stamp-engine$suffix.zip
-			verbose mkzip Xonotic-$stamp-engine$suffix.zip \
-				Xonotic/*.dll \
-				Xonotic/bin32/*.dll \
-				Xonotic/bin64/*.dll \
-				Xonotic/*.app \
-				Xonotic/xonotic-* \
-				Xonotic/xonotic.exe
-			verbose cp Xonotic-$stamp-engine$suffix.zip Xonotic-$stamp-common$suffix.zip
-			verbose mkzip Xonotic-$stamp-common$suffix.zip \
-				Xonotic/source/d0_blind_id/ \
-				Xonotic/source/gmqcc/ \
-				Xonotic/source/qcsrc/ \
-				Xonotic/Docs \
-				Xonotic/misc \
-				Xonotic/gmqcc \
-				Xonotic/server \
-				Xonotic/key_0.d0pk \
-				Xonotic/data/font-unifont-$pk3stamp.pk3 \
-				Xonotic/data/font-xolonium-$pk3stamp.pk3
-			verbose cp Xonotic-$stamp-enginesource$suffix.zip Xonotic-$stamp-source$suffix.zip
-			verbose mkzip Xonotic-$stamp-source$suffix.zip \
-				Xonotic/source/d0_blind_id/ \
-				Xonotic/source/gmqcc/ \
-				Xonotic/source/qcsrc/ \
-				Xonotic/misc/logos
-			verbose cp Xonotic-$stamp-common$suffix.zip Xonotic-$stamp$suffix.zip
-			verbose mkzip0 Xonotic-$stamp$suffix.zip \
-				Xonotic/data/xonotic-$pk3stamp-data.pk3 \
-				Xonotic/data/xonotic-$pk3stamp-maps.pk3 \
-				Xonotic/data/xonotic-$pk3stamp-music.pk3 \
-				Xonotic/data/xonotic-$pk3stamp-nexcompat.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 \
-				Xonotic/data/xonotic-$pk3stamp-nexcompat-high.pk3
-		done
+		# build the archives
+		verbose mkzip Xonotic-$stamp-enginesource.zip \
+			Xonotic/Makefile \
+			Xonotic/source/darkplaces/ \
+			Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3
+		verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-engine.zip
+		verbose mkzip Xonotic-$stamp-engine.zip \
+			Xonotic/*.dll \
+			Xonotic/bin32/*.dll \
+			Xonotic/bin64/*.dll \
+			Xonotic/*.app \
+			Xonotic/xonotic-* \
+			Xonotic/xonotic.exe
+		verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
+		verbose mkzip Xonotic-$stamp-common.zip \
+			Xonotic/source/d0_blind_id/ \
+			Xonotic/source/gmqcc/ \
+			Xonotic/source/qcsrc/ \
+			Xonotic/Docs \
+			Xonotic/misc \
+			Xonotic/gmqcc \
+			Xonotic/server \
+			Xonotic/key_0.d0pk \
+			Xonotic/data/font-unifont-$pk3stamp.pk3 \
+			Xonotic/data/font-xolonium-$pk3stamp.pk3
+		verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-source.zip
+		verbose mkzip Xonotic-$stamp-source.zip \
+			Xonotic/source/d0_blind_id/ \
+			Xonotic/source/gmqcc/ \
+			Xonotic/source/qcsrc/ \
+			Xonotic/misc/logos
+		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
+		verbose mkzip0 Xonotic-$stamp.zip \
+			Xonotic/data/xonotic-$pk3stamp-data.pk3 \
+			Xonotic/data/xonotic-$pk3stamp-maps.pk3 \
+			Xonotic/data/xonotic-$pk3stamp-music.pk3 \
+			Xonotic/data/xonotic-$pk3stamp-nexcompat.pk3
+		verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
+		verbose mkzip0 Xonotic-$stamp-high.zip \
+			Xonotic/data/xonotic-$pk3stamp-data-high.pk3 \
+			Xonotic/data/xonotic-$pk3stamp-maps-high.pk3 \
+			Xonotic/data/xonotic-$pk3stamp-music.pk3 \
+			Xonotic/data/xonotic-$pk3stamp-nexcompat-high.pk3
 		verbose mkzip Xonotic-$stamp-mappingsupport.zip \
 			Xonotic/mapping
 		verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \