From e7ef0380e7f650ee2686164dbce579ec31ae0e33 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 26 Sep 2012 15:52:11 +0000 Subject: only make source tarball when its requested via command line arg svn path=/trunk/; revision=16306 --- scripts/auto-build/auto-build-common | 9 +++++---- scripts/auto-build/pd-extended-auto-builder.sh | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/auto-build/auto-build-common b/scripts/auto-build/auto-build-common index ee795cb2..c30ffa0c 100644 --- a/scripts/auto-build/auto-build-common +++ b/scripts/auto-build/auto-build-common @@ -160,8 +160,9 @@ get_pd_version() make_source_tarball() { - version=$(get_pd_version $1) - tarball=$1/../pd-extended_$version.tar.bz2 - tar --exclude-vcs --directory $1/.. -cjpf $tarball pd-extended - mv $tarball $2 + rootdir=$1 + tarballname=$2 + + tar --directory $rootdir/.. --exclude-vcs --exclude=$tarballname \ + -cjpf /tmp/$tarballname $(basename $1) } diff --git a/scripts/auto-build/pd-extended-auto-builder.sh b/scripts/auto-build/pd-extended-auto-builder.sh index 6c71638d..721e7f3b 100755 --- a/scripts/auto-build/pd-extended-auto-builder.sh +++ b/scripts/auto-build/pd-extended-auto-builder.sh @@ -64,9 +64,11 @@ print_ip_address if [ "$1" = "source-tarball-only" ]; then echo "--- making source tarball ------------------------------" - make_source_tarball "${auto_build_root_dir}" "${auto_build_root_dir}/packages/$BUILD_DIR" + version=$(get_pd_version $auto_build_root_dir) + tarballname=Pd-extended_$version.tar.bz2 + make_source_tarball "${auto_build_root_dir}" $tarballname echo "The source tarball is here:" - echo " ${auto_build_root_dir}/packages/$BUILD_DIR" + echo " /tmp/$tarballname" echo "Finished cleaning and making source tarball, exiting." exit fi -- cgit v1.2.1