diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-12-27 17:35:33 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-12-27 17:35:33 +0000 |
| commit | 5c9b903493ebe747126ce253072cb327582ea0f3 (patch) | |
| tree | f201be1c40f4d204494f5604888cf521f5124479 /scripts | |
| parent | 36ae54fd0a3c57317ff993bf85d3b8aa6f426a1c (diff) | |
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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/auto-build/extra-svn-update-cygwin.sh | 5 |
1 files 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 |