In perl.git, the branch smoke-me/jkeenan/130818-remove-epoc has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/ec84854c09f26d3073fa2002b0ed0256570f3b93?hp=290f44ead05a5718e4f391f298e4d75e601393e5> - Log ----------------------------------------------------------------- commit ec84854c09f26d3073fa2002b0ed0256570f3b93 Author: James E Keenan <[email protected]> Date: Tue Jun 13 21:30:18 2017 -0400 Remove remaining support for EPOC. Per discussion in RT # 130818. This entails work on File::Spec, Cwd, File::Basename, IO::Socket. It also entails incrementing $VERSION in each .pm file in the PathTools distribution. Also entails removal of EPOC-related tests from PathTools. Not yet done: Any taking into account how Module::CoreList must change. Two changes in modules maintained upstream on CPAN. ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 - dist/IO/lib/IO/Socket.pm | 4 +- dist/PathTools/Changes | 3 ++ dist/PathTools/Cwd.pm | 15 +----- dist/PathTools/lib/File/Spec.pm | 3 +- dist/PathTools/lib/File/Spec/AmigaOS.pm | 2 +- dist/PathTools/lib/File/Spec/Cygwin.pm | 2 +- dist/PathTools/lib/File/Spec/Epoc.pm | 79 ------------------------------- dist/PathTools/lib/File/Spec/Functions.pm | 2 +- dist/PathTools/lib/File/Spec/Mac.pm | 2 +- 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 +- dist/PathTools/t/Spec.t | 13 +---- dist/PathTools/t/crossplatform.t | 2 +- lib/File/Basename.pm | 10 ++-- pod/perldelta.pod | 6 ++- 18 files changed, 26 insertions(+), 126 deletions(-) delete mode 100644 dist/PathTools/lib/File/Spec/Epoc.pm diff --git a/MANIFEST b/MANIFEST index 27bd73739f..d7c47a020f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3547,7 +3547,6 @@ dist/PathTools/Cwd.xs Cwd extension external subroutines dist/PathTools/lib/File/Spec.pm portable operations on file names dist/PathTools/lib/File/Spec/AmigaOS.pm portable operations on AmigaOS file names dist/PathTools/lib/File/Spec/Cygwin.pm portable operations on Cygwin file names -dist/PathTools/lib/File/Spec/Epoc.pm portable operations on EPOC file names dist/PathTools/lib/File/Spec/Functions.pm Function interface to File::Spec object methods dist/PathTools/lib/File/Spec/Mac.pm portable operations on Mac file names dist/PathTools/lib/File/Spec/OS2.pm portable operations on OS2 file names diff --git a/dist/IO/lib/IO/Socket.pm b/dist/IO/lib/IO/Socket.pm index c78aeecc1a..ca7e2b2c5a 100644 --- a/dist/IO/lib/IO/Socket.pm +++ b/dist/IO/lib/IO/Socket.pm @@ -20,11 +20,11 @@ use Errno; # legacy require IO::Socket::INET; -require IO::Socket::UNIX if ($^O ne 'epoc' && $^O ne 'symbian'); +require IO::Socket::UNIX if $^O ne 'symbian'; @ISA = qw(IO::Handle); -$VERSION = "1.38"; +$VERSION = "1.39"; @EXPORT_OK = qw(sockatmark); diff --git a/dist/PathTools/Changes b/dist/PathTools/Changes index 7d0c1798b8..a37a6f65a5 100644 --- a/dist/PathTools/Changes +++ b/dist/PathTools/Changes @@ -1,5 +1,8 @@ Revision history for Perl distribution PathTools. +3.68 - Tue Jun 13 04:34:00 EDT 2017 +- Epoc platform no longer supported (RT 130818). + 3.67 - Mon Feb 27 09:33:04 EST 2017 - Add security usage note to File::Spec::no_upwards diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm index ce142cfe69..2a5fcc83a3 100644 --- a/dist/PathTools/Cwd.pm +++ b/dist/PathTools/Cwd.pm @@ -3,7 +3,7 @@ use strict; use Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION); -$VERSION = '3.67'; +$VERSION = '3.68'; my $xs_version = $VERSION; $VERSION =~ tr/_//d; @@ -145,15 +145,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', @@ -676,10 +667,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 a9a7619470..ad446857c5 100644 --- a/dist/PathTools/lib/File/Spec.pm +++ b/dist/PathTools/lib/File/Spec.pm @@ -3,14 +3,13 @@ package File::Spec; use strict; use vars qw(@ISA $VERSION); -$VERSION = '3.67'; +$VERSION = '3.68'; $VERSION =~ tr/_//d; my %module = (MacOS => 'Mac', 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 8d3796e123..0af106cd0a 100644 --- a/dist/PathTools/lib/File/Spec/AmigaOS.pm +++ b/dist/PathTools/lib/File/Spec/AmigaOS.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.67'; +$VERSION = '3.68'; $VERSION =~ tr/_//d; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm index 745df86ee5..bffeb3d131 100644 --- a/dist/PathTools/lib/File/Spec/Cygwin.pm +++ b/dist/PathTools/lib/File/Spec/Cygwin.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.67'; +$VERSION = '3.68'; $VERSION =~ tr/_//d; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Epoc.pm b/dist/PathTools/lib/File/Spec/Epoc.pm deleted file mode 100644 index 959261a58e..0000000000 --- a/dist/PathTools/lib/File/Spec/Epoc.pm +++ /dev/null @@ -1,79 +0,0 @@ -package File::Spec::Epoc; - -use strict; -use vars qw($VERSION @ISA); - -$VERSION = '3.67'; -$VERSION =~ tr/_//d; - -require File::Spec::Unix; -@ISA = qw(File::Spec::Unix); - -=head1 NAME - -File::Spec::Epoc - methods for Epoc file specs - -=head1 SYNOPSIS - - require File::Spec::Epoc; # Done internally by File::Spec if needed - -=head1 DESCRIPTION - -See File::Spec::Unix for a documentation of the methods provided -there. This package overrides the implementation of these methods, not -the semantics. - -This package is still a work in progress. ;-) - -=cut - -sub case_tolerant { - return 1; -} - -=pod - -=over 4 - -=item canonpath() - -No physical check on the filesystem, but a logical cleanup of a -path. On UNIX eliminated successive slashes and successive "/.". - -=back - -=cut - -sub canonpath { - my ($self,$path) = @_; - return unless defined $path; - - $path =~ s|/+|/|g; # xx////xx -> xx/xx - $path =~ s|(/\.)+/|/|g; # xx/././xx -> xx/xx - $path =~ s|^(\./)+||s unless $path eq "./"; # ./xx -> xx - $path =~ s|^/(\.\./)+|/|s; # /../../xx -> xx - $path =~ s|/\Z(?!\n)|| unless $path eq "/"; # xx/ -> xx - return $path; -} - -=pod - -=head1 AUTHOR - [email protected] - -=head1 COPYRIGHT - -Copyright (c) 2004 by the Perl 5 Porters. All rights reserved. - -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. - -=head1 SEE ALSO - -See L<File::Spec> and L<File::Spec::Unix>. This package overrides the -implementation of these methods, not the semantics. - -=cut - -1; diff --git a/dist/PathTools/lib/File/Spec/Functions.pm b/dist/PathTools/lib/File/Spec/Functions.pm index cb7532e57f..71f0e6a750 100644 --- a/dist/PathTools/lib/File/Spec/Functions.pm +++ b/dist/PathTools/lib/File/Spec/Functions.pm @@ -5,7 +5,7 @@ use strict; use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION); -$VERSION = '3.67'; +$VERSION = '3.68'; $VERSION =~ tr/_//d; require Exporter; diff --git a/dist/PathTools/lib/File/Spec/Mac.pm b/dist/PathTools/lib/File/Spec/Mac.pm index 192cc8da9b..31e7a4dce0 100644 --- a/dist/PathTools/lib/File/Spec/Mac.pm +++ b/dist/PathTools/lib/File/Spec/Mac.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.67'; +$VERSION = '3.68'; $VERSION =~ tr/_//d; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/OS2.pm b/dist/PathTools/lib/File/Spec/OS2.pm index 1e201ebade..71ef5ac663 100644 --- a/dist/PathTools/lib/File/Spec/OS2.pm +++ b/dist/PathTools/lib/File/Spec/OS2.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.67'; +$VERSION = '3.68'; $VERSION =~ tr/_//d; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Unix.pm b/dist/PathTools/lib/File/Spec/Unix.pm index ff3599acf6..1c13f06006 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 vars qw($VERSION); -$VERSION = '3.67'; +$VERSION = '3.68'; my $xs_version = $VERSION; $VERSION =~ tr/_//d; diff --git a/dist/PathTools/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm index fb4351f086..20630c7678 100644 --- a/dist/PathTools/lib/File/Spec/VMS.pm +++ b/dist/PathTools/lib/File/Spec/VMS.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.67'; +$VERSION = '3.68'; $VERSION =~ tr/_//d; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Win32.pm b/dist/PathTools/lib/File/Spec/Win32.pm index 17f1c5a190..9dc6cb0e4c 100644 --- a/dist/PathTools/lib/File/Spec/Win32.pm +++ b/dist/PathTools/lib/File/Spec/Win32.pm @@ -5,7 +5,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.67'; +$VERSION = '3.68'; $VERSION =~ tr/_//d; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/t/Spec.t b/dist/PathTools/t/Spec.t index 0255bdb1bf..a4eb0e57e0 100644 --- a/dist/PathTools/t/Spec.t +++ b/dist/PathTools/t/Spec.t @@ -38,7 +38,7 @@ if ( $@ ) { $INC{"VMS/Filespec.pm"} = 1 ; } -foreach (qw(Unix Win32 VMS OS2 Mac Epoc Cygwin)) { +foreach (qw(Unix Win32 VMS OS2 Mac Cygwin)) { require_ok("File::Spec::$_"); } @@ -707,17 +707,6 @@ my @tests = ( [ "Mac->rel2abs('hd:d3:file','hd:d1:d2:')", 'hd:d3:file' ], [ "Mac->rel2abs('hd:d3:','hd:d1:file')", 'hd:d3:' ], -[ "Epoc->case_tolerant()", '1' ], - -[ "Epoc->canonpath('')", '' ], -[ "Epoc->canonpath('///../../..//./././a//b/.././c/././')", '/a/b/../c' ], -[ "Epoc->canonpath('/./')", '/' ], -[ "Epoc->canonpath('/a/./')", '/a' ], - -# XXX Todo, copied from Unix, but fail. Should they? 2003-07-07 Tels -#[ "Epoc->canonpath('/a/.')", '/a' ], -#[ "Epoc->canonpath('/.')", '/' ], - [ "Cygwin->case_tolerant()", '1' ], [ "Cygwin->catfile('a','b','c')", 'a/b/c' ], [ "Cygwin->catfile('a','b','./c')", 'a/b/c' ], diff --git a/dist/PathTools/t/crossplatform.t b/dist/PathTools/t/crossplatform.t index b7c76fc1af..8797b15dba 100644 --- a/dist/PathTools/t/crossplatform.t +++ b/dist/PathTools/t/crossplatform.t @@ -6,7 +6,7 @@ use lib File::Spec->catfile('t', 'lib'); use Test::More; local $|=1; -my @platforms = qw(Cygwin Epoc Mac OS2 Unix VMS Win32); +my @platforms = qw(Cygwin Mac OS2 Unix VMS Win32); my $tests_per_platform = 10; my $vms_unix_rpt = 0; diff --git a/lib/File/Basename.pm b/lib/File/Basename.pm index 4b4fe95cfd..90373d102e 100644 --- a/lib/File/Basename.pm +++ b/lib/File/Basename.pm @@ -54,7 +54,7 @@ our(@ISA, @EXPORT, $VERSION, $Fileparse_fstype, $Fileparse_igncase); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(fileparse fileparse_set_fstype basename dirname); -$VERSION = "2.85"; +$VERSION = "2.86"; fileparse_set_fstype($^O); @@ -122,7 +122,7 @@ sub fileparse { my($dirpath, $basename); - if (grep { $type eq $_ } qw(MSDOS DOS MSWin32 Epoc)) { + if (grep { $type eq $_ } qw(MSDOS DOS MSWin32)) { ($dirpath,$basename) = ($fullname =~ /^((?:.*[:\\\/])?)(.*)/s); $dirpath .= '.\\' unless $dirpath =~ /[\\\/]\z/; } @@ -354,8 +354,8 @@ operating system (ie. /foo/bar style on Unix, \foo\bar on Windows, etc...). With this function you can override that assumption. Valid $types are "MacOS", "VMS", "AmigaOS", "OS2", "RISCOS", -"MSWin32", "DOS" (also "MSDOS" for backwards bug compatibility), -"Epoc" and "Unix" (all case-insensitive). If an unrecognized $type is +"MSWin32", "DOS" (also "MSDOS" for backwards bug compatibility) +and "Unix" (all case-insensitive). If an unrecognized $type is given "Unix" will be assumed. If you've selected VMS syntax, and the file specification you pass to @@ -370,7 +370,7 @@ call only. BEGIN { -my @Ignore_Case = qw(MacOS VMS AmigaOS OS2 RISCOS MSWin32 MSDOS DOS Epoc); +my @Ignore_Case = qw(MacOS VMS AmigaOS OS2 RISCOS MSWin32 MSDOS DOS); my @Types = (@Ignore_Case, qw(Unix)); sub fileparse_set_fstype { diff --git a/pod/perldelta.pod b/pod/perldelta.pod index ddc2b6ffae..d7bc0569ac 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -370,9 +370,11 @@ XXX List any platforms that this version of perl no longer compiles on. =over 4 -=item XXX-some-platform +=item EPOC -XXX +Per discussion in https://rt.perl.org/Ticket/Display.html?id=130818, support +for EPOC has been removed from the PathTools distribution (Cwd and +File::Spec). =back -- Perl5 Master Repository
