]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - misc/tools/all/release.subr
Go back to self-building rather than relying on Travis.
[xonotic/xonotic.git] / misc / tools / all / release.subr
index 104b8ccb77da222a3e801813199f7a1d94a940da..13d22105bcde59430db189cd06f216918259f0bb 100644 (file)
@@ -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
@@ -202,6 +202,61 @@ case "$cmd" in
                )
                ./all each git rev-parse HEAD > Xonotic/misc/git-revisions.txt
                ;;
+       release-compile-run)
+               release_common
+               host=$1
+               buildpath=$2
+               maketargets=$3
+               makeflags=$4
+               srcdir=$5
+               depsdir=$6
+               targetfiles=$7
+               set -x
+               if [ -z "$targetfiles" ]; then
+                       exit
+               fi
+               case " $HOSTS_THAT_ARE_DISABLED " in
+                       *\ $host\ *)
+                               exit
+                               ;;
+               esac
+               case " $HOSTS_THAT_ARE_MYSELF " in
+                       *\ $host\ *)
+                               verbose rsync --delete -zLvaSHP "$srcdir"/ "$buildpath/"
+                               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
+                                       verbose mv "$buildpath/${f%:*}" "${f##*:}" || true
+                               done
+                               ;;
+                       *)
+                               verbose rsync --delete -zLvaSHP "$srcdir"/ "$host":"$buildpath/"
+                               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
+                               done
+                               ;;
+               esac
+               # now rebrand the binaries...
+               for f in $targetfiles; do
+                       case "${f##*:}" in
+                               Xonotic/xonotic*.exe)
+                                       verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}"
+                                       ;;
+                       esac
+               done
+               ;;
+       release-compile)
+               release_common
+               suffix=$1
+               makeflags=$2
+               darkplaces_maketargets=$3
+               darkplaces_files=$4
+               host=xonotic-build-$suffix
+               verbose "$SELF" release-compile-run "$host" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$d0/misc/builddeps/$suffix" "$darkplaces_files"
+               ;;
        release-getbinary)
                release_common
                binary=$1
@@ -219,32 +274,44 @@ case "$cmd" in
                ;;
        release-engine-win32)
                release_common
-               good=true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x86.exe || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x86-dedicated.exe || good=false
-               $good
+               #good=true
+               #verbose "$SELF" release-getbinary Xonotic/xonotic-x86.exe || good=false
+               #verbose "$SELF" release-getbinary Xonotic/xonotic-x86-dedicated.exe || good=false
+               #$good
+               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" 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' \
+                       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
-               good=true
-               verbose "$SELF" release-getbinary Xonotic/xonotic.exe || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false
-               $good
+               #good=true
+               #verbose "$SELF" release-getbinary Xonotic/xonotic.exe || good=false
+               #verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false
+               #$good
+               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" 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' \
+                       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
-               good=true
-               verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || good=false
-               $good
+               #good=true
+               #verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || good=false
+               #verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || good=false
+               #$good
+               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" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen' \
+                       'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
                ;;
        release-engine-linux64)
                release_common
-               good=true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
-               $good
+               #good=true
+               #verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || good=false
+               #verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || good=false
+               #verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
+               #$good
+               verbose "$SELF" release-compile linux64 \
+                       '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' \
+                       release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
                ;;
        release-engine)
                release_common
@@ -253,7 +320,7 @@ case "$cmd" in
                verbose "$SELF" release-engine-linux64 && good=true
                verbose "$SELF" release-engine-win32 && good=true
                verbose "$SELF" release-engine-win64 && good=true
-               verbose "$SELF" release-engine-osx && good=true
+               #verbose "$SELF" release-engine-osx && good=true
                $good
                ;;
        release-maps)
@@ -262,8 +329,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
@@ -300,51 +367,6 @@ case "$cmd" in
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;
-       release-buildpk3-transform-low)
-               release_common
-               dir=$1
-               verbose cd "$dir"
-               # texture: convert to jpeg and dds
-               # music: reduce bitrate
-               verbose export do_jpeg=true
-               verbose export jpeg_qual_rgb=80
-               verbose export jpeg_qual_a=97
-               verbose export do_dds=false
-               verbose export do_ogg=true
-               verbose export ogg_qual=1
-               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
-               verbose cd "$dir"
-               # texture: convert to jpeg and dds
-               # music: reduce bitrate
-               verbose export do_jpeg=false
-               verbose export do_jpeg_if_not_dds=true
-               verbose export jpeg_qual_rgb=80
-               verbose export jpeg_qual_a=99
-               verbose export do_dds=true
-               verbose export dds_flags=
-               verbose export do_ogg=true
-               verbose export ogg_qual=1
-               verbose export del_src=true
-               find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
-               ;;
        release-buildpk3-transform-mapping)
                release_common
                dir=$1
@@ -392,6 +414,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
@@ -477,10 +503,10 @@ case "$cmd" in
                release_common
                verbose "$SELF" release-buildpk3s data/font-unifont.pk3dir      raw ''
                verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir     raw ''
-               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-data.pk3dir             normaldds ''                    normal '-high'
+               verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             normaldds '' mapping '-mapping' normal '-high'
+               verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir     raw ''
+               verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir        normaldds ''                    normal '-high'
                ;;
        release-pack-needsx11)
                release_common
@@ -499,57 +525,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 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
+               # 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 \
@@ -564,7 +582,7 @@ case "$cmd" in
                verbose "$SELF" release-maps
                verbose "$SELF" release-engine
                verbose "$SELF" release-qc
-               verbose "$SELF" release-pack-needsx11
+               verbose "$SELF" release-pack
                verbose "$SELF" release-zip
                ;;
        *)