ChangeLogTag: Tue Sep 16 10:28:02 2003 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 36 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index de0deb09155..014697c67aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Sep 16 10:28:02 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+
+          Escape the file name that's used as a regular expression.
+
+        * bin/MakeProjectCreator/modules/WorkspaceCreator.pm:
+
+          Add implicit project dependencies when using the -hierarchy
+          option.
+
 Mon Sep 15 13:22:40 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/WorkspaceCreator.pm:
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index 384101debf8..fa0e5589759 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -1560,6 +1560,9 @@ sub list_generated_file {
   if (defined $self->{'generated_exts'}->{$gentype}->{$tag}) {
     my(@gen)     = $self->get_component_list($gentype);
     my(@genexts) = $self->generated_extensions($gentype, $tag);
+
+    $file = $self->escape_regex_special($file);
+
     foreach my $gen (@gen) {
       ## If we are converting slashes, then we need to
       ## convert the component back to forward slashes
diff --git a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm
index 4a209caa44e..35e62855361 100644
--- a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm
@@ -648,6 +648,13 @@ sub generate_hierarchy {
       $self->{'projects'}       = \@saved;
       $self->{'project_info'}   = \%sinfo;
       $self->{'workspace_name'} = $self->base_directory();
+
+      ## Add implict project dependencies based on source files
+      ## that have been used by multiple projects
+      if ($self->generate_implicit_project_dependencies()) {
+        $self->add_implicit_project_dependencies($generator, $self->getcwd());
+      }
+
       my($status, $error) = $self->write_workspace($generator);
       if (!$status) {
         print STDERR "$error\n";
@@ -672,6 +679,13 @@ sub generate_hierarchy {
     $self->{'projects'}       = \@saved;
     $self->{'project_info'}   = \%sinfo;
     $self->{'workspace_name'} = $self->base_directory();
+
+    ## Add implict project dependencies based on source files
+    ## that have been used by multiple projects
+    if ($self->generate_implicit_project_dependencies()) {
+      $self->add_implicit_project_dependencies($generator, $self->getcwd());
+    }
+
     my($status, $error) = $self->write_workspace($generator);
     if (!$status) {
       print STDERR "$error\n";
@@ -881,6 +895,7 @@ sub add_implicit_project_dependencies {
   my($generator) = shift;
   my($cwd)       = shift;
   my(%bidir)     = ();
+  my(%save)      = ();
 
   ## Take the current working directory and regular expression'ize it.
   $cwd = $self->escape_regex_special($cwd);
@@ -903,6 +918,7 @@ sub add_implicit_project_dependencies {
                       $self->{'project_file_list'}->{$key}->[2],
                       $self->{'project_file_list'}->{$ikey}->[2],
                       \@over)) {
+          $save{$ikey} = $self->{'project_file_list'}->{$ikey}->[2];
           $self->{'project_file_list'}->{$ikey}->[2] = \@over;
           if (defined $bidir{$key}) {
             push(@{$bidir{$key}}, $ikey);
@@ -927,6 +943,12 @@ sub add_implicit_project_dependencies {
       }
     }
   }
+
+  ## Restore the modified values in case this method is called again
+  ## which is the case when using the -hierarchy option.
+  foreach my $skey (keys %save) {
+    $self->{'project_file_list'}->{$skey}->[2] = $save{$skey};
+  }
 }