X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;h=5a1f8d6c4106aded64f2d6202ae4cc7446c46a99;hb=c2ee4f71f5dd756f463544d67725dbf1b633a32a;hp=e312f0876e246169a5185f1fc9c001ea030d5697;hpb=a71d4950477e8abe3b0fc9e9d3767f72210d1bfe;p=xonotic%2Fxonotic.git diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index e312f087..5a1f8d6c 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -222,7 +222,7 @@ case "$cmd" in case " $HOSTS_THAT_ARE_MYSELF " in *\ $host\ *) verbose rsync --delete -zLvaSHP "$srcdir"/ "$buildpath/" - verbose rsync --delete -zLvaSHP "$depsdir"/ "$buildpath.deps/" + verbose rsync --delete -zLvaSHP "$depsdir"/*/ "$buildpath.deps/" verbose ln -snf "$buildpath.deps" "$buildpath/.deps" verbose eval make -C "$buildpath" clean $maketargets $makeflags for f in $targetfiles; do @@ -231,7 +231,7 @@ case "$cmd" in ;; *) verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/" - verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/" + verbose rsync --delete -zLvaSHP "$depsdir"/*/ "$host:$buildpath.deps/" verbose ssh "$host" "[ -f /etc/profile ] && . /etc/profile; [ -f ~/.profile ] && . ~/.profile; export LC_ALL=C; ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags" for f in $targetfiles; do verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true @@ -258,20 +258,20 @@ case "$cmd" in darkplaces_maketargets=$5 darkplaces_files=$6 host=xonotic-build-$suffix - verbose "$SELF" release-compile-run "$host" /tmp/gmqcc.build."$suffix" "$gmqcc_maketargets" "$makeflags" "Xonotic/source/gmqcc" "$d0/misc/builddeps/dp.$suffix" "$gmqcc_files" - verbose "$SELF" release-compile-run "$host" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$d0/misc/builddeps/dp.$suffix" "$darkplaces_files" + verbose "$SELF" release-compile-run "$host" /tmp/gmqcc.build."$suffix" "$gmqcc_maketargets" "$makeflags" "Xonotic/source/gmqcc" "$d0/misc/builddeps/$suffix" "$gmqcc_files" + verbose "$SELF" release-compile-run "$host" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$d0/misc/builddeps/$suffix" "$darkplaces_files" ;; release-engine-win32) release_common verbose "$SELF" release-compile win32 \ - 'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="i586-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=1' \ + 'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="i586-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="../../../.deps/bin/sdl-config" DP_LINK_ZLIB=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen WIN32RELEASE=1 D3D=1' \ gmqcc.exe 'gmqcc.exe:Xonotic/gmqcc/gmqcc.exe' \ release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe' ;; release-engine-win64) release_common verbose "$SELF" release-compile win64 \ - 'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="amd64-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \ + 'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="amd64-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="../../../.deps/bin/sdl-config" DP_LINK_ZLIB=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen WIN64RELEASE=1 D3D=1' \ gmqcc.exe 'gmqcc.exe:Xonotic/gmqcc/gmqcc-x64.exe' \ release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe' ;; @@ -279,21 +279,21 @@ case "$cmd" in release_common # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed verbose "$SELF" release-compile osx \ - 'STRIP=: CC="gcc -g1 -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \ + 'STRIP=: CC="gcc -g1 -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I../../../.deps/include -L../../../.deps/lib -fno-reorder-blocks -DSUPPORTIPV6" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen' \ gmqcc 'gmqcc:Xonotic/gmqcc/gmqcc.osx' \ 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' ;; release-engine-linux32) release_common verbose "$SELF" release-compile linux32 \ - 'STRIP=: CC="gcc -m32 -march=i686 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib DP_GMP_STATIC_LIBDIR=.deps/lib' \ + 'STRIP=: CC="gcc -m32 -march=i686 -g1 -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" LIB_JPEG=../../../.deps/lib/libjpeg.a LIB_CRYPTO="../../../.deps/lib/libd0_blind_id.a ../../../.deps/lib/libgmp.a" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=dlopen' \ gmqcc 'gmqcc:Xonotic/gmqcc/gmqcc.linux32' \ release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated' ;; release-engine-linux64) release_common verbose "$SELF" release-compile linux64 \ - 'STRIP=: CC="gcc -m64 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib DP_GMP_STATIC_LIBDIR=.deps/lib' \ + 'STRIP=: CC="gcc -m64 -g1 -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" LIB_JPEG=../../../.deps/lib/libjpeg.a LIB_CRYPTO="../../../.deps/lib/libd0_blind_id.a ../../../.deps/lib/libgmp.a" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=dlopen' \ gmqcc 'gmqcc:Xonotic/gmqcc/gmqcc.linux64' \ release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated' ;; @@ -528,7 +528,6 @@ case "$cmd" in ;; release-pack) release_common - verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw '' verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir raw '' verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir low '-low' normaldds '' webp '-high' verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir low '-low' normaldds '' mapping '-mapping' webp '-high' @@ -552,61 +551,56 @@ 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-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 \