diff options
Diffstat (limited to 'Master/tlpkg/tlperl/lib/lib.pm')
-rw-r--r-- | Master/tlpkg/tlperl/lib/lib.pm | 47 |
1 files changed, 8 insertions, 39 deletions
diff --git a/Master/tlpkg/tlperl/lib/lib.pm b/Master/tlpkg/tlperl/lib/lib.pm index 471d381bb7c..973c7744b90 100644 --- a/Master/tlpkg/tlperl/lib/lib.pm +++ b/Master/tlpkg/tlperl/lib/lib.pm @@ -13,13 +13,7 @@ my @inc_version_list = reverse split / /, $Config{inc_version_list}; our @ORIG_INC = @INC; # take a handy copy of 'original' value -our $VERSION = '0.62'; -my $Is_MacOS = $^O eq 'MacOS'; -my $Mac_FS; -if ($Is_MacOS) { - require File::Spec; - $Mac_FS = eval { require Mac::FileSpec::Unixish }; -} +our $VERSION = '0.63'; sub import { shift; @@ -32,8 +26,6 @@ sub import { Carp::carp("Empty compile time value given to use lib"); } - $path = _nativize($path); - if ($path !~ /\.par$/i && -e $path && ! -d _) { require Carp; Carp::carp("Parameter to use lib must be directory, not file"); @@ -42,9 +34,7 @@ sub import { # Add any previous version directories we found at configure time foreach my $incver (@inc_version_list) { - my $dir = $Is_MacOS - ? File::Spec->catdir( $path, $incver ) - : "$path/$incver"; + my $dir = "$path/$incver"; unshift(@INC, $dir) if -d $dir; } # Put a corresponding archlib directory in front of $path if it @@ -66,9 +56,7 @@ sub unimport { shift; my %names; - foreach (@_) { - my $path = _nativize($_); - + foreach my $path (@_) { my($arch_auto_dir, $arch_dir, $version_dir, $version_arch_dir) = _get_dirs($path); ++$names{$path}; @@ -86,31 +74,12 @@ sub _get_dirs { my($dir) = @_; my($arch_auto_dir, $arch_dir, $version_dir, $version_arch_dir); - # we could use this for all platforms in the future, but leave it - # Mac-only for now, until there is more time for testing it. - if ($Is_MacOS) { - $arch_auto_dir = File::Spec->catdir( $dir, $archname, 'auto' ); - $arch_dir = File::Spec->catdir( $dir, $archname, ); - $version_dir = File::Spec->catdir( $dir, $version ); - $version_arch_dir = File::Spec->catdir( $dir, $version, $archname ); - } else { - $arch_auto_dir = "$dir/$archname/auto"; - $arch_dir = "$dir/$archname"; - $version_dir = "$dir/$version"; - $version_arch_dir = "$dir/$version/$archname"; - } - return($arch_auto_dir, $arch_dir, $version_dir, $version_arch_dir); -} + $arch_auto_dir = "$dir/$archname/auto"; + $arch_dir = "$dir/$archname"; + $version_dir = "$dir/$version"; + $version_arch_dir = "$dir/$version/$archname"; -sub _nativize { - my($dir) = @_; - - if ($Is_MacOS && $Mac_FS && ! -d $dir) { - $dir = Mac::FileSpec::Unixish::nativize($dir); - $dir .= ":" unless $dir =~ /:$/; - } - - return $dir; + return($arch_auto_dir, $arch_dir, $version_dir, $version_arch_dir); } 1; |