In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/261c7de79b0b5c9ecdf1c8879cac314d26865498?hp=1487a0398caad301d6ecd6979babb330fcee0c17>
- Log ----------------------------------------------------------------- commit 261c7de79b0b5c9ecdf1c8879cac314d26865498 Author: Steffen Mueller <[email protected]> Date: Tue Sep 29 09:54:53 2009 +0200 Use a non-development version for Cwd because XSLoader tests don't like those M cpan/Cwd/Cwd.pm commit 73649ea64b4f44ea395299a6263189ede210bc72 Author: Steffen Mueller <[email protected]> Date: Tue Sep 29 08:29:40 2009 +0200 Add Cwd/PathTools to mkppport.lst M mkppport.lst commit 5dc5b7fcbf03d7816aee0c03b97e94e58225d86d Author: Steffen Mueller <[email protected]> Date: Tue Sep 29 08:28:37 2009 +0200 remove Cwd/PathTools Makefile.PL from core M MANIFEST D cpan/Cwd/Makefile.PL commit 9bc94e3daeec8cdf07dfcc87a3f8e4e4db8b801a Author: Steffen Mueller <[email protected]> Date: Tue Sep 29 08:27:02 2009 +0200 Upgrade to PathTools 3.30_02 (with only core reorganization fixes) M Porting/Maintainers.pl M cpan/Cwd/Cwd.pm M cpan/Cwd/Cwd.xs M cpan/Cwd/t/cwd.t ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 - Porting/Maintainers.pl | 7 +------ cpan/Cwd/Cwd.pm | 2 +- cpan/Cwd/Cwd.xs | 8 +++----- cpan/Cwd/Makefile.PL | 7 ------- cpan/Cwd/t/cwd.t | 5 ----- mkppport.lst | 1 + 7 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 cpan/Cwd/Makefile.PL diff --git a/MANIFEST b/MANIFEST index 1112c27..25c96ea 100644 --- a/MANIFEST +++ b/MANIFEST @@ -285,7 +285,6 @@ cpan/Cwd/lib/File/Spec.pm portable operations on file names cpan/Cwd/lib/File/Spec/Unix.pm portable operations on Unix file names cpan/Cwd/lib/File/Spec/VMS.pm portable operations on VMS file names cpan/Cwd/lib/File/Spec/Win32.pm portable operations on Win32 and NetWare file names -cpan/Cwd/Makefile.PL Cwd extension makefile maker cpan/Cwd/t/crossplatform.t See if File::Spec works crossplatform cpan/Cwd/t/cwd.t See if Cwd works cpan/Cwd/t/Functions.t See if File::Spec::Functions works diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index db85062..2a485d5 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1117,13 +1117,8 @@ use File::Glob qw(:case); 'PathTools' => { 'MAINTAINER' => 'kwilliams', - 'DISTRIBUTION' => 'SMUELLER/PathTools-3.30_01.tar.gz', + 'DISTRIBUTION' => 'SMUELLER/PathTools-3.30_02.tar.gz', 'FILES' => q[cpan/Cwd], - # XXX note that the CPAN and blead Makefile.PL are totally - # unrelated. The blead one is described as 'core-only'. - # Perhaps after the big lib/ => ext/ migration it will be possible - # to harmonize them? - 'EXCLUDED' => [ qr{^t/lib/Test/} ], 'CPAN' => 1, 'UPSTREAM' => "cpan", diff --git a/cpan/Cwd/Cwd.pm b/cpan/Cwd/Cwd.pm index 3a0fda3..bc2f3db 100644 --- a/cpan/Cwd/Cwd.pm +++ b/cpan/Cwd/Cwd.pm @@ -171,7 +171,7 @@ use strict; use Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION); -$VERSION = '3.3001'; +$VERSION = '3.3002'; my $xs_version = $VERSION; $VERSION = eval $VERSION; diff --git a/cpan/Cwd/Cwd.xs b/cpan/Cwd/Cwd.xs index 949b94c..123be68 100644 --- a/cpan/Cwd/Cwd.xs +++ b/cpan/Cwd/Cwd.xs @@ -1,11 +1,9 @@ #include "EXTERN.h" #include "perl.h" #include "XSUB.h" -#ifndef NO_PPPORT_H -# define NEED_my_strlcpy -# define NEED_my_strlcat -# include "ppport.h" -#endif +#define NEED_my_strlcpy +#define NEED_my_strlcat +#include "ppport.h" #ifdef I_UNISTD # include <unistd.h> diff --git a/cpan/Cwd/Makefile.PL b/cpan/Cwd/Makefile.PL deleted file mode 100644 index 8d6c187..0000000 --- a/cpan/Cwd/Makefile.PL +++ /dev/null @@ -1,7 +0,0 @@ -# core-only Makefile.PL -use ExtUtils::MakeMaker; -WriteMakefile( - NAME => 'Cwd', - VERSION_FROM => 'Cwd.pm', - 'DEFINE' => '-DNO_PPPORT_H', -); diff --git a/cpan/Cwd/t/cwd.t b/cpan/Cwd/t/cwd.t index bab3dc3..256b2a1 100644 --- a/cpan/Cwd/t/cwd.t +++ b/cpan/Cwd/t/cwd.t @@ -216,11 +216,6 @@ SKIP: { 1 while unlink $file; } -if ($ENV{PERL_CORE}) { - chdir '../ext/Cwd/t'; - unshift @INC, '../../../lib'; -} - # Make sure we can run abs_path() on files, not just directories my $path = 'cwd.t'; path_ends_with(Cwd::abs_path($path), 'cwd.t', 'abs_path() can be invoked on a file'); diff --git a/mkppport.lst b/mkppport.lst index e5f8992..2131bfc 100644 --- a/mkppport.lst +++ b/mkppport.lst @@ -5,6 +5,7 @@ # This file is read by mkppport at build time. # +cpan/Cwd cpan/DB_File cpan/IPC-SysV ext/Time-HiRes -- Perl5 Master Repository
