From 50d685a299975ac14e7ff8df6ba2187669ea6d4a Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 10 Oct 2013 18:50:28 +0200 Subject: [PATCH] Get rid of separate -crypto.zip download; instead include AES support in the full download and provide a -noaes build. --- misc/tools/all/release.subr | 104 +++++++++++++++++------------------- 1 file changed, 50 insertions(+), 54 deletions(-) diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index d29dba38..4b71ab95 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -552,61 +552,57 @@ 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 - # let's pass crypto import laws of some nasty countries - crypto_libs=`find Xonotic -name \*d0_rijndael\*.so -o -name \*d0_rijndael\*.dylib -o -name \*d0_rijndael\*.dll -o -name \*d0_rijndael\*.c` - if [ -n "$crypto_libs" ]; then - verbose mkzip Xonotic-$stamp-crypto.zip \ - $crypto_libs \ + 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 - rm -f $crypto_libs - fi - # 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-nimbussansl-$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 cp Xonotic-$stamp-common.zip Xonotic-$stamp-low.zip - verbose mkzip0 Xonotic-$stamp-low.zip \ - Xonotic/data/xonotic-$pk3stamp-data-low.pk3 \ - Xonotic/data/xonotic-$pk3stamp-maps-low.pk3 \ - Xonotic/data/xonotic-$pk3stamp-music-low.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 + 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-nimbussansl-$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 cp Xonotic-$stamp-common$suffix.zip Xonotic-$stamp-low$suffix.zip + 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 + 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 + done verbose mkzip Xonotic-$stamp-mappingsupport.zip \ Xonotic/mapping verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \ -- 2.39.2