make build dirs "clean" of DP and FTEQCC
authorRudolf Polzer <divVerent@alientrap.org>
Thu, 5 Aug 2010 08:41:10 +0000 (10:41 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Thu, 5 Aug 2010 08:41:10 +0000 (10:41 +0200)
all

diff --git a/all b/all
index dfef27a79b16a79891c1e426aae9630944cb6bc9..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,8 +921,8 @@ 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 \