ChangeLogTag: Mon May 5 15:45:04 UTC 2008 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 34 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 89351d55..9f258488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Mon May  5 15:45:04 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
+
+        * config/mpich.mpb:
+
+          Use MPI_ROOT instead of MPICH_ROOT.  This is in keeping with the
+          generic-ness of the environment variables to allow drop-in
+          replacements for different implementations.
+
+        * config/openmpi.mpb:
+
+          Added "requires += mpi".
+
+        * modules/ProjectCreator.pm:
+
+          Fixed a bug where files added through a directory would not be
+          removed as duplicate if the generated files had the 'gendir' value
+          set on them with one or more slash.  This only affected Windows
+          project types.  
+
+        * registry.pl:
+
+          Fixed the registry value remove option.
+
 Mon May  5 07:40:10 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * clone_build_tree.pl:
diff --git a/config/mpich.mpb b/config/mpich.mpb
index 7184e418..0c3045c0 100644
--- a/config/mpich.mpb
+++ b/config/mpich.mpb
@@ -1,9 +1,8 @@
 // $Id$
 
 project {
-  includes += $(MPICH_ROOT)/include
-  libpaths += $(MPICH_ROOT)/lib
-
+  includes += $(MPI_ROOT)/include
+  libpaths += $(MPI_ROOT)/lib
   requires += mpi
 
   specific(vc6, vc7, vc71, vc8, vc9) {
diff --git a/config/openmpi.mpb b/config/openmpi.mpb
index 1091e615..291a6c13 100644
--- a/config/openmpi.mpb
+++ b/config/openmpi.mpb
@@ -5,4 +5,5 @@ project {
   includes += $(MPI_ROOT)/include
   libpaths += $(MPI_ROOT)/lib
   lit_libs += mpi
+  requires += mpi
 }
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index d2fa8ef3..62dba7ad 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -2261,6 +2261,7 @@ sub add_explicit_output {
                   defined $self->{'flag_overrides'}->{$type}->{$file}->{'gendir'} &&
                   $self->{'flag_overrides'}->{$type}->{$file}->{'gendir'} ne '.') {
                 $dir = $self->{'flag_overrides'}->{$type}->{$file}->{'gendir'} . '/';
+                $dir =~ s/\\/\//g if ($self->{'convert_slashes'});
               }
 
               push(@files, "$dir$check");
@@ -2326,6 +2327,7 @@ sub generated_filenames {
       }
       else {
         $dir = $self->{'flag_overrides'}->{$type}->{$file}->{'gendir'} . '/';
+        $dir =~ s/\\/\//g if ($self->{'convert_slashes'});
       }
     }
 
@@ -3147,6 +3149,7 @@ sub prepend_gendir {
           if (defined $dir) {
             ## Convert the file to unix style for basename
             $created =~ s/\\/\//g;
+            $dir =~ s/\\/\//g if ($self->{'convert_slashes'});
             return ($dir eq '.' ? '' : "$dir/") .
                    $self->mpc_basename($created);
           }
diff --git a/registry.pl b/registry.pl
index d9f4446a..de8dbe14 100755
--- a/registry.pl
+++ b/registry.pl
@@ -25,7 +25,7 @@ my($Registry) = undef;
 my($MPC_ROOT) = $FindBin::Bin;
 $MPC_ROOT =~ s!/!\\!g;
 
-my($version) = '1.2';
+my($version) = '1.3';
 my(%types)   = ('nmake' => ['NMAKE', 'NMAKE'],
                 'bmake' => ['Borland Make', 'Borland Make'],
                 'vc6'   => ['DSW', 'DSP'],
@@ -148,11 +148,13 @@ if (defined $ARGV[0]) {
     foreach my $type (keys %types) {
       delete_key('HKEY_CLASSES_ROOT/Directory/shell/MPC' . uc($type) . '/');
     }
+
+    exit(0);
   }
   else {
     print STDERR "registry v$version\n",
                  "Usage: ", basename($0), " [-r]\n\n",
-                 "       -r  Remove MPC related registry keys (this does not work).\n\n",
+                 "       -r  Remove MPC related registry keys.\n\n",
                  "Set the MPC_ROOT environment variable to the location of this script.\n",
                  "Also, add context menus for .mwc files and directories.\n";
     exit(0);
@@ -171,6 +173,6 @@ foreach my $type (keys %types) {
 }
 
 print "You may need to log out and then ",
-      "log back in for these settings to take effect.\n";
+      "log back in for some of these settings to take effect.\n";
 
 exit(0);