In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c0cc8a3fcb4b5b516dd49d2c599906915baa815d?hp=cd3be6b2cf24e3d227b2dbd94aa64f40d21675d2>
- Log ----------------------------------------------------------------- commit c0cc8a3fcb4b5b516dd49d2c599906915baa815d Author: David Mitchell <[email protected]> Date: Wed Aug 5 21:40:55 2009 +0100 fix for EU:MM 6.55_02 failing test, as suggested by Schwern (cherry picked from commit 3ed7368117d18c1af3bc089adf0d9fcdf5c04cd4) M lib/ExtUtils/t/00compile.t commit 8ae7560dbb0de7d0041e2c52e4e4f3c2b55ad042 Author: David Mitchell <[email protected]> Date: Wed Aug 5 20:46:32 2009 +0100 ExtUtils::MakeMaker 6.55_02 (cherry picked from commit cb06ebec412ca5c62617b8007098bd39019a09df) M Porting/Maintainers.pl M lib/ExtUtils/Changes M lib/ExtUtils/Command/MM.pm M lib/ExtUtils/Liblist.pm M lib/ExtUtils/Liblist/Kid.pm M lib/ExtUtils/MM.pm M lib/ExtUtils/MM_AIX.pm M lib/ExtUtils/MM_Any.pm M lib/ExtUtils/MM_BeOS.pm M lib/ExtUtils/MM_Cygwin.pm M lib/ExtUtils/MM_DOS.pm M lib/ExtUtils/MM_Darwin.pm M lib/ExtUtils/MM_MacOS.pm M lib/ExtUtils/MM_NW5.pm M lib/ExtUtils/MM_OS2.pm M lib/ExtUtils/MM_QNX.pm M lib/ExtUtils/MM_UWIN.pm M lib/ExtUtils/MM_Unix.pm M lib/ExtUtils/MM_VMS.pm M lib/ExtUtils/MM_VOS.pm M lib/ExtUtils/MM_Win32.pm M lib/ExtUtils/MM_Win95.pm M lib/ExtUtils/MY.pm M lib/ExtUtils/MakeMaker.pm M lib/ExtUtils/MakeMaker/Config.pm M lib/ExtUtils/Mkbootstrap.pm M lib/ExtUtils/Mksymlists.pm M lib/ExtUtils/t/00compile.t M lib/ExtUtils/t/prefixify.t M lib/ExtUtils/testlib.pm M t/lib/MakeMaker/Test/Utils.pm ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- lib/ExtUtils/Changes | 12 +++++++++++- lib/ExtUtils/Command/MM.pm | 2 +- lib/ExtUtils/Liblist.pm | 2 +- lib/ExtUtils/Liblist/Kid.pm | 2 +- lib/ExtUtils/MM.pm | 2 +- lib/ExtUtils/MM_AIX.pm | 2 +- lib/ExtUtils/MM_Any.pm | 2 +- lib/ExtUtils/MM_BeOS.pm | 2 +- lib/ExtUtils/MM_Cygwin.pm | 2 +- lib/ExtUtils/MM_DOS.pm | 2 +- lib/ExtUtils/MM_Darwin.pm | 2 +- lib/ExtUtils/MM_MacOS.pm | 2 +- lib/ExtUtils/MM_NW5.pm | 2 +- lib/ExtUtils/MM_OS2.pm | 2 +- lib/ExtUtils/MM_QNX.pm | 2 +- lib/ExtUtils/MM_UWIN.pm | 2 +- lib/ExtUtils/MM_Unix.pm | 4 ++-- lib/ExtUtils/MM_VMS.pm | 2 +- lib/ExtUtils/MM_VOS.pm | 2 +- lib/ExtUtils/MM_Win32.pm | 2 +- lib/ExtUtils/MM_Win95.pm | 2 +- lib/ExtUtils/MY.pm | 2 +- lib/ExtUtils/MakeMaker.pm | 4 ++-- lib/ExtUtils/MakeMaker/Config.pm | 2 +- lib/ExtUtils/Mkbootstrap.pm | 2 +- lib/ExtUtils/Mksymlists.pm | 2 +- lib/ExtUtils/t/00compile.t | 6 ++---- lib/ExtUtils/t/prefixify.t | 6 +++++- lib/ExtUtils/testlib.pm | 2 +- t/lib/MakeMaker/Test/Utils.pm | 2 +- 31 files changed, 48 insertions(+), 36 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 9526785..9b7e288 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -695,7 +695,7 @@ package Maintainers; 'ExtUtils::MakeMaker' => { 'MAINTAINER' => 'mschwern', - 'DISTRIBUTION' => 'MSCHWERN/ExtUtils-MakeMaker-6.55_01.tar.gz', + 'DISTRIBUTION' => 'MSCHWERN/ExtUtils-MakeMaker-6.55_02.tar.gz', # note that t/lib/TieOut.pm is included in # more than one distro 'FILES' => q[lib/ExtUtils/{Liblist,MakeMaker,Mkbootstrap,Mksymlists,MM*,MY,testlib}.pm diff --git a/lib/ExtUtils/Changes b/lib/ExtUtils/Changes index 591f958..2943c53 100644 --- a/lib/ExtUtils/Changes +++ b/lib/ExtUtils/Changes @@ -1,3 +1,13 @@ +6.55_02 Wed Aug 5 00:36:36 PDT 2009 + Feature Changes + * PREFIX now applies to relative directories. This is a change since + 6.20 when they were ignored. Its necessary for relocatable Perls. + + VMS + * Refactoring of "MakeMaker Parameters" section in 6.55_01 broke VMS. + (Craig Berry) + + 6.55_01 Tue Jul 14 15:53:30 PDT 2009 Test Fixes * The tests got a bit overzealous and removed the LIB environment variable @@ -1038,7 +1048,7 @@ causing warnings when generating the Makefile. 6.06_03 Sat Mar 29 19:44:53 PST 2003 - - Added AUTHOR and ABSTRACT_FROM info for ppd generation. + - Added AUTHOR and ABSTRACT_FROM info to Makefile.PL for ppd generation. - Added echo() method to portably echo text to a file. - Worked around 5.8.0 eval 'require Foo::Bar' bug causing MakeMaker to think modules weren't installed. diff --git a/lib/ExtUtils/Command/MM.pm b/lib/ExtUtils/Command/MM.pm index bebddd8..d4a0ef7 100644 --- a/lib/ExtUtils/Command/MM.pm +++ b/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.55_01'; +our $VERSION = '6.55_02'; my $Is_VMS = $^O eq 'VMS'; diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm index 6d91117..fb9977b 100644 --- a/lib/ExtUtils/Liblist.pm +++ b/lib/ExtUtils/Liblist.pm @@ -2,7 +2,7 @@ package ExtUtils::Liblist; use strict; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; use File::Spec; require ExtUtils::Liblist::Kid; diff --git a/lib/ExtUtils/Liblist/Kid.pm b/lib/ExtUtils/Liblist/Kid.pm index 88826c2..380d4f8 100644 --- a/lib/ExtUtils/Liblist/Kid.pm +++ b/lib/ExtUtils/Liblist/Kid.pm @@ -9,7 +9,7 @@ use 5.006; # Broken out of MakeMaker from version 4.11 use strict; -our $VERSION = 6.55_01; +our $VERSION = 6.55_02; use Config; use Cwd 'cwd'; diff --git a/lib/ExtUtils/MM.pm b/lib/ExtUtils/MM.pm index fc75501..4694f3f 100644 --- a/lib/ExtUtils/MM.pm +++ b/lib/ExtUtils/MM.pm @@ -3,7 +3,7 @@ package ExtUtils::MM; use strict; use ExtUtils::MakeMaker::Config; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; require ExtUtils::Liblist; require ExtUtils::MakeMaker; diff --git a/lib/ExtUtils/MM_AIX.pm b/lib/ExtUtils/MM_AIX.pm index 10e4fd4..0f27d17 100644 --- a/lib/ExtUtils/MM_AIX.pm +++ b/lib/ExtUtils/MM_AIX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_AIX; use strict; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm index 0af50e1..a7afe20 100644 --- a/lib/ExtUtils/MM_Any.pm +++ b/lib/ExtUtils/MM_Any.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_Any; use strict; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; use Carp; use File::Spec; diff --git a/lib/ExtUtils/MM_BeOS.pm b/lib/ExtUtils/MM_BeOS.pm index a85831a..168d23d 100644 --- a/lib/ExtUtils/MM_BeOS.pm +++ b/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.55_01'; +our $VERSION = '6.55_02'; =item os_flavor diff --git a/lib/ExtUtils/MM_Cygwin.pm b/lib/ExtUtils/MM_Cygwin.pm index 4618929..9cc7522 100644 --- a/lib/ExtUtils/MM_Cygwin.pm +++ b/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.55_01'; +our $VERSION = '6.55_02'; =head1 NAME diff --git a/lib/ExtUtils/MM_DOS.pm b/lib/ExtUtils/MM_DOS.pm index 24eec2f..84bedea 100644 --- a/lib/ExtUtils/MM_DOS.pm +++ b/lib/ExtUtils/MM_DOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_DOS; use strict; -our $VERSION = 6.55_01; +our $VERSION = 6.55_02; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_Darwin.pm b/lib/ExtUtils/MM_Darwin.pm index 62baeff..d26c0a1 100644 --- a/lib/ExtUtils/MM_Darwin.pm +++ b/lib/ExtUtils/MM_Darwin.pm @@ -7,7 +7,7 @@ BEGIN { our @ISA = qw( ExtUtils::MM_Unix ); } -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; =head1 NAME diff --git a/lib/ExtUtils/MM_MacOS.pm b/lib/ExtUtils/MM_MacOS.pm index e134723..bab7ab9 100644 --- a/lib/ExtUtils/MM_MacOS.pm +++ b/lib/ExtUtils/MM_MacOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_MacOS; use strict; -our $VERSION = 6.55_01; +our $VERSION = 6.55_02; sub new { die <<'UNSUPPORTED'; diff --git a/lib/ExtUtils/MM_NW5.pm b/lib/ExtUtils/MM_NW5.pm index 9a40968..950f175 100644 --- a/lib/ExtUtils/MM_NW5.pm +++ b/lib/ExtUtils/MM_NW5.pm @@ -22,7 +22,7 @@ use strict; use ExtUtils::MakeMaker::Config; use File::Basename; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); diff --git a/lib/ExtUtils/MM_OS2.pm b/lib/ExtUtils/MM_OS2.pm index 658d4ea..73c1819 100644 --- a/lib/ExtUtils/MM_OS2.pm +++ b/lib/ExtUtils/MM_OS2.pm @@ -5,7 +5,7 @@ use strict; use ExtUtils::MakeMaker qw(neatvalue); use File::Spec; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_QNX.pm b/lib/ExtUtils/MM_QNX.pm index af98792..df6e571 100644 --- a/lib/ExtUtils/MM_QNX.pm +++ b/lib/ExtUtils/MM_QNX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_QNX; use strict; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/lib/ExtUtils/MM_UWIN.pm b/lib/ExtUtils/MM_UWIN.pm index bec378e..d3f2949 100644 --- a/lib/ExtUtils/MM_UWIN.pm +++ b/lib/ExtUtils/MM_UWIN.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_UWIN; use strict; -our $VERSION = 6.55_01; +our $VERSION = 6.55_02; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index 32f1272..ad28b22 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/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.55_01'; +$VERSION = '6.55_02'; require ExtUtils::MM_Any; our @ISA = qw(ExtUtils::MM_Any); @@ -2986,7 +2986,7 @@ sub prefixify { print STDERR " prefixify $var => $path\n" if $Verbose >= 2; print STDERR " from $sprefix to $rprefix\n" if $Verbose >= 2; - if( $self->{ARGS}{PREFIX} && $self->file_name_is_absolute($path) && + if( $self->{ARGS}{PREFIX} && $path !~ s{^\Q$sprefix\E\b}{$rprefix}s ) { diff --git a/lib/ExtUtils/MM_VMS.pm b/lib/ExtUtils/MM_VMS.pm index 79267ca..492a120 100644 --- a/lib/ExtUtils/MM_VMS.pm +++ b/lib/ExtUtils/MM_VMS.pm @@ -15,7 +15,7 @@ BEGIN { use File::Basename; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_VOS.pm b/lib/ExtUtils/MM_VOS.pm index e056e2a..3a7ec87 100644 --- a/lib/ExtUtils/MM_VOS.pm +++ b/lib/ExtUtils/MM_VOS.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_VOS; use strict; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index 86a1199..1a5bbf0 100644 --- a/lib/ExtUtils/MM_Win32.pm +++ b/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.55_01'; +our $VERSION = '6.55_02'; $ENV{EMXSHELL} = 'sh'; # to run `commands` diff --git a/lib/ExtUtils/MM_Win95.pm b/lib/ExtUtils/MM_Win95.pm index 7fd9639..0c04f83 100644 --- a/lib/ExtUtils/MM_Win95.pm +++ b/lib/ExtUtils/MM_Win95.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_Win95; use strict; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); diff --git a/lib/ExtUtils/MY.pm b/lib/ExtUtils/MY.pm index 6e65d78..c1a8c94 100644 --- a/lib/ExtUtils/MY.pm +++ b/lib/ExtUtils/MY.pm @@ -3,7 +3,7 @@ package ExtUtils::MY; use strict; require ExtUtils::MM; -our $VERSION = 6.55_01; +our $VERSION = 6.55_02; our @ISA = qw(ExtUtils::MM); { diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm index f9d7c56..893c0bf 100644 --- a/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm @@ -18,7 +18,7 @@ our @Overridable; my @Prepend_parent; my %Recognized_Att_Keys; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; # Emulate something resembling CVS $Revision$ (our $Revision = $VERSION) =~ s{_}{}; @@ -1774,7 +1774,7 @@ If set to 'none', no man pages will be installed. =item INSTALLVENDORSCRIPT Used by 'make install' which copies files from INST_SCRIPT to this -directory if INSTALLDIRS is set to is set to vendor. +directory if INSTALLDIRS is set to vendor. =item INST_ARCHLIB diff --git a/lib/ExtUtils/MakeMaker/Config.pm b/lib/ExtUtils/MakeMaker/Config.pm index 24f48b4..9c99f7d 100644 --- a/lib/ExtUtils/MakeMaker/Config.pm +++ b/lib/ExtUtils/MakeMaker/Config.pm @@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Config; use strict; -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; use Config (); diff --git a/lib/ExtUtils/Mkbootstrap.pm b/lib/ExtUtils/Mkbootstrap.pm index c7f8fe7..f1b47f6 100644 --- a/lib/ExtUtils/Mkbootstrap.pm +++ b/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.55_01'; +our $VERSION = '6.55_02'; require Exporter; our @ISA = ('Exporter'); diff --git a/lib/ExtUtils/Mksymlists.pm b/lib/ExtUtils/Mksymlists.pm index a1a7c92..9b133f7 100644 --- a/lib/ExtUtils/Mksymlists.pm +++ b/lib/ExtUtils/Mksymlists.pm @@ -10,7 +10,7 @@ use Config; our @ISA = qw(Exporter); our @EXPORT = qw(&Mksymlists); -our $VERSION = '6.55_01'; +our $VERSION = '6.55_02'; sub Mksymlists { my(%spec) = @_; diff --git a/lib/ExtUtils/t/00compile.t b/lib/ExtUtils/t/00compile.t index 7d06484..20f7ded 100644 --- a/lib/ExtUtils/t/00compile.t +++ b/lib/ExtUtils/t/00compile.t @@ -10,8 +10,6 @@ BEGIN { } chdir 't'; -use File::Find; -use File::Spec; use Test::More; my $Has_Test_Pod; @@ -19,8 +17,8 @@ BEGIN { $Has_Test_Pod = eval 'use Test::Pod 0.95; 1'; } -chdir File::Spec->updir; -my $manifest = File::Spec->catfile('MANIFEST'); +chdir ".."; +my $manifest = "MANIFEST"; open(my $manifest_fh, "<", $manifest) or die "Can't open $manifest: $!"; my @modules = map { m{^lib/(\S+)}; $1 } grep { m{^lib/ExtUtils/\S*\.pm} } diff --git a/lib/ExtUtils/t/prefixify.t b/lib/ExtUtils/t/prefixify.t index b5bf139..011b77c 100644 --- a/lib/ExtUtils/t/prefixify.t +++ b/lib/ExtUtils/t/prefixify.t @@ -17,7 +17,7 @@ if( $^O eq 'VMS' ) { plan skip_all => 'prefixify works differently on VMS'; } else { - plan tests => 3; + plan tests => 4; } use ExtUtils::MakeMaker::Config; use File::Spec; @@ -38,6 +38,10 @@ $mm->prefixify('installbin', 'wibble', 'something', $default); is( $mm->{INSTALLBIN}, File::Spec->catdir('something', $default), 'prefixify w/defaults and PREFIX'); +$mm->prefixify('installbin', '../wibble', 'something', $default); +is( $mm->{INSTALLBIN}, File::Spec->catdir('something', $default), + 'relative paths + PREFIX'); + SKIP: { skip "Test for DOSish prefixification", 1 unless $Is_Dosish; diff --git a/lib/ExtUtils/testlib.pm b/lib/ExtUtils/testlib.pm index e11fd32..b1231e2 100644 --- a/lib/ExtUtils/testlib.pm +++ b/lib/ExtUtils/testlib.pm @@ -3,7 +3,7 @@ package ExtUtils::testlib; use strict; use warnings; -our $VERSION = 6.55_01; +our $VERSION = 6.55_02; use Cwd; use File::Spec; diff --git a/t/lib/MakeMaker/Test/Utils.pm b/t/lib/MakeMaker/Test/Utils.pm index 7e5d5fc..b81791d 100644 --- a/t/lib/MakeMaker/Test/Utils.pm +++ b/t/lib/MakeMaker/Test/Utils.pm @@ -290,7 +290,7 @@ sub run { use ExtUtils::MM; - # Unix, modern Windows and OS/2 from 5.005_54 up can handle can handle 2>&1 + # Unix, modern Windows and OS/2 from 5.005_54 up can handle 2>&1 # This makes our failure diagnostics nicer to read. if( MM->os_flavor_is('Unix') or (MM->os_flavor_is('Win32') and !MM->os_flavor_is('Win9x')) or -- Perl5 Master Repository
