make build dirs "clean" of DP and FTEQCC

[xonotic/xonotic.git] / all

diff --git a/all b/all
index b0173fdb6c1ff7a72cd78b0750ae376302f3a35c..1d6cde8db3e43cdf0ebceae34c96224c5956a35d 100755 (executable)
--- a/all
+++ b/all
@@ -864,14 +864,28 @@ case "$cmd" in
                mkdir -p Xonotic
                git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
                        cd Xonotic
-                       mkdir data fteqcc
+                       mkdir data fteqcc darkplaces-src fteqcc-src
                        tar xvf -
                        rm -rf misc/builddeps
-                       mv misc/buildfiles/win32/* .
-                       mv misc/buildfiles/win64/* .
-                       mv misc/buildfiles/osx/* .
+                       mv misc/buildfiles/win32/* . || true
+                       mv misc/buildfiles/win64/* . || true
+                       mv misc/buildfiles/osx/* . || true
                        rm -rf misc/buildfiles
                }
+               {
+                       cd darkplaces
+                       git archive --format=tar HEAD
+               } | {
+                       cd Xonotic/darkplaces-src
+                       tar xvf -
+               }
+               {
+                       cd fteqcc
+                       git archive --format=tar HEAD
+               } | {
+                       cd Xonotic/fteqcc-src
+                       tar xvf -
+               }
                ;;
        release-compile-run)
                host=$1
@@ -907,20 +921,20 @@ case "$cmd" in
                fteqcc_files=$4
                darkplaces_maketargets=$5
                darkplaces_files=$6
-               "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "fteqcc" "$fteqcc_files"
-               "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "darkplaces" "$darkplaces_files"
+               "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/fteqcc-src" "$fteqcc_files"
+               "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/darkplaces-src" "$darkplaces_files"
                ;;
        release-engine-win32)
                "$SELF" release-compile win32 \
                        'DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
-                       debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
+                       debug 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
                ;;
        release-engine-win64)
                "$SELF" release-compile win64 \
                        'DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LDFLAGS_WINCOMMON=""' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-64.exe' \
-                       debug 'darkplaces.exe:xonotic-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-64.exe'
+                       debug 'darkplaces.exe:Xonotic/xonotic-64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-64.exe'
                ;;
        release-engine-osx)
                "$SELF" release-compile osx \