diff options
54 files changed, 220 insertions, 80 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 0d3b4e2d49..a935031c91 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -699,7 +699,7 @@ use File::Glob qw(:case); 'ExtUtils::MakeMaker' => { 'MAINTAINER' => 'mschwern', - 'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-6.76.tar.gz', + 'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-6.78.tar.gz', 'FILES' => q[cpan/ExtUtils-MakeMaker], 'EXCLUDED' => [ qr{^t/lib/Test/}, diff --git a/cpan/ExtUtils-MakeMaker/Changes b/cpan/ExtUtils-MakeMaker/Changes index 06ed28a461..da7802b511 100644 --- a/cpan/ExtUtils-MakeMaker/Changes +++ b/cpan/ExtUtils-MakeMaker/Changes @@ -1,3 +1,46 @@ +6.78 Mon Sep 23 13:44:39 BST 2013 + + No changes from 6.77_08 + +6.77_08 Sun Sep 22 18:43:23 BST 2013 + New feature: + * Made UNINST an attribute, so removing shadowed modules + can be set 'perl Makefile.PL UNINST=1' + +6.77_07 Sat Sep 21 09:44:19 BST 2013 + Bug fixes: + * do not set default switches in Test::Harness; not even -w + +6.77_06 Thu Sep 19 15:36:59 BST 2013 + Dist fixes: + * Previous tarball was corrupted + +6.77_05 Thu Sep 19 14:09:00 BST 2013 + Bug fixes: + * Fix 3 more tests to work in parallel. Now works with HARNESS_OPTIONS=j64 + +6.77_04 Wed Sep 18 19:23:38 BST 2013 + Bug fixes: + * Fixed PERL_SRC for core tests after parallelisation + enhancements were made in 6.77_01 + +6.77_03 Mon Sep 16 12:20:25 BST 2013 + VMS fixes: + * CCFLAGS may have appendages not from PERL_MM_OPT + +6.77_02 Thu Sep 12 21:21:12 BST 2013 + Bug fixes: + * Support 'perl' as a PREREQ_PM target + * RT#77029 Support linefeeds in abstract parsing + * Skip some tests when cross-compiling core + +6.77_01 Tue Sep 10 15:20:42 BST 2013 + Bug fixes: + * RT#7248 warn if NAME is not valid package name + * Perl#36539 reverse search order for finding perl + * parse_version() should work with taint mode now + * RT#69590 enable tests to be run in parallel + 6.76 Fri Sep 6 13:32:42 BST 2013 No changes from 6.75_04 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm index 3b558e7f80..41423773b6 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm @@ -10,7 +10,7 @@ our @ISA = qw(Exporter); our @EXPORT = qw(test_harness pod2man perllocal_install uninstall warn_if_old_packlist); -our $VERSION = '6.76'; +our $VERSION = '6.78'; my $Is_VMS = $^O eq 'VMS'; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm index 6deb17cc6b..a94f010a89 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm @@ -2,7 +2,7 @@ package ExtUtils::Liblist; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; use File::Spec; require ExtUtils::Liblist::Kid; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm index 016910d0fc..f90235d430 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm @@ -11,7 +11,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '6.76'; +our $VERSION = '6.78'; use ExtUtils::MakeMaker::Config; use Cwd 'cwd'; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm index bb7ae282e4..171fac7938 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm @@ -3,7 +3,7 @@ package ExtUtils::MM; use strict; use ExtUtils::MakeMaker::Config; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::Liblist; require ExtUtils::MakeMaker; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm index 6c1bc1d565..dea69c5485 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_AIX; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm index 7e20b22eb0..7630844fe0 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_Any; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; use Carp; use File::Spec; @@ -2366,8 +2366,8 @@ Used on the t/*.t files. sub test_via_harness { my($self, $perl, $tests) = @_; - return qq{\t$perl "-MExtUtils::Command::MM" }. - qq{"-e" "test_harness(\$(TEST_VERBOSE), '\$(INST_LIB)', '\$(INST_ARCHLIB)')" $tests\n}; + return qq{\t$perl "-MExtUtils::Command::MM" "-MTest::Harness" }. + qq{"-e" "undef *Test::Harness::Switches; test_harness(\$(TEST_VERBOSE), '\$(INST_LIB)', '\$(INST_ARCHLIB)')" $tests\n}; } =head3 test_via_script diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm index 738da5a9f4..bb3d590aee 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm @@ -26,7 +26,7 @@ require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '6.76'; +our $VERSION = '6.78'; =item os_flavor diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm index 2a968bfb0d..cd6427b706 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm @@ -9,7 +9,7 @@ require ExtUtils::MM_Unix; require ExtUtils::MM_Win32; our @ISA = qw( ExtUtils::MM_Unix ); -our $VERSION = '6.76'; +our $VERSION = '6.78'; =head1 NAME diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm index c84a158321..ff524d2400 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_DOS; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm index 01098e974e..9f3417e617 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm @@ -7,7 +7,7 @@ BEGIN { our @ISA = qw( ExtUtils::MM_Unix ); } -our $VERSION = '6.76'; +our $VERSION = '6.78'; =head1 NAME diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm index e5c87d814e..953b4b0a60 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_MacOS; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; sub new { die <<'UNSUPPORTED'; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm index 15e0780e03..9a25ae029b 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm @@ -22,7 +22,7 @@ use strict; use ExtUtils::MakeMaker::Config; use File::Basename; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm index f39de09dd8..5da42358cc 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm @@ -5,7 +5,7 @@ use strict; use ExtUtils::MakeMaker qw(neatvalue); use File::Spec; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm index 727b869e23..58c3e1b05b 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_QNX; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm index 173d3a16d2..4e1e2663b5 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_UWIN; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm index fee4ae367e..6c1130ddc2 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm @@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue); # If we make $VERSION an our variable parse_version() breaks use vars qw($VERSION); -$VERSION = '6.76'; +$VERSION = '6.78'; $VERSION = eval $VERSION; ## no critic [BuiltinFunctions::ProhibitStringyEval] require ExtUtils::MM_Any; @@ -1878,7 +1878,7 @@ sub init_PERL { my @perls = ($thisperl); push @perls, map { "$_$Config{exe_ext}" } - ('perl', 'perl5', "perl$Config{version}"); + ("perl$Config{version}", 'perl5', 'perl'); # miniperl has priority over all but the canonical perl when in the # core. Otherwise its a last resort. @@ -2640,9 +2640,15 @@ sub parse_abstract { $inpod = /^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $inpod; next if !$inpod; chop; - next unless /^($package(?:\.pm)? \s+ -+ \s+)(.*)/x; - $result = $2; - last; + if ( /^($package(?:\.pm)? \s+ -+ \s+)(.*)/x ) { + $result = $2; + next; + } + next unless $result; + if ( $result && ( /^\s*$/ || /^\=/ ) ) { + last; + } + $result = join ' ', $result, $_; } close $fh; @@ -2727,6 +2733,7 @@ sub get_version }; \$$name; }; + $eval = $1 if $eval =~ m{^(.+)}s; local $^W = 0; my $result = eval($eval); ## no critic warn "Could not eval '$eval' in $parsefile: $@" if $@; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm index 321ea2c9ed..57aa8ccafd 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm @@ -15,7 +15,7 @@ BEGIN { use File::Basename; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm index c9a602f3d0..df44633cf8 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_VOS; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm index 1c0d79c45c..023e026fc8 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm @@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw( neatvalue ); require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '6.76'; +our $VERSION = '6.78'; $ENV{EMXSHELL} = 'sh'; # to run `commands` diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm index 8b607137ba..b9f4635d94 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_Win95; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm index 0ce9a49933..4a6875bc4d 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm @@ -3,7 +3,7 @@ package ExtUtils::MY; use strict; require ExtUtils::MM; -our $VERSION = '6.76'; +our $VERSION = '6.78'; our @ISA = qw(ExtUtils::MM); { diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm index 4b928fd871..a7e7ff3bb3 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm @@ -18,7 +18,7 @@ our @Overridable; my @Prepend_parent; my %Recognized_Att_Keys; -our $VERSION = '6.76'; +our $VERSION = '6.78'; $VERSION = eval $VERSION; ## no critic [BuiltinFunctions::ProhibitStringyEval] # Emulate something resembling CVS $Revision$ @@ -281,7 +281,7 @@ sub full_setup { PERL_SRC PERM_DIR PERM_RW PERM_RWX PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ - SIGN SKIP TEST_REQUIRES TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG + SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS XSOPT XSPROTOARG XS_VERSION clean depend dist dynamic_lib linkext macro realclean tool_autosplit @@ -481,10 +481,24 @@ END foreach my $prereq (sort keys %$prereqs) { my $required_version = $prereqs->{$prereq}; - my $installed_file = MM->_installed_file_for_module($prereq); my $pr_version = 0; - $pr_version = MM->parse_version($installed_file) if $installed_file; - $pr_version = 0 if $pr_version eq 'undef'; + my $installed_file; + + if ( $prereq eq 'perl' ) { + if ( defined $required_version && $required_version =~ /^v?[\d_\.]+$/ + || $required_version !~ /^v?[\d_\.]+$/ ) { + require version; + my $normal = eval { version->parse( $required_version ) }; + $required_version = $normal if defined $normal; + } + $installed_file = $prereq; + $pr_version = $]; + } + else { + $installed_file = MM->_installed_file_for_module($prereq); + $pr_version = MM->parse_version($installed_file) if $installed_file; + $pr_version = 0 if $pr_version eq 'undef'; + } # convert X.Y_Z alpha version #s to X.YZ for easier comparisons $pr_version =~ s/(\d+)\.(\d+)_(\d+)/$1.$2$3/; @@ -593,6 +607,9 @@ END $self->{NAME} ||= $self->guess_name; + warn "Warning: NAME must be a package name\n" + unless $self->{NAME} =~ m!^[A-Z_a-z][0-9A-Z_a-z]*(?:::[0-9A-Z_a-z]+)*$!; + ($self->{NAME_SYM} = $self->{NAME}) =~ s/\W+/_/g; $self->init_MAKE; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm index ac0faa824a..76fb5f9ff6 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm @@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Config; use strict; -our $VERSION = '6.76'; +our $VERSION = '6.78'; use Config (); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod index 384b178110..6133e8f30a 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::FAQ; -our $VERSION = '6.76'; +our $VERSION = '6.78'; 1; __END__ diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod index 6fdb4643fa..2453e6c169 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::Tutorial; -our $VERSION = '6.76'; +our $VERSION = '6.78'; =head1 NAME diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm index f3085ef5f4..d7c3b1a9e2 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm @@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap; # There's just too much Dynaloader incest here to turn on strict vars. use strict 'refs'; -our $VERSION = '6.76'; +our $VERSION = '6.78'; require Exporter; our @ISA = ('Exporter'); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm index 885785d84e..f0c931632e 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm @@ -10,7 +10,7 @@ use Config; our @ISA = qw(Exporter); our @EXPORT = qw(&Mksymlists); -our $VERSION = '6.76'; +our $VERSION = '6.78'; sub Mksymlists { my(%spec) = @_; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm index 344b68aef0..26989517a0 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm @@ -3,7 +3,7 @@ package ExtUtils::testlib; use strict; use warnings; -our $VERSION = '6.76'; +our $VERSION = '6.78'; use Cwd; use File::Spec; diff --git a/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t b/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t index 71f65f8bd5..9b5269a2d1 100644 --- a/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t +++ b/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t @@ -3,7 +3,10 @@ BEGIN { unshift @INC, 't/lib'; } -chdir 't'; + +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; use strict; use Test::More tests => 7; diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t index 2af5365d8a..d32445dfb1 100644 --- a/cpan/ExtUtils-MakeMaker/t/INST.t +++ b/cpan/ExtUtils-MakeMaker/t/INST.t @@ -18,7 +18,9 @@ use File::Spec; use TieOut; use Config; -chdir 't'; +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; perl_lib; @@ -71,7 +73,7 @@ is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' ); my($perl_src, $mm_perl_src); if( $ENV{PERL_CORE} ) { - $perl_src = File::Spec->catdir($Updir, $Updir, $Updir, $Updir); + $perl_src = File::Spec->catdir($Updir, $Updir, $Updir, $Updir, $Updir); $perl_src = File::Spec->canonpath($perl_src); $mm_perl_src = File::Spec->canonpath($mm->{PERL_SRC}); } diff --git a/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t index bd82dbd410..a5e469c823 100644 --- a/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t +++ b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t @@ -10,7 +10,10 @@ use strict; use File::Path; use Config; -use Test::More tests => 20; +use Test::More + $ENV{PERL_CORE} && $Config{'usecrosscompile'} + ? (skip_all => "no toolchain installed when cross-compiling") + : (tests => 20); use MakeMaker::Test::Utils; use MakeMaker::Test::Setup::BFD; @@ -18,7 +21,10 @@ my $Is_VMS = $^O eq 'VMS'; my $perl = which_perl(); -chdir 't'; +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; + perl_lib; ok( setup_recurs(), 'setup' ); diff --git a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t index cfcd87fb2b..d9fe9dbf6a 100644 --- a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t +++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t @@ -20,7 +20,9 @@ use ExtUtils::MakeMaker::Config; my $Is_VMS = $^O eq 'VMS'; -chdir 't'; +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; perl_lib; @@ -104,7 +106,7 @@ is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' ); my($perl_src, $mm_perl_src); if( $ENV{PERL_CORE} ) { - $perl_src = File::Spec->catdir($Updir, $Updir, $Updir, $Updir); + $perl_src = File::Spec->catdir($Updir, $Updir, $Updir, $Updir, $Updir); $perl_src = File::Spec->canonpath($perl_src); $mm_perl_src = File::Spec->canonpath($mm->{PERL_SRC}); } diff --git a/cpan/ExtUtils-MakeMaker/t/PL_FILES.t b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t index 0b9aed320e..ab449dd5b1 100644 --- a/cpan/ExtUtils-MakeMaker/t/PL_FILES.t +++ b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t @@ -6,7 +6,11 @@ BEGIN { chdir 't'; use strict; -use Test::More tests => 9; +use Config; +use Test::More + $ENV{PERL_CORE} && $Config{'usecrosscompile'} + ? (skip_all => "no toolchain installed when cross-compiling") + : (tests => 9); use File::Spec; use MakeMaker::Test::Setup::PL_FILES; diff --git a/cpan/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t b/cpan/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t index 88496756c2..7a86fa1b66 100644 --- a/cpan/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t +++ b/cpan/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t @@ -6,7 +6,9 @@ BEGIN { unshift @INC, 't/lib'; } -chdir 't'; +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; use strict; use Test::More tests => 5; diff --git a/cpan/ExtUtils-MakeMaker/t/basic.t b/cpan/ExtUtils-MakeMaker/t/basic.t index cecf0e50b8..b74da44fd9 100644 --- a/cpan/ExtUtils-MakeMaker/t/basic.t +++ b/cpan/ExtUtils-MakeMaker/t/basic.t @@ -11,17 +11,22 @@ use strict; use Config; use ExtUtils::MakeMaker; -use Test::More tests => 171; +use Test::More + $ENV{PERL_CORE} && $Config{'usecrosscompile'} + ? (skip_all => "no toolchain installed when cross-compiling") + : (tests => 171); use MakeMaker::Test::Utils; use MakeMaker::Test::Setup::BFD; use File::Find; use File::Spec; use File::Path; +use File::Temp qw[tempdir]; my $perl = which_perl(); my $Is_VMS = $^O eq 'VMS'; -chdir 't'; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; perl_lib; diff --git a/cpan/ExtUtils-MakeMaker/t/build_man.t b/cpan/ExtUtils-MakeMaker/t/build_man.t index d4649e7598..47e5f4b684 100644 --- a/cpan/ExtUtils-MakeMaker/t/build_man.t +++ b/cpan/ExtUtils-MakeMaker/t/build_man.t @@ -10,6 +10,7 @@ use strict; use Test::More tests => 9; use File::Spec; +use File::Temp qw[tempdir]; use TieOut; use MakeMaker::Test::Utils; use MakeMaker::Test::Setup::BFD; @@ -21,7 +22,8 @@ use ExtUtils::MakeMaker::Config; # ensure these tests will still work. $Config{installman3dir} = 'none'; -chdir 't'; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; perl_lib(); diff --git a/cpan/ExtUtils-MakeMaker/t/cd.t b/cpan/ExtUtils-MakeMaker/t/cd.t index 2b30145956..9b9e06435b 100644 --- a/cpan/ExtUtils-MakeMaker/t/cd.t +++ b/cpan/ExtUtils-MakeMaker/t/cd.t @@ -3,7 +3,10 @@ BEGIN { unshift @INC, 't/lib/'; } -chdir 't'; + +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; my $Is_VMS = $^O eq 'VMS'; diff --git a/cpan/ExtUtils-MakeMaker/t/dir_target.t b/cpan/ExtUtils-MakeMaker/t/dir_target.t index 6744093de7..5cb8e49108 100644 --- a/cpan/ExtUtils-MakeMaker/t/dir_target.t +++ b/cpan/ExtUtils-MakeMaker/t/dir_target.t @@ -1,7 +1,10 @@ #!/usr/bin/perl -w use lib 't/lib'; -chdir 't'; + +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; use Test::More tests => 1; use ExtUtils::MakeMaker; diff --git a/cpan/ExtUtils-MakeMaker/t/echo.t b/cpan/ExtUtils-MakeMaker/t/echo.t index 04fcc4322d..191999d9b1 100644 --- a/cpan/ExtUtils-MakeMaker/t/echo.t +++ b/cpan/ExtUtils-MakeMaker/t/echo.t @@ -16,6 +16,8 @@ use Cwd 'abs_path'; use Test::More; +plan skip_all => "no toolchain installed when cross-compiling" + if $ENV{PERL_CORE} && $Config{'usecrosscompile'}; #--------------------- Setup diff --git a/cpan/ExtUtils-MakeMaker/t/fixin.t b/cpan/ExtUtils-MakeMaker/t/fixin.t index f8c73e8e36..72c86efbf2 100644 --- a/cpan/ExtUtils-MakeMaker/t/fixin.t +++ b/cpan/ExtUtils-MakeMaker/t/fixin.t @@ -6,7 +6,10 @@ BEGIN { unshift @INC, 't/lib/'; } -chdir 't'; + +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; use File::Spec; diff --git a/cpan/ExtUtils-MakeMaker/t/hints.t b/cpan/ExtUtils-MakeMaker/t/hints.t index 19bee553cd..af4d18367a 100644 --- a/cpan/ExtUtils-MakeMaker/t/hints.t +++ b/cpan/ExtUtils-MakeMaker/t/hints.t @@ -4,8 +4,10 @@ use strict; use warnings; use lib 't/lib'; -chdir 't'; +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; use File::Spec; use Test::More tests => 3; diff --git a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t index 5d2ac45e86..a3a4b5afb5 100644 --- a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t +++ b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t @@ -8,7 +8,11 @@ BEGIN { } use strict; -use Test::More tests => 32; +use Config; +use Test::More + $ENV{PERL_CORE} && $Config{'usecrosscompile'} + ? (skip_all => "no toolchain installed when cross-compiling") + : (tests => 32); use TieOut; use MakeMaker::Test::Utils; diff --git a/cpan/ExtUtils-MakeMaker/t/miniperl.t b/cpan/ExtUtils-MakeMaker/t/miniperl.t index d3177bebfe..121d731f52 100644 --- a/cpan/ExtUtils-MakeMaker/t/miniperl.t +++ b/cpan/ExtUtils-MakeMaker/t/miniperl.t @@ -6,6 +6,7 @@ use strict; use lib 't/lib'; +use Config; use Test::More; # In a BEGIN block so the END tests aren't registered. @@ -13,6 +14,9 @@ BEGIN { plan skip_all => "miniperl test only necessary for the perl core" if !$ENV{PERL_CORE}; + plan skip_all => "no toolchain installed when cross-compiling" + if $ENV{PERL_CORE} && $Config{'usecrosscompile'}; + plan "no_plan"; } diff --git a/cpan/ExtUtils-MakeMaker/t/parse_abstract.t b/cpan/ExtUtils-MakeMaker/t/parse_abstract.t index 5ced676a5e..d9c9b3c55f 100644 --- a/cpan/ExtUtils-MakeMaker/t/parse_abstract.t +++ b/cpan/ExtUtils-MakeMaker/t/parse_abstract.t @@ -70,3 +70,12 @@ test_abstract(<<END, "Foo", "the abstract", "more spaces"); Foo - the abstract END + +test_abstract(<<END, "Catalyst::Plugin::Authentication", "Infrastructure plugin for the Catalyst authentication framework.", "contains a line break"); +=pod + +=head1 NAME + +Catalyst::Plugin::Authentication - Infrastructure plugin for the Catalyst +authentication framework. +END diff --git a/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t index 66ef879e4e..b9c5ddff2d 100644 --- a/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t +++ b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t @@ -5,7 +5,12 @@ use strict; use lib 't/lib'; -use Test::More 'no_plan'; +use Config; +use Test::More + $ENV{PERL_CORE} && $Config{'usecrosscompile'} + ? (skip_all => "no toolchain installed when cross-compiling") + : 'no_plan'; +use File::Temp qw[tempdir]; use ExtUtils::MakeMaker; @@ -20,7 +25,8 @@ my $make = make_run(); # Setup our test environment { - chdir 't'; + my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); + chdir $tmpdir; perl_lib; diff --git a/cpan/ExtUtils-MakeMaker/t/postamble.t b/cpan/ExtUtils-MakeMaker/t/postamble.t index 711e979e52..28870c24f0 100644 --- a/cpan/ExtUtils-MakeMaker/t/postamble.t +++ b/cpan/ExtUtils-MakeMaker/t/postamble.t @@ -13,7 +13,9 @@ use MakeMaker::Test::Setup::BFD; use ExtUtils::MakeMaker; use TieOut; -chdir 't'; +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; perl_lib; $| = 1; diff --git a/cpan/ExtUtils-MakeMaker/t/prereq.t b/cpan/ExtUtils-MakeMaker/t/prereq.t index 3149193186..2436888688 100644 --- a/cpan/ExtUtils-MakeMaker/t/prereq.t +++ b/cpan/ExtUtils-MakeMaker/t/prereq.t @@ -9,6 +9,7 @@ BEGIN { use strict; use Test::More tests => 16; +use File::Temp qw[tempdir]; use TieOut; use MakeMaker::Test::Utils; @@ -16,7 +17,8 @@ use MakeMaker::Test::Setup::BFD; use ExtUtils::MakeMaker; -chdir 't'; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; perl_lib(); diff --git a/cpan/ExtUtils-MakeMaker/t/prereq_print.t b/cpan/ExtUtils-MakeMaker/t/prereq_print.t index 9170aa0e4e..b6e12ef00f 100644 --- a/cpan/ExtUtils-MakeMaker/t/prereq_print.t +++ b/cpan/ExtUtils-MakeMaker/t/prereq_print.t @@ -8,6 +8,7 @@ use strict; use Config; use Test::More; +use File::Temp qw[tempdir]; unless( eval { require Data::Dumper } ) { plan skip_all => 'Data::Dumper not available'; @@ -27,7 +28,9 @@ my $Perl = which_perl(); my $Makefile = makefile_name(); my $Is_VMS = $^O eq 'VMS'; -chdir 't'; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; + perl_lib; $| = 1; diff --git a/cpan/ExtUtils-MakeMaker/t/recurs.t b/cpan/ExtUtils-MakeMaker/t/recurs.t index b7c561bc9c..1942370fd0 100644 --- a/cpan/ExtUtils-MakeMaker/t/recurs.t +++ b/cpan/ExtUtils-MakeMaker/t/recurs.t @@ -9,7 +9,12 @@ BEGIN { use strict; use Config; -use Test::More tests => 26; +use Test::More + $ENV{PERL_CORE} && $Config{'usecrosscompile'} + ? (skip_all => "no toolchain installed when cross-compiling") + : (tests => 26); +use File::Temp qw[tempdir]; + use MakeMaker::Test::Utils; use MakeMaker::Test::Setup::Recurs; @@ -20,7 +25,8 @@ delete @ENV{qw(PREFIX LIB MAKEFLAGS)}; my $perl = which_perl(); my $Is_VMS = $^O eq 'VMS'; -chdir('t'); +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; perl_lib; diff --git a/cpan/ExtUtils-MakeMaker/t/several_authors.t b/cpan/ExtUtils-MakeMaker/t/several_authors.t index eba35e13a6..98569aee68 100644 --- a/cpan/ExtUtils-MakeMaker/t/several_authors.t +++ b/cpan/ExtUtils-MakeMaker/t/several_authors.t @@ -8,7 +8,11 @@ BEGIN { } use strict; -use Test::More tests => 20; +use Config; +use Test::More + $ENV{PERL_CORE} && $Config{'usecrosscompile'} + ? (skip_all => "no toolchain installed when cross-compiling") + : (tests => 20); use TieOut; use MakeMaker::Test::Utils; diff --git a/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t b/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t index c3133a29bb..0625960c75 100644 --- a/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t +++ b/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t @@ -16,7 +16,9 @@ use MakeMaker::Test::Setup::BFD; use ExtUtils::MakeMaker; -chdir 't'; +use File::Temp qw[tempdir]; +my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 ); +chdir $tmpdir; perl_lib(); @@ -247,7 +249,7 @@ VERIFY VERSION => '1.00', ); - is( $mm->{CCFLAGS}, "-Wl,-rpath -Wl,/foo/bar/lib", 'parse_args() splits like shell' ); + like( $mm->{CCFLAGS}, qr{-Wl,-rpath -Wl,/foo/bar/lib}, 'parse_args() splits like shell' ); is_deeply( $mm->{LIBS}, ['-lwibble -lwobble'], 'parse_args() splits like shell' ); } diff --git a/cpan/ExtUtils-MakeMaker/t/xs.t b/cpan/ExtUtils-MakeMaker/t/xs.t index 3f9a4df4ba..81127f384d 100644 --- a/cpan/ExtUtils-MakeMaker/t/xs.t +++ b/cpan/ExtUtils-MakeMaker/t/xs.t @@ -7,22 +7,16 @@ chdir 't'; use strict; -use Test::More; use MakeMaker::Test::Utils; use MakeMaker::Test::Setup::XS; +use Test::More + have_compiler() + ? (tests => 5) + : (skip_all => "ExtUtils::CBuilder not installed or couldn't find a compiler"); use File::Find; use File::Spec; use File::Path; -my $Skipped = 0; -if( have_compiler() ) { - plan tests => 5; -} -else { - $Skipped = 1; - plan skip_all => "ExtUtils::CBuilder not installed or couldn't find a compiler"; -} - my $Is_VMS = $^O eq 'VMS'; my $perl = which_perl(); @@ -34,10 +28,8 @@ $| = 1; ok( setup_xs(), 'setup' ); END { - unless( $Skipped ) { - chdir File::Spec->updir or die; - teardown_xs(), 'teardown' or die; - } + chdir File::Spec->updir or die; + teardown_xs(), 'teardown' or die; } ok( chdir('XS-Test'), "chdir'd to XS-Test" ) || |