ChangeLogTag: Wed May 21 09:25:16 2003 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 49 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index a44cb52879e..24a97ae9c66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Wed May 21 09:25:16 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/Parser.pm:
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+
+          Push escape_regex_special() back into Parser.
+
+        * bin/MakeProjectCreator/modules/Driver.pm:
+
+          Print out a relative path for files that are being processed.
+
+        * bin/MakeProjectCreator/modules/WorkspaceCreator.pm:
+
+          If generating a workspace per project, don't modify the workspace
+          name.
+
 Wed May 21 14:12:16 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/OS.h:
diff --git a/bin/MakeProjectCreator/modules/Driver.pm b/bin/MakeProjectCreator/modules/Driver.pm
index 91c70830a5d..be21ca506dc 100644
--- a/bin/MakeProjectCreator/modules/Driver.pm
+++ b/bin/MakeProjectCreator/modules/Driver.pm
@@ -320,9 +320,17 @@ sub run {
         }
         $file = $base;
       }
-      print 'Generating output using ' .
-            ($file eq '' ? 'default input' : $file) . "\n";
-      print 'Start Time: ' . scalar(localtime(time())) . "\n";
+      print 'Generating output using ';
+      if ($file eq '') {
+        print 'default input';
+      }
+      else {
+        my($partial)  = $self->getcwd();
+        my($oescaped) = $self->escape_regex_special($orig_dir) . '(/)?';
+        $partial =~ s/^$oescaped//;
+        print '' . ($partial ne '' ? "$partial/" : '') . $file;
+      }
+      print "\n" . 'Start Time: ' . scalar(localtime(time())) . "\n";
       if (!$generator->generate($file)) {
         print STDERR "ERROR: Unable to process: " .
                      ($file eq '' ? 'default input' : $file) . "\n";
diff --git a/bin/MakeProjectCreator/modules/Parser.pm b/bin/MakeProjectCreator/modules/Parser.pm
index b8cea113846..e7533e0c5e1 100644
--- a/bin/MakeProjectCreator/modules/Parser.pm
+++ b/bin/MakeProjectCreator/modules/Parser.pm
@@ -168,6 +168,15 @@ sub search_include_path {
 }
 
 
+sub escape_regex_special {
+  my($self) = shift;
+  my($name) = shift;
+
+  $name =~ s/([\\\$\[\]\(\)\.])/\\$1/g;
+  return $name;
+}
+
+
 # ************************************************************
 # Virtual Methods To Be Overridden
 # ************************************************************
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index 9e19628cf78..85340a46598 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -1086,16 +1086,6 @@ sub is_special_tag {
 }
 
 
-sub escape_regex_special {
-  my($self) = shift;
-  my($name) = shift;
-
-  $name =~ s/([\\\$\[\]\(\)\.])/\\$1/g;
-
-  return $name;
-}
-
-
 sub sift_files {
   my($self)  = shift;
   my($files) = shift;
diff --git a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm
index bccc84d4b3c..4a217fc017b 100644
--- a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm
@@ -472,6 +472,9 @@ sub write_workspace {
   my($error)     = '';
 
   if ($self->get_toplevel()) {
+    if (!$addfile) {
+      $self->{'per_project_workspace_name'} = 1;
+    }
     my($name) = $self->transform_file_name($self->workspace_file_name());
     if (defined $self->{'projects'}->[0]) {
       my($fh)   = new FileHandle();
@@ -532,6 +535,9 @@ sub write_workspace {
       print "WARNING: No projects were created.\n" .
             "         Workspace $name has not been created.\n";
     }
+    if (!$addfile) {
+      $self->{'per_project_workspace_name'} = undef;
+    }
   }
 
   return $status, $error;
@@ -909,6 +915,13 @@ sub get_modified_workspace_name {
   my($type)   = $self->{'wctype'};
   my($wsname) = $self->get_workspace_name();
 
+  ## If this is a per project workspace, then we should not
+  ## modify the workspace name.  It may overwrite another workspace
+  ## but that's ok, it will also be a per project workspace.
+  if ($self->{'per_project_workspace_name'}) {
+    return "$name$ext";
+  }
+
   if (!defined $previous_workspace_name{$type}->{$pwd}) {
     $previous_workspace_name{$type}->{$pwd} = $wsname;
     $self->{'current_workspace_name'} = undef;