From 5c9b903493ebe747126ce253072cb327582ea0f3 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 27 Dec 2012 17:35:33 +0000 Subject: remove clean_and_update_folder running on the root of the build since it removes pd/ if its from git svn path=/trunk/; revision=16772 --- scripts/auto-build/extra-svn-update-cygwin.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto-build/extra-svn-update-cygwin.sh b/scripts/auto-build/extra-svn-update-cygwin.sh index cd1947b8..922c154b 100644 --- a/scripts/auto-build/extra-svn-update-cygwin.sh +++ b/scripts/auto-build/extra-svn-update-cygwin.sh @@ -21,8 +21,9 @@ echo "build root: $auto_build_root_dir" > $LOGFILE 2>&1 echo "--- use SCM to clean and update ------------------------" >> $LOGFILE 2>&1 # first pass at the root without externals svn up --ignore-externals $auto_build_root_dir >> $LOGFILE 2>&1 -# then each folder in the root -clean_and_update_folder $auto_build_root_dir >> $LOGFILE 2>&1 +# then each folder in the root, but not the root itself, in case pd/ +# is coming from a git repo rather than svn. clean_and_update_folder +# will remove pd/ if its not in svn. for dir in $auto_build_root_dir/*; do clean_and_update_folder $dir >> $LOGFILE 2>&1 remove_dead_svn_externals $dir >> $LOGFILE 2>&1 -- cgit v1.2.1