aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2012-09-28 18:53:13 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2012-09-28 18:53:13 +0000
commitb8f5a447a18ea396c3964aace28acbfacbee0de8 (patch)
tree05c81f20dd39d532f771dc0f4e5723446794036d /scripts
parent429aec05f566ed494fbd15d2bcb5d17175c40174 (diff)
streamline 'svn update' procedure a little bit
svn path=/trunk/; revision=16317
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/auto-build/pd-extended-auto-builder.sh8
1 files changed, 5 insertions, 3 deletions
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 -----------------------------------"