ChangeLogTag: Mon Apr 12 11:38:29 2004 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 53 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f5d9bd1..e0874aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Apr 12 11:38:29 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * clone_build_tree.pl:
+
+          Added more file types to exclude during cloning.
+
+        * modules/Creator.pm:
+
+          We still need to maintain the real set of files added for
+          generation of the workspace.
+
+        * modules/WorkspaceCreator.pm:
+
+          Added more information to the error message when duplicate
+          projects are found within a workspace.
+
 Mon Apr 12 10:00:56 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * modules/Creator.pm:
diff --git a/clone_build_tree.pl b/clone_build_tree.pl
index 9c575755..52507fd6 100755
--- a/clone_build_tree.pl
+++ b/clone_build_tree.pl
@@ -70,22 +70,32 @@ sub findCallback {
                  );
 
     if ($matches) {
-      $matches = (! /^.*\.dsp\z/s    &&
-                  ! /^.*\.dsw\z/s    &&
-                  ! /^.*\.vcproj\z/s &&
-                  ! /^.*\.sln\z/s    &&
-                  ! /^Makefile.*\z/s &&
-                  ! /^.*\.vcp\z/s    &&
-                  ! /^.*\.vcw\z/s    &&
-                  ! /^.*\.mak\z/s    &&
-                  ! /^.*\.nmake\z/s  &&
-                  ! /^.*\.bld\z/s    &&
-                  ! /^.*\.icc\z/s    &&
-                  ! /^.*\.icp\z/s    &&
-                  ! /^.*\.ncb\z/s    &&
-                  ! /^.*\.opt\z/s    &&
-                  ! /^.*\.bak\z/s    &&
-                  ! /^.*\.ilk\z/s    &&
+      $matches = (! /^.*\.dsp\z/s       &&
+                  ! /^.*\.dsw\z/s       &&
+                  ! /^.*\.vcproj\z/s    &&
+                  ! /^.*\.sln\z/s       &&
+                  ! /^Makefile.*\z/s    &&
+                  ! /^GNUmakefile.*\z/s &&
+                  ! /^.*\.am\z/s        &&
+                  ! /^\.depend\..*\z/s  &&
+                  ! /^.*\.vcn\z/s       &&
+                  ! /^.*\.vcp\z/s       &&
+                  ! /^.*\.vcw\z/s       &&
+                  ! /^.*\.vpj\z/s       &&
+                  ! /^.*\.vpw\z/s       &&
+                  ! /^.*\.cbx\z/s       &&
+                  ! /^.*\.bpgr\z/s      &&
+                  ! /^.*\.bmak\z/s      &&
+                  ! /^.*\.bmake\z/s     &&
+                  ! /^.*\.mak\z/s       &&
+                  ! /^.*\.nmake\z/s     &&
+                  ! /^.*\.bld\z/s       &&
+                  ! /^.*\.icc\z/s       &&
+                  ! /^.*\.icp\z/s       &&
+                  ! /^.*\.ncb\z/s       &&
+                  ! /^.*\.opt\z/s       &&
+                  ! /^.*\.bak\z/s       &&
+                  ! /^.*\.ilk\z/s       &&
                   ! /^.*\.pdb\z/s
                 );
 
diff --git a/modules/Creator.pm b/modules/Creator.pm
index 55545587..2bf784da 100644
--- a/modules/Creator.pm
+++ b/modules/Creator.pm
@@ -70,6 +70,7 @@ sub new {
   $self->{'addproj'}         = $addproj;
   $self->{'toplevel'}        = $toplevel;
   $self->{'files_written'}   = {};
+  $self->{'real_fwritten'}   = [];
   $self->{'reading_global'}  = 0;
   $self->{'global_assign'}   = {};
   $self->{'assign'}          = {};
@@ -152,7 +153,8 @@ sub generate {
   my($status) = 1;
 
   ## Reset the files_written hash array between processing each file
-  $self->{'files_written'}  = {};
+  $self->{'files_written'} = {};
+  $self->{'real_fwritten'} = [];
 
   ## Allow subclasses to reset values before
   ## each call to generate().
@@ -472,6 +474,7 @@ sub add_file_written {
   }
   else {
     $self->{'files_written'}->{$key} = $file;
+    push(@{$self->{'real_fwritten'}}, $file);
   }
 
   $all_written{$self->getcwd() . '/' . $file} = 1;
@@ -773,9 +776,8 @@ sub get_toplevel {
 
 
 sub get_files_written {
-  my($self) = shift;
-  my(@keys) = keys %{$self->{'files_written'}};
-  return \@keys;
+  my($self)  = shift;
+  return $self->{'real_fwritten'};
 }
 
 
diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm
index 2ab3d648..b8ba2a2b 100644
--- a/modules/WorkspaceCreator.pm
+++ b/modules/WorkspaceCreator.pm
@@ -662,10 +662,13 @@ sub write_workspace {
         my($name) = lc($self->{'project_info'}->{$project}->[0]);
         if (defined $names{$name}) {
           ++$duplicates;
-          $self->error("Duplicate case-insensitive project '$name'.");
+          $self->error("Duplicate case-insensitive project '$name'. " .
+                       "Look in " . dirname($project) . " and " .
+                       dirname($names{$name}) .
+                       " for project name conflicts.");
         }
         else {
-          $names{$name} = 1;
+          $names{$name} = $project;
         }
       }
     }