]> de.git.xonotic.org Git - xonotic/xonotic.git/blobdiff - misc/tools/all/release.subr
Merge remote-tracking branch 'origin/terencehill/sdl_compilation'
[xonotic/xonotic.git] / misc / tools / all / release.subr
index 544902fc620eb70d6bb74e2b53c56264a4bd9f8e..5a1f8d6c4106aded64f2d6202ae4cc7446c46a99 100644 (file)
@@ -173,7 +173,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 fteqcc source source/darkplaces source/fteqcc source/gmqcc source/d0_blind_id mapping
+                       verbose mkdir data gmqcc 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
@@ -183,7 +183,6 @@ case "$cmd" in
                        verbose rm -rf misc/pki
                )
                release_git_extract_dir "darkplaces" "Xonotic/source/darkplaces" .
-               release_git_extract_dir "fteqcc" "Xonotic/source/fteqcc" .
                release_git_extract_dir "gmqcc" "Xonotic/source/gmqcc" .
                release_git_extract_dir "data/xonotic-data.pk3dir" "Xonotic/source" qcsrc Makefile
                release_git_extract_dir "d0_blind_id" "Xonotic/source/d0_blind_id" .
@@ -223,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
@@ -232,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
@@ -256,54 +255,46 @@ case "$cmd" in
                makeflags=$2
                gmqcc_maketargets=$3
                gmqcc_files=$4
-               fteqcc_maketargets=$5
-               fteqcc_files=$6
-               darkplaces_maketargets=$7
-               darkplaces_files=$8
+               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/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/source/fteqcc" "$d0/misc/builddeps/dp.$suffix" "$fteqcc_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' \
-                       win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.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' \
-                       win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
                        release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe'
                ;;
        release-engine-osx)
                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' \
-                       all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.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' \
-                       all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.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' \
-                       all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
                        release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
                ;;
        release-engine)
@@ -327,7 +318,6 @@ case "$cmd" in
        release-qc)
                release_common
                verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/Xonotic/gmqcc/gmqcc.linux64" XON_BUILDSYSTEM=1 clean all
-               verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)
                release_common
@@ -379,6 +369,19 @@ case "$cmd" in
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;
+       release-buildpk3-transform-webp)
+               release_common
+               dir=$1
+               verbose cd "$dir"
+               # texture: convert to jpeg and dds
+               verbose export do_jpeg=false
+               verbose export do_webp=true
+               verbose export do_dds=false
+               verbose export do_ogg=false
+               verbose export ogg_ogg=false
+               verbose export del_src=true
+               find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
+               ;;
        release-buildpk3-transform-lowdds)
                release_common
                dir=$1
@@ -525,10 +528,9 @@ 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 ''
-               verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             low '-low' normaldds '' mapping '-mapping'
+               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'
                verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir     raw '' low '-low'
                verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                   normaldds ''
                ;;
@@ -549,59 +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/fteqcc/ \
-                       Xonotic/source/gmqcc/ \
-                       Xonotic/source/qcsrc/ \
-                       Xonotic/Docs \
-                       Xonotic/misc \
-                       Xonotic/fteqcc \
-                       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/fteqcc/ \
-                       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-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 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 \