Merge branch 'master' of ssh://git.xonotic.org/xonotic

diff --git a/all b/all
index cc3dd09d7a8a55e37adc9cea3c44c64a902f6ac2..83ef8bdac82afcbbeecc8337e673764f1caf6f20 100755 (executable)
--- a/all
+++ b/all
@@ -976,19 +976,23 @@ case "$cmd" in
                maketargets=$3
                makeflags=$4
                srcdir=$5
-               targetfiles=$6
+               depsdir=$6
+               targetfiles=$7
                if [ -n "$targetfiles" ]; then
                        case " $HOSTS_THAT_ARE_MYSELF " in
                                *\ $host\ *)
-                                       verbose rsync --delete -zvaSHP "$srcdir"/ "$buildpath/"
+                                       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 -zvaSHP "$srcdir"/ "$host:$buildpath/"
-                                       verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
+                                       verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/"
+                                       verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/"
+                                       verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && make clean $maketargets $makeflags"
                                        for f in $targetfiles; do
                                                verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
                                        done
@@ -1021,20 +1025,21 @@ case "$cmd" in
                fteqcc_files=$4
                darkplaces_maketargets=$5
                darkplaces_files=$6
-               verbose "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/source/fteqcc" "$fteqcc_files"
-               verbose "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$darkplaces_files"
+               host=xonotic-build-$suffix
+               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"
                ;;
        release-engine-win32)
                # TODO change to g++ and D3D=1 when D3D gets added
                verbose "$SELF" release-compile win32 \
-                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
                        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)
                # TODO change to g++ and D3D=1 when D3D gets added
                verbose "$SELF" release-compile win64 \
-                       'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
                        'sv-release cl-release' 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
                        # release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
@@ -1042,14 +1047,14 @@ case "$cmd" in
        release-engine-osx-sv-sdl)
                # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
                verbose "$SELF" release-compile osx \
-                       'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
+                       'STRIP=: CC="gcc -g -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"' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
                        'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
                ;;
        release-engine-osx-agl)
                # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
                verbose "$SELF" release-compile osx \
-                       'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
+                       'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks"' \
                        '' '' \
                        'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
                ;;
@@ -1059,13 +1064,13 @@ case "$cmd" in
                ;;
        release-engine-linux32)
                verbose "$SELF" release-compile linux32 \
-                       'STRIP=: CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib LIB_JPEG=$HOME/dp.linux32/lib/libjpeg.a' \
+                       'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
                        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)
                verbose "$SELF" release-compile linux64 \
-                       'STRIP=: CC="gcc -m64 -g -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib LIB_JPEG=$HOME/dp.linux64/lib/libjpeg.a' \
+                       'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
                        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'
                ;;

diff --git a/misc/builddeps/dp.linux32/bin/cjpeg b/misc/builddeps/dp.linux32/bin/cjpeg
index 9c13ac008666f1c2519169396932de2acab08e9b..4ff73ae3c100a5b8a00777a419c73a8fafe154f4 100755 (executable)
Binary files a/misc/builddeps/dp.linux32/bin/cjpeg and b/misc/builddeps/dp.linux32/bin/cjpeg differ

diff --git a/misc/builddeps/dp.linux32/bin/djpeg b/misc/builddeps/dp.linux32/bin/djpeg
index 6439c61de0f241f47980cf4177824d806e3a3165..536a162a0711a1ba8b0fa31cfd032e223ed7d9de 100755 (executable)
Binary files a/misc/builddeps/dp.linux32/bin/djpeg and b/misc/builddeps/dp.linux32/bin/djpeg differ

diff --git a/misc/builddeps/dp.linux32/bin/jpegtran b/misc/builddeps/dp.linux32/bin/jpegtran
index e4cc55957d3cfd46c70279caa6700d7216723cad..0b11f9247943cea5da2205ee52d6d5b7d8d97528 100755 (executable)
Binary files a/misc/builddeps/dp.linux32/bin/jpegtran and b/misc/builddeps/dp.linux32/bin/jpegtran differ

diff --git a/misc/builddeps/dp.linux32/bin/rdjpgcom b/misc/builddeps/dp.linux32/bin/rdjpgcom
index 4e28fcb1161fbe062615bc325fa392550ffb6340..123dd9f65ce911b1ba40a23fc77ecc394906a18a 100755 (executable)
Binary files a/misc/builddeps/dp.linux32/bin/rdjpgcom and b/misc/builddeps/dp.linux32/bin/rdjpgcom differ

diff --git a/misc/builddeps/dp.linux32/bin/wrjpgcom b/misc/builddeps/dp.linux32/bin/wrjpgcom
index 3756633dea39a741f330386e74f9cbec53be687e..2408dee8534c1a28ac80c07c34c4ef280a77db7d 100755 (executable)
Binary files a/misc/builddeps/dp.linux32/bin/wrjpgcom and b/misc/builddeps/dp.linux32/bin/wrjpgcom differ

diff --git a/misc/builddeps/dp.linux32/lib/libjpeg.a b/misc/builddeps/dp.linux32/lib/libjpeg.a
index d027d849a3710f7b167cede7bfe758d99c3f2631..991dbce136f02a5fe64ee618e3abc19d3603f787 100644 (file)
Binary files a/misc/builddeps/dp.linux32/lib/libjpeg.a and b/misc/builddeps/dp.linux32/lib/libjpeg.a differ

diff --git a/misc/builddeps/dp.linux32/lib/libjpeg.la b/misc/builddeps/dp.linux32/lib/libjpeg.la
index 9d0de191bc8e1018a4eb4393d3c3b53c2b970b59..ac8ef61f759f9b6a852d9c573fcd357891acf401 100755 (executable)
--- a/misc/builddeps/dp.linux32/lib/libjpeg.la
+++ b/misc/builddeps/dp.linux32/lib/libjpeg.la
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/xonotic/dp.linux32/lib'
+libdir='/tmp/j/lib'

diff --git a/misc/builddeps/dp.linux32/lib/libmodplug.a b/misc/builddeps/dp.linux32/lib/libmodplug.a
index 61a7d714675888462649e066076a548b14d44822..15f2367ce7ce063b301c7e6dae8a36b8b5b8ed79 100644 (file)
Binary files a/misc/builddeps/dp.linux32/lib/libmodplug.a and b/misc/builddeps/dp.linux32/lib/libmodplug.a differ

diff --git a/misc/builddeps/dp.linux32/lib/libmodplug.la b/misc/builddeps/dp.linux32/lib/libmodplug.la
index e646295fd303b00b6db57b8e4334d4d2b26721c8..fc28b9f8767421d09fff061690fa3683f595cbbd 100755 (executable)
--- a/misc/builddeps/dp.linux32/lib/libmodplug.la
+++ b/misc/builddeps/dp.linux32/lib/libmodplug.la
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/xonotic/dp.linux32/lib'
+libdir='/tmp/m/lib'

diff --git a/misc/builddeps/dp.linux32/lib/pkgconfig/libmodplug.pc b/misc/builddeps/dp.linux32/lib/pkgconfig/libmodplug.pc
index ae102faa4cb57fbad54d02d6ed507f26364abebf..3fe032cfa65251c890b9cf1b71bc7f5f8f0d415f 100644 (file)
--- a/misc/builddeps/dp.linux32/lib/pkgconfig/libmodplug.pc
+++ b/misc/builddeps/dp.linux32/lib/pkgconfig/libmodplug.pc
@@ -1,4 +1,4 @@
-prefix=/home/xonotic/dp.linux32
+prefix=/tmp/m
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

diff --git a/misc/builddeps/dp.linux64/bin/cjpeg b/misc/builddeps/dp.linux64/bin/cjpeg
index 432369ba6b2cb039561e32dfa78c198ab60035ff..66b7f58f9df54e019d47b7384fc60e6b9e9c3f73 100755 (executable)
Binary files a/misc/builddeps/dp.linux64/bin/cjpeg and b/misc/builddeps/dp.linux64/bin/cjpeg differ

diff --git a/misc/builddeps/dp.linux64/bin/djpeg b/misc/builddeps/dp.linux64/bin/djpeg
index 2cda87da4c0a6872ddd8f8e7fe677e311f96a9f4..561ec38f3ba8246df0946523a384abfb37a60c4f 100755 (executable)
Binary files a/misc/builddeps/dp.linux64/bin/djpeg and b/misc/builddeps/dp.linux64/bin/djpeg differ

diff --git a/misc/builddeps/dp.linux64/bin/jpegtran b/misc/builddeps/dp.linux64/bin/jpegtran
index a5cceb4fa9a0bcb053f91e1b036d8228a7655344..ccdabd2a1f99c3d5c2a4b897e7228f2665b093af 100755 (executable)
Binary files a/misc/builddeps/dp.linux64/bin/jpegtran and b/misc/builddeps/dp.linux64/bin/jpegtran differ

diff --git a/misc/builddeps/dp.linux64/bin/rdjpgcom b/misc/builddeps/dp.linux64/bin/rdjpgcom
index 64ddad7070df2eb86921d2d78bca8477e1b9ed63..eab09a27fe3ba49d6273c40de518584d55152f75 100755 (executable)
Binary files a/misc/builddeps/dp.linux64/bin/rdjpgcom and b/misc/builddeps/dp.linux64/bin/rdjpgcom differ

diff --git a/misc/builddeps/dp.linux64/bin/wrjpgcom b/misc/builddeps/dp.linux64/bin/wrjpgcom
index 007890ebf6e828ad092a8ced02aed59f872a12a2..7485c62a421771232c7d1edefba8b30f69d05ee7 100755 (executable)
Binary files a/misc/builddeps/dp.linux64/bin/wrjpgcom and b/misc/builddeps/dp.linux64/bin/wrjpgcom differ

diff --git a/misc/builddeps/dp.linux64/lib/libjpeg.a b/misc/builddeps/dp.linux64/lib/libjpeg.a
index a1820f3aca2948a6e45d499f7a4c6251544c2f03..bc4973968978b59a26cef340f694ea2b523829cc 100644 (file)
Binary files a/misc/builddeps/dp.linux64/lib/libjpeg.a and b/misc/builddeps/dp.linux64/lib/libjpeg.a differ

diff --git a/misc/builddeps/dp.linux64/lib/libjpeg.la b/misc/builddeps/dp.linux64/lib/libjpeg.la
index 577cd4573d711cf3837e89194336e45a54461707..ac8ef61f759f9b6a852d9c573fcd357891acf401 100755 (executable)
--- a/misc/builddeps/dp.linux64/lib/libjpeg.la
+++ b/misc/builddeps/dp.linux64/lib/libjpeg.la
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/rpolzer/dp.linux64/lib'
+libdir='/tmp/j/lib'

diff --git a/misc/builddeps/dp.linux64/lib/libmodplug.a b/misc/builddeps/dp.linux64/lib/libmodplug.a
index 1d7350263c1c961f3b0e717e0a707f434153c95a..b63641a94ee2e91b0c3113011985f94483a2d868 100644 (file)
Binary files a/misc/builddeps/dp.linux64/lib/libmodplug.a and b/misc/builddeps/dp.linux64/lib/libmodplug.a differ

diff --git a/misc/builddeps/dp.linux64/lib/libmodplug.la b/misc/builddeps/dp.linux64/lib/libmodplug.la
index ad2ee9b462c34dd282d4999c58e8bd636f11f653..fc28b9f8767421d09fff061690fa3683f595cbbd 100755 (executable)
--- a/misc/builddeps/dp.linux64/lib/libmodplug.la
+++ b/misc/builddeps/dp.linux64/lib/libmodplug.la
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/rpolzer/dp.linux64/lib'
+libdir='/tmp/m/lib'

diff --git a/misc/builddeps/dp.linux64/lib/pkgconfig/libmodplug.pc b/misc/builddeps/dp.linux64/lib/pkgconfig/libmodplug.pc
index 6d3e967e5d0c8dc8bb0f00f526bef3c5ee35c1e6..3fe032cfa65251c890b9cf1b71bc7f5f8f0d415f 100644 (file)
--- a/misc/builddeps/dp.linux64/lib/pkgconfig/libmodplug.pc
+++ b/misc/builddeps/dp.linux64/lib/pkgconfig/libmodplug.pc
@@ -1,4 +1,4 @@
-prefix=/home/rpolzer/dp.linux64
+prefix=/tmp/m
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

diff --git a/misc/builddeps/dp.osx/empty b/misc/builddeps/dp.osx/empty
new file mode 100644 (file)
index 0000000..e69de29