ChangeLogTag:Wed Dec 18 13:36:49 2002 Steve Huston <shuston@riverace.com>

5 files changed, 43 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 37ac4d8bf6c..7bfac3b9c38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Dec 18 13:36:49 2002  Steve Huston  <shuston@riverace.com>
+
+        * ace/ace.mwc: Workspace definition file for ACE and it's immediate
+          subordinates, RMCast.
+
+        * tests/tests.mwc: Workspace definition for tests and tests/RMCast.
+
+        * bin/MakeProjectCreator/modules/Driver.pm (run): When processing
+          specified input files, chdir to the directory containing the file
+          so the files are read and written properly when referred to using
+          relative paths.
+
 Wed Dec 18 11:38:39 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ace/config-win32-msvc-7.h: Added pragma prefix to disable
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 37ac4d8bf6c..7bfac3b9c38 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Wed Dec 18 13:36:49 2002  Steve Huston  <shuston@riverace.com>
+
+        * ace/ace.mwc: Workspace definition file for ACE and it's immediate
+          subordinates, RMCast.
+
+        * tests/tests.mwc: Workspace definition for tests and tests/RMCast.
+
+        * bin/MakeProjectCreator/modules/Driver.pm (run): When processing
+          specified input files, chdir to the directory containing the file
+          so the files are read and written properly when referred to using
+          relative paths.
+
 Wed Dec 18 11:38:39 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ace/config-win32-msvc-7.h: Added pragma prefix to disable
diff --git a/ace/ace.mwc b/ace/ace.mwc
new file mode 100644
index 00000000000..7f374d21c96
--- /dev/null
+++ b/ace/ace.mwc
@@ -0,0 +1,4 @@
+workspace {
+  ace.mpc
+  RMCast/rmcast.mpc
+}
diff --git a/bin/MakeProjectCreator/modules/Driver.pm b/bin/MakeProjectCreator/modules/Driver.pm
index 25336693df7..296bdc86639 100644
--- a/bin/MakeProjectCreator/modules/Driver.pm
+++ b/bin/MakeProjectCreator/modules/Driver.pm
@@ -11,6 +11,7 @@ package Driver;
 # ************************************************************
 
 use strict;
+use File::Basename;
 
 # ************************************************************
 # Data Section
@@ -345,6 +346,15 @@ sub run {
   my(%loaded) = ();
   ## Generate the files
   foreach my $file (@input) {
+    ## To correctly reference any pathnames in the input file, chdir to
+    ## its directory if there's any directory component to the specified path.
+    my $orig_dir = Cwd::getcwd();
+    my $dir = dirname($file);
+    my $base = basename($file);
+    if ($base ne $file) {
+      chdir($dir);
+      $file = $base;
+    }
     foreach my $name (@generators) {
       if (!$loaded{$name}) {
         require "$name.pm";
@@ -363,6 +373,7 @@ sub run {
       }
       print "  End Time: " . scalar(localtime(time())) . "\n";
     }
+    chdir($orig_dir);
   }
 
   return $status;
diff --git a/tests/tests.mwc b/tests/tests.mwc
new file mode 100644
index 00000000000..b83fa3ae669
--- /dev/null
+++ b/tests/tests.mwc
@@ -0,0 +1,4 @@
+workspace {
+  tests.mpc
+  RMCast/tests.mpc
+}