Updated path rewriting rules for various OSs.

This commit is contained in:
Janet B. Anderson
2005-11-30 21:46:13 +00:00
parent f8527e3303
commit e93f9fd86e
2 changed files with 40 additions and 14 deletions
+26 -4
View File
@@ -18,9 +18,7 @@ eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
use Cwd qw(cwd abs_path);
use Getopt::Std;
$cwd = cwd();
$cwd =~ s/\/tmp_mnt//; # hack for sun4
$cwd =~ s/\\/\//g; # hack for win32
$cwd = UnixPath(cwd());
getopt "ahtT";
@@ -66,7 +64,7 @@ unless (@ARGV == 1) {
$outfile = $ARGV[0];
# TOP refers to this application
%macros = (TOP => $top);
%macros = (TOP => LocalPath($top));
@apps = (TOP); # Records the order of definitions in RELEASE file
# Read the RELEASE file(s)
@@ -315,3 +313,27 @@ sub checkRelease {
print "\n" if ($status);
exit $status;
}
# Path rewriting rules for various OSs
# These functions are duplicated in src/makeBaseApp/makeBaseApp.pl
sub UnixPath {
my ($newpath) = @_;
if ($^O eq "cygwin") {
$newpath =~ s|\\|/|go;
$newpath =~ s%^([a-zA-Z]):/%/cygdrive/$1/%;
} elsif ($^O eq 'sunos') {
$newpath =~ s(^\/tmp_mnt/)(/);
}
return $newpath;
}
sub LocalPath {
my ($newpath) = @_;
if ($^O eq "cygwin") {
$newpath =~ s%^/cygdrive/([a-zA-Z])/%$1:/%;
} elsif ($^O eq "darwin") {
# These rules are likely to be site-specific
$newpath =~ s%^/private/var/auto\.home/%/home/%; # APS
}
return $newpath;
}
+14 -10
View File
@@ -472,22 +472,26 @@ sub GetUser {
die "No user name" unless $user;
}
# replace "\" by "/" (for WINxx)
sub UnixPath { # path
my($newpath) = @_;
if ( $^O eq "cygwin" ) {
$newpath =~ s|\\|/|go;
$newpath =~ s%^([a-zA-Z]):/%/cygdrive/$1/%;
# Path rewriting rules for various OSs
# These functions are duplicated in configure/convertRelease.pl
sub UnixPath {
my ($newpath) = @_;
if ($^O eq "cygwin") {
$newpath =~ s|\\|/|go;
$newpath =~ s%^([a-zA-Z]):/%/cygdrive/$1/%;
} elsif ($^O eq 'sunos') {
$newpath =~ s(^\/tmp_mnt/)(/);
}
return $newpath;
}
sub LocalPath {
my ($newpath) = @_;
if ( $^O eq "cygwin" ) {
$newpath =~ s%^/cygdrive/([a-zA-Z])/%$1:/%;
$newpath =~ s|/|\\\\|go;
if ($^O eq "cygwin") {
$newpath =~ s%^/cygdrive/([a-zA-Z])/%$1:/%;
} elsif ($^O eq "darwin") {
# These rules are likely to be site-specific
$newpath =~ s%^/private/var/auto\.home/%/home/%; # APS
}
return $newpath;
}