From b8f5a447a18ea396c3964aace28acbfacbee0de8 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 28 Sep 2012 18:53:13 +0000 Subject: streamline 'svn update' procedure a little bit svn path=/trunk/; revision=16317 --- scripts/auto-build/pd-extended-auto-builder.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/auto-build/pd-extended-auto-builder.sh b/scripts/auto-build/pd-extended-auto-builder.sh index 68a5c103..84996178 100755 --- a/scripts/auto-build/pd-extended-auto-builder.sh +++ b/scripts/auto-build/pd-extended-auto-builder.sh @@ -45,8 +45,11 @@ echo "build root: $auto_build_root_dir" echo "--- make distclean -------------------------------------" make -C ${auto_build_root_dir}/packages/$BUILD_DIR distclean -echo "--- use SCM to clean -----------------------------------" -svn up $auto_build_root_dir +echo "--- use SCM to clean and update ------------------------" +svn=`find_svn` +# first pass at the root without externals +$svn up --ignore-externals $auto_build_root_dir +# then each folder in the root for dir in $auto_build_root_dir/*; do clean_and_update_folder $dir remove_dead_svn_externals $dir @@ -57,7 +60,6 @@ remove_dead_svn_externals $auto_build_root_dir # directly checked in lib_targets=`sed -n 's|^LIB_TARGETS = *||p' $auto_build_root_dir/externals/Makefile` cd $auto_build_root_dir/externals -svn=`find_svn` $svn update $lib_targets echo "--- setting up build -----------------------------------" -- cgit v1.2.1