./all release: Just download stuff from travis.

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 5a1f8d6c4106aded64f2d6202ae4cc7446c46a99..2ddf9016108f02cefeb784569ade8f779c9d6c5a 100644 (file)
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -203,113 +203,55 @@ case "$cmd" in
                )
                ./all each git rev-parse HEAD > Xonotic/misc/git-revisions.txt
                ;;
-       release-compile-run)
+       release-getbinary)
                release_common
-               host=$1
-               buildpath=$2
-               maketargets=$3
-               makeflags=$4
-               srcdir=$5
-               depsdir=$6
-               targetfiles=$7
-               set -x
-               if [ -n "$targetfiles" ]; then
-                       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
-                               #verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
-                               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
-               fi
-               ;;
-       release-compile)
-               release_common
-               suffix=$1
-               makeflags=$2
-               gmqcc_maketargets=$3
-               gmqcc_files=$4
-               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/$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"
+               binary=$1
+               basename=${binary##*/}
+               verbose wget http://beta.xonotic.org/autobuild-bin/$rev/$binary
+               # TODO eventually do this on travis too.
+               case "$binary" in
+                       Xonotic/xonotic*.exe)
+                               verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}"
+                               ;;
+               esac
                ;;
        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" 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'
+               verbose "$SELF" release-getbinary Xonotic/xonotic.exe || true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-sdl.exe || true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || true
                ;;
        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" 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'
+               verbose "$SELF" release-getbinary Xonotic/xonotic-x64.exe || true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-x64-sdl.exe || true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-x64-dedicated.exe || true
                ;;
        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" 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'
+               verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || true
                ;;
        release-engine-linux32)
                release_common
-               verbose "$SELF" release-compile linux32 \
-                       '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'
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-glx || true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-sdl || true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-dedicated || true
                ;;
        release-engine-linux64)
                release_common
-               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' \
-                       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'
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || true
                ;;
        release-engine)
                release_common
-               verbose "$SELF" release-engine-linux32 &
-               verbose "$SELF" release-engine-linux64 &
-               verbose "$SELF" release-engine-win32 &
-               verbose "$SELF" release-engine-win64 &
-               verbose "$SELF" release-engine-osx &
-               wait %1
-               wait %2
-               wait %3
-               wait %4
-               wait %5
-               wait
+               # TODO report failures here.
+               verbose "$SELF" release-engine-linux32 || true
+               verbose "$SELF" release-engine-linux64 || true
+               verbose "$SELF" release-engine-win32 || true
+               verbose "$SELF" release-engine-win64 || true
+               verbose "$SELF" release-engine-osx || true
                ;;
        release-maps)
                release_common