From 8d86e11354671e3e1f5a628998f23193f82ee802 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 5 Aug 2010 10:41:10 +0200 Subject: [PATCH 1/1] make build dirs "clean" of DP and FTEQCC --- all | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/all b/all index dfef27a7..1d6cde8d 100755 --- 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 \ -- 2.39.2