ChangeLogTag: Wed Aug 11 08:48:48 2004 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 73 insertions, 123 deletions

diff --git a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
index 6d14f0661e0..bb349bf5925 100644
--- a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
@@ -39,7 +39,7 @@ sub fill_value {
   if (defined $names{$name}) {
     my(%dirnames) = ();
     foreach my $file ($self->get_component_list($names{$name}, 1)) {
-      my($dirname) = dirname($file);
+      my($dirname) = $self->mpc_dirname($file);
       if ($dirname eq '') {
         $dirname = '.';
       }
diff --git a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
index c7b1dd51a6e..851239663ea 100644
--- a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
@@ -63,7 +63,7 @@ sub write_project_targets {
   my($crlf)   = $self->crlf();
 
   foreach my $project (@$list) {
-    my($dir)    = dirname($project);
+    my($dir)    = $self->mpc_dirname($project);
     my($chdir)  = 0;
     my($back)   = '';
 
diff --git a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
index e44dc9ef6f8..456c6512139 100644
--- a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
@@ -75,7 +75,7 @@ sub fill_value {
       my($comps) = $$names{$name};
       foreach my $key (keys %$comps) {
         foreach my $item (@{$$comps{$key}}) {
-          my($dname) = $self->relative(dirname($item));
+          my($dname) = $self->relative($self->mpc_dirname($item));
           if ($dname ne '.' && $dname !~ /^\.\.\//) {
             $vpath{$dname} = 1;
           }
diff --git a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
index d7f0c7b4b1a..74155e380ac 100644
--- a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
@@ -154,7 +154,7 @@ sub write_comps {
       print $fh $crlf,
                 "\t\$(KEEP_GOING)\@";
       if (defined $dirprj{$project}) {
-        print $fh "cd ", dirname($project),
+        print $fh "cd ", $self->mpc_dirname($project),
                   " && \$(MAKE) -f ", basename($project), $crlf;
       }
       else {
@@ -174,7 +174,7 @@ sub write_comps {
   foreach my $project (@lprj) {
     print $fh "\t\$(KEEP_GOING)\@";
     if (defined $dirprj{$project}) {
-      print $fh "cd ", dirname($project),
+      print $fh "cd ", $self->mpc_dirname($project),
                 " && \$(MAKE) -f ", basename($project), " \$(\@)", $crlf;
     }
     else {
diff --git a/bin/mpc.pl b/bin/mpc.pl
index 3ce48b22888..56dd7152891 100755
--- a/bin/mpc.pl
+++ b/bin/mpc.pl
@@ -14,6 +14,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 
 use strict;
 use Cwd;
+use Config;
 use File::Basename;
 
 if ( $^O eq 'VMS' ) {
@@ -21,7 +22,7 @@ if ( $^O eq 'VMS' ) {
   import VMS::Filespec qw(unixpath);
 }
 
-my($basePath) = getExecutePath($0) . 'MakeProjectCreator';
+my($basePath) = getExecutePath($0) . '/MakeProjectCreator';
 unshift(@INC, $basePath . '/modules');
 
 my($mpcroot) = $ENV{MPC_ROOT};
@@ -60,31 +61,23 @@ my(@creators) = ('GNUACEProjectCreator',
 # Subroutine Section
 # ************************************************************
 
+sub getBasePath {
+  return $mpcpath;
+}
+
+
 sub which {
-  my($prog)   = shift;
-  my($exec)   = $prog;
-  my($part)   = '';
-  if ( $^O eq 'VMS' ) {
-    my($envSep) = ';';
-    if (defined $ENV{'PATH'}) {
-      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-        $part .= "$prog";
-        if ( -x $part ) {
-          $exec = $part;
-          last;
-        }
-      }
-    }
-  }
-  else  {
-    my($envSep) = ($^O eq 'MSWin32' ? ';' : ':');
-    if (defined $ENV{'PATH'}) {
-      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-        $part .= "/$prog";
-        if ( -x $part ) {
-          $exec = $part;
-          last;
-        }
+  my($prog) = shift;
+  my($exec) = $prog;
+
+  if (defined $ENV{'PATH'}) {
+    my($part)   = '';
+    my($envSep) = $Config{'path_sep'};
+    foreach $part (split(/$envSep/, $ENV{'PATH'})) {
+      $part .= "/$prog";
+      if ( -x $part ) {
+        $exec = $part;
+        last;
       }
     }
   }
@@ -97,51 +90,33 @@ sub getExecutePath {
   my($prog) = shift;
   my($loc)  = '';
 
-  if ( $^O eq 'VMS' ) {
-    if ($prog ne basename($prog)) {
-      my($dir) = unixpath( dirname($prog) );
-      if ($prog =~ /^[\/\\]/) {
-        $loc = $dir;
-      }
-      else {
-        $loc = unixpath(getcwd()) . $dir;
-      }
+  if ($prog ne basename($prog)) {
+    my($dir) = ($^O eq 'VMS' ? unixpath(dirname($prog)) : dirname($prog));
+    if ($prog =~ /^[\/\\]/ ||
+        $prog =~ /^[A-Za-z]:[\/\\]?/) {
+      $loc = $dir;
     }
     else {
-      $loc = unixpath( dirname(which($prog)) );
-    }
-
-    if ($loc eq '.') {
-      $loc = unixpath( getcwd() );
+      $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()) . '/' . $dir;
     }
-  } else {
-    if ($prog ne basename($prog)) {
-      if ($prog =~ /^[\/\\]/ ||
-          $prog =~ /^[A-Za-z]:[\/\\]?/) {
-        $loc = dirname($prog);
-      }
-      else {
-        $loc = getcwd() . '/' . dirname($prog);
-      }
-    }
-    else {
-      $loc = dirname(which($prog));
+  }
+  else {
+    $loc = dirname(which($prog));
+    if ($^O eq 'VMS') {
+      $loc = unixpath($loc);
     }
+  }
 
-    $loc =~ s/\/\.$//;
-
-    if ($loc eq '.') {
-      $loc = getcwd();
-    }
+  $loc =~ s/\/\.$//;
 
-    if ($loc ne '') {
-      $loc .= '/';
-    }
+  if ($loc eq '.') {
+    $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd());
   }
 
   return $loc;
 }
 
+
 # ************************************************************
 # Main Section
 # ************************************************************
diff --git a/bin/mwc.pl b/bin/mwc.pl
index 0715e948b99..688d278b513 100755
--- a/bin/mwc.pl
+++ b/bin/mwc.pl
@@ -14,6 +14,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 
 use strict;
 use Cwd;
+use Config;
 use File::Basename;
 
 if ( $^O eq 'VMS' ) {
@@ -21,7 +22,7 @@ if ( $^O eq 'VMS' ) {
   import VMS::Filespec qw(unixpath);
 }
 
-my($basePath) = getExecutePath($0) . 'MakeProjectCreator';
+my($basePath) = getExecutePath($0) . '/MakeProjectCreator';
 unshift(@INC, $basePath . '/modules');
 
 my($mpcroot) = $ENV{MPC_ROOT};
@@ -60,31 +61,23 @@ my(@creators) = ('GNUACEWorkspaceCreator',
 # Subroutine Section
 # ************************************************************
 
+sub getBasePath {
+  return $mpcpath;
+}
+
+
 sub which {
-  my($prog)   = shift;
-  my($exec)   = $prog;
-  my($part)   = '';
-  if ( $^O eq 'VMS' ) {
-    my($envSep) = ';';
-    if (defined $ENV{'PATH'}) {
-      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-        $part .= "$prog";
-        if ( -x $part ) {
-          $exec = $part;
-          last;
-        }
-      }
-    }
-  }
-  else  {
-    my($envSep) = ($^O eq 'MSWin32' ? ';' : ':');
-    if (defined $ENV{'PATH'}) {
-      foreach $part (split(/$envSep/, $ENV{'PATH'})) {
-        $part .= "/$prog";
-        if ( -x $part ) {
-          $exec = $part;
-          last;
-        }
+  my($prog) = shift;
+  my($exec) = $prog;
+
+  if (defined $ENV{'PATH'}) {
+    my($part)   = '';
+    my($envSep) = $Config{'path_sep'};
+    foreach $part (split(/$envSep/, $ENV{'PATH'})) {
+      $part .= "/$prog";
+      if ( -x $part ) {
+        $exec = $part;
+        last;
       }
     }
   }
@@ -97,51 +90,33 @@ sub getExecutePath {
   my($prog) = shift;
   my($loc)  = '';
 
-  if ( $^O eq 'VMS' ) {
-    if ($prog ne basename($prog)) {
-      my($dir) = unixpath( dirname($prog) );
-      if ($prog =~ /^[\/\\]/) {
-        $loc = $dir;
-      }
-      else {
-        $loc = unixpath(getcwd()) . $dir;
-      }
+  if ($prog ne basename($prog)) {
+    my($dir) = ($^O eq 'VMS' ? unixpath(dirname($prog)) : dirname($prog));
+    if ($prog =~ /^[\/\\]/ ||
+        $prog =~ /^[A-Za-z]:[\/\\]?/) {
+      $loc = $dir;
     }
     else {
-      $loc = unixpath( dirname(which($prog)) );
-    }
-
-    if ($loc eq '.') {
-      $loc = unixpath( getcwd() );
+      $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()) . '/' . $dir;
     }
-  } else {
-    if ($prog ne basename($prog)) {
-      if ($prog =~ /^[\/\\]/ ||
-          $prog =~ /^[A-Za-z]:[\/\\]?/) {
-        $loc = dirname($prog);
-      }
-      else {
-        $loc = getcwd() . '/' . dirname($prog);
-      }
-    }
-    else {
-      $loc = dirname(which($prog));
+  }
+  else {
+    $loc = dirname(which($prog));
+    if ($^O eq 'VMS') {
+      $loc = unixpath($loc);
     }
+  }
 
-    $loc =~ s/\/\.$//;
-
-    if ($loc eq '.') {
-      $loc = getcwd();
-    }
+  $loc =~ s/\/\.$//;
 
-    if ($loc ne '') {
-      $loc .= '/';
-    }
+  if ($loc eq '.') {
+    $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd());
   }
 
   return $loc;
 }
 
+
 # ************************************************************
 # Main Section
 # ************************************************************