summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rwxr-xr-xclone_build_tree.pl2
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b99d628..7969282b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
-Fri Jan 21 20:44:36 UTC 2011 Brian Johnson <johnsonb@ociweb.com>
+Wed Feb 2 14:01:25 UTC 2011 Brian Johnson <johnsonb@ociweb.com>
* clone_build_tree.pl:
+ Removed explicit "build" directory matching in favor of $expected
+ for preventing clone build directory from being.
+
+Fri Jan 21 20:44:36 UTC 2011 Brian Johnson <johnsonb@ociweb.com>
+
+ * clone_build_tree.pl:
+
Limited core pattern match to just files.
Mon Jan 3 18:08:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/clone_build_tree.pl b/clone_build_tree.pl
index c70ee525..88e1f2da 100755
--- a/clone_build_tree.pl
+++ b/clone_build_tree.pl
@@ -52,7 +52,6 @@ sub findCallback {
defined $exclude &&
/^$exclude\z/s && ($File::Find::prune = 1) ||
/^\.cvsignore\z/s && ($File::Find::prune = 1) ||
- /^build\z/s && ($File::Find::prune = 1) ||
/^\..*obj\z/s && ($File::Find::prune = 1) ||
/^Templates\.DB\z/s && ($File::Find::prune = 1) ||
/^Debug\z/s && ($File::Find::prune = 1) ||
@@ -523,6 +522,7 @@ $builddir = getcwd() . '/build' if (!defined $builddir);
if (index($builddir, getcwd()) == 0) {
$exclude = substr($builddir, length(getcwd()) + 1);
$exclude =~ s/([\+\-\\\$\[\]\(\)\.])/\\$1/g;
+ $exclude =~ s/.*?([^\/]+)$/$1/;
}
else {
$absolute = 1;