In perl.git, the branch blead has been updated
<https://perl5.git.perl.org/perl.git/commitdiff/fa0964df6c1cba184f8f09eab869e9f813174b12?hp=228483d4f7b5356f504d0ad059432594a4f2b153>
- Log -----------------------------------------------------------------
commit fa0964df6c1cba184f8f09eab869e9f813174b12
Author: Zefram <zef...@fysh.org>
Date: Mon Dec 18 03:21:05 2017 +0000
align version numbers in the PathTools distro
commit e229c0feaa828e8255bda950ed3456ef196226b3
Author: Zefram <zef...@fysh.org>
Date: Mon Dec 18 03:18:39 2017 +0000
remove support for running PathTools on MacOS
MacOS Classic hasn't been a supported platform since 5.14. Note that
the code for processing MacOS-style paths remains, and can be run on
supported platforms. [perl #130818]
commit 39b5053954b30965e2f005f8ea1fec58c1796050
Author: Zefram <zef...@fysh.org>
Date: Mon Dec 18 03:12:04 2017 +0000
fix pod markup in warnings.pm
Commit c4583f59133164b3f392c31e9b9573276ec17e74 introduced a pod error.
commit e9a5b59fedc30cba91617c6b239f9568cf4ce08e
Author: Zefram <zef...@fysh.org>
Date: Mon Dec 18 03:08:31 2017 +0000
remove support for running PathTools on EPOC
EPOC hasn't been a supported platform since 5.18. Note that the code
for processing EPOC-style paths remains, and can be run on supported
platforms. [perl #130818]
-----------------------------------------------------------------------
Summary of changes:
dist/PathTools/Cwd.pm | 28 +---------------------------
dist/PathTools/lib/File/Spec.pm | 5 ++---
dist/PathTools/lib/File/Spec/AmigaOS.pm | 2 +-
dist/PathTools/lib/File/Spec/Cygwin.pm | 2 +-
dist/PathTools/lib/File/Spec/Epoc.pm | 2 +-
dist/PathTools/lib/File/Spec/Functions.pm | 2 +-
dist/PathTools/lib/File/Spec/Mac.pm | 27 +++------------------------
dist/PathTools/lib/File/Spec/OS2.pm | 2 +-
dist/PathTools/lib/File/Spec/Unix.pm | 2 +-
dist/PathTools/lib/File/Spec/VMS.pm | 2 +-
dist/PathTools/lib/File/Spec/Win32.pm | 2 +-
lib/warnings.pm | 4 ++--
regen/warnings.pl | 4 ++--
13 files changed, 18 insertions(+), 66 deletions(-)
diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
index 0f7364e17d..1f94997c7e 100644
--- a/dist/PathTools/Cwd.pm
+++ b/dist/PathTools/Cwd.pm
@@ -135,23 +135,6 @@ my %METHOD_MAP =
realpath => 'fast_abs_path',
},
- epoc =>
- {
- cwd => '_epoc_cwd',
- getcwd => '_epoc_cwd',
- fastgetcwd => '_epoc_cwd',
- fastcwd => '_epoc_cwd',
- abs_path => 'fast_abs_path',
- },
-
- MacOS =>
- {
- getcwd => 'cwd',
- fastgetcwd => 'cwd',
- fastcwd => 'cwd',
- abs_path => 'fast_abs_path',
- },
-
amigaos =>
{
getcwd => '_backtick_pwd',
@@ -244,8 +227,7 @@ unless ($METHOD_MAP{$^O}{cwd} or defined &cwd) {
}
}
- # MacOS has some special magic to make `pwd` work.
- if( $os eq 'MacOS' || $found_pwd_cmd )
+ if( $found_pwd_cmd )
{
*cwd = \&_backtick_pwd;
}
@@ -374,9 +356,6 @@ sub chdir {
if ($^O eq 'VMS') {
return $ENV{'PWD'} = $ENV{'DEFAULT'}
}
- elsif ($^O eq 'MacOS') {
- return $ENV{'PWD'} = cwd();
- }
elsif ($^O eq 'MSWin32') {
$ENV{'PWD'} = $newpwd;
return 1;
@@ -666,11 +645,6 @@ sub _qnx_abs_path {
return $realpath;
}
-sub _epoc_cwd {
- return $ENV{'PWD'} = EPOC::getcwd();
-}
-
-
# Now that all the base-level functions are set up, alias the
# user-level functions to the right places
diff --git a/dist/PathTools/lib/File/Spec.pm b/dist/PathTools/lib/File/Spec.pm
index 187751cca3..5a53413124 100644
--- a/dist/PathTools/lib/File/Spec.pm
+++ b/dist/PathTools/lib/File/Spec.pm
@@ -2,14 +2,13 @@ package File::Spec;
use strict;
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
-my %module = (MacOS => 'Mac',
+my %module = (
MSWin32 => 'Win32',
os2 => 'OS2',
VMS => 'VMS',
- epoc => 'Epoc',
NetWare => 'Win32', # Yes, File::Spec::Win32 works on NetWare.
symbian => 'Win32', # Yes, File::Spec::Win32 works on symbian.
dos => 'OS2', # Yes, File::Spec::OS2 works on DJGPP.
diff --git a/dist/PathTools/lib/File/Spec/AmigaOS.pm
b/dist/PathTools/lib/File/Spec/AmigaOS.pm
index a7def0bd9c..63a9050ee3 100644
--- a/dist/PathTools/lib/File/Spec/AmigaOS.pm
+++ b/dist/PathTools/lib/File/Spec/AmigaOS.pm
@@ -3,7 +3,7 @@ package File::Spec::AmigaOS;
use strict;
require File::Spec::Unix;
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
our @ISA = qw(File::Spec::Unix);
diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm
b/dist/PathTools/lib/File/Spec/Cygwin.pm
index fe67ad8af9..955af23b2e 100644
--- a/dist/PathTools/lib/File/Spec/Cygwin.pm
+++ b/dist/PathTools/lib/File/Spec/Cygwin.pm
@@ -3,7 +3,7 @@ package File::Spec::Cygwin;
use strict;
require File::Spec::Unix;
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
our @ISA = qw(File::Spec::Unix);
diff --git a/dist/PathTools/lib/File/Spec/Epoc.pm
b/dist/PathTools/lib/File/Spec/Epoc.pm
index e5b4a32203..0e581852a6 100644
--- a/dist/PathTools/lib/File/Spec/Epoc.pm
+++ b/dist/PathTools/lib/File/Spec/Epoc.pm
@@ -2,7 +2,7 @@ package File::Spec::Epoc;
use strict;
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
require File::Spec::Unix;
diff --git a/dist/PathTools/lib/File/Spec/Functions.pm
b/dist/PathTools/lib/File/Spec/Functions.pm
index bfe84c22de..6e3e6d3e63 100644
--- a/dist/PathTools/lib/File/Spec/Functions.pm
+++ b/dist/PathTools/lib/File/Spec/Functions.pm
@@ -3,7 +3,7 @@ package File::Spec::Functions;
use File::Spec;
use strict;
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
require Exporter;
diff --git a/dist/PathTools/lib/File/Spec/Mac.pm
b/dist/PathTools/lib/File/Spec/Mac.pm
index 30e3a018bd..ed30f1aa85 100644
--- a/dist/PathTools/lib/File/Spec/Mac.pm
+++ b/dist/PathTools/lib/File/Spec/Mac.pm
@@ -4,16 +4,11 @@ use strict;
use Cwd ();
require File::Spec::Unix;
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
our @ISA = qw(File::Spec::Unix);
-my $macfiles;
-if ($^O eq 'MacOS') {
- $macfiles = eval { require Mac::Files };
-}
-
sub case_tolerant { 1 }
@@ -343,27 +338,11 @@ sub devnull {
=item rootdir
-Returns a string representing the root directory. Under MacPerl,
-returns the name of the startup volume, since that's the closest in
-concept, although other volumes aren't rooted there. The name has a
-trailing ":", because that's the correct specification for a volume
-name on Mac OS.
-
-If Mac::Files could not be loaded, the empty string is returned.
+Returns the empty string. Mac OS has no real root directory.
=cut
-sub rootdir {
-#
-# There's no real root directory on Mac OS. The name of the startup
-# volume is returned, since that's the closest in concept.
-#
- return '' unless $macfiles;
- my $system = Mac::Files::FindFolder(&Mac::Files::kOnSystemDisk,
- &Mac::Files::kSystemFolderType);
- $system =~ s/:.*\Z(?!\n)/:/s;
- return $system;
-}
+sub rootdir { '' }
=item tmpdir
diff --git a/dist/PathTools/lib/File/Spec/OS2.pm
b/dist/PathTools/lib/File/Spec/OS2.pm
index 9b6de3f2b0..f2a05f6279 100644
--- a/dist/PathTools/lib/File/Spec/OS2.pm
+++ b/dist/PathTools/lib/File/Spec/OS2.pm
@@ -4,7 +4,7 @@ use strict;
use Cwd ();
require File::Spec::Unix;
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
our @ISA = qw(File::Spec::Unix);
diff --git a/dist/PathTools/lib/File/Spec/Unix.pm
b/dist/PathTools/lib/File/Spec/Unix.pm
index a9bda4e678..f2412e1c44 100644
--- a/dist/PathTools/lib/File/Spec/Unix.pm
+++ b/dist/PathTools/lib/File/Spec/Unix.pm
@@ -3,7 +3,7 @@ package File::Spec::Unix;
use strict;
use Cwd ();
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
=head1 NAME
diff --git a/dist/PathTools/lib/File/Spec/VMS.pm
b/dist/PathTools/lib/File/Spec/VMS.pm
index 13ca002070..e67ff8efe6 100644
--- a/dist/PathTools/lib/File/Spec/VMS.pm
+++ b/dist/PathTools/lib/File/Spec/VMS.pm
@@ -4,7 +4,7 @@ use strict;
use Cwd ();
require File::Spec::Unix;
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
our @ISA = qw(File::Spec::Unix);
diff --git a/dist/PathTools/lib/File/Spec/Win32.pm
b/dist/PathTools/lib/File/Spec/Win32.pm
index b44b5007cc..d9693ff65d 100644
--- a/dist/PathTools/lib/File/Spec/Win32.pm
+++ b/dist/PathTools/lib/File/Spec/Win32.pm
@@ -5,7 +5,7 @@ use strict;
use Cwd ();
require File::Spec::Unix;
-our $VERSION = '3.70';
+our $VERSION = '3.71';
$VERSION =~ tr/_//d;
our @ISA = qw(File::Spec::Unix);
diff --git a/lib/warnings.pm b/lib/warnings.pm
index a9a43af959..5f835efbe4 100644
--- a/lib/warnings.pm
+++ b/lib/warnings.pm
@@ -1197,11 +1197,11 @@ warnings::register like this:
=head1 FUNCTIONS
-=over 4
-
Note: The functions with names ending in C<_at_level> were added in Perl
5.28.
+=over 4
+
=item use warnings::register
Creates a new warnings category with the same name as the package where
diff --git a/regen/warnings.pl b/regen/warnings.pl
index f5d7a89238..eb286d8a16 100644
--- a/regen/warnings.pl
+++ b/regen/warnings.pl
@@ -1381,11 +1381,11 @@ warnings::register like this:
=head1 FUNCTIONS
-=over 4
-
Note: The functions with names ending in C<_at_level> were added in Perl
5.28.
+=over 4
+
=item use warnings::register
Creates a new warnings category with the same name as the package where
--
Perl5 Master Repository
