From: Nicholas Clark Date: Sat, 21 Feb 2009 08:11:13 +0000 (+0000) Subject: Upgrade to ExtUtils::MakeMaker 6.49_01 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1487aac67a72b9f87b24113f65b4d878401bee33;p=p5sagit%2Fp5-mst-13.2.git Upgrade to ExtUtils::MakeMaker 6.49_01 --- diff --git a/lib/ExtUtils/Command/MM.pm b/lib/ExtUtils/Command/MM.pm index 5665bbb..4f7b73a 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.48'; +our $VERSION = '6.49_01'; my $Is_VMS = $^O eq 'VMS'; diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm index b6ac71a..4ff8a24 100644 --- a/lib/ExtUtils/Liblist.pm +++ b/lib/ExtUtils/Liblist.pm @@ -2,7 +2,7 @@ package ExtUtils::Liblist; use strict; -our $VERSION = '6.48'; +our $VERSION = '6.49_01'; use File::Spec; require ExtUtils::Liblist::Kid; diff --git a/lib/ExtUtils/Liblist/Kid.pm b/lib/ExtUtils/Liblist/Kid.pm index c6d438a..6c3ebe9 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.48; +our $VERSION = 6.49_01; use Config; use Cwd 'cwd'; diff --git a/lib/ExtUtils/MM.pm b/lib/ExtUtils/MM.pm index f332309..6d800ee 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.48_01'; +our $VERSION = '6.49_01'; require ExtUtils::Liblist; require ExtUtils::MakeMaker; @@ -58,7 +58,7 @@ if( $^O eq 'MSWin32' ) { $Is{UWIN} = $^O =~ /^uwin(-nt)?$/; $Is{Cygwin} = $^O eq 'cygwin'; $Is{NW5} = $Config{osname} eq 'NetWare'; # intentional -$Is{BeOS} = $^O =~ /beos/i; # XXX should this be that loose? +$Is{BeOS} = ($^O =~ /beos/i or $^O eq 'haiku'); $Is{DOS} = $^O eq 'dos'; if( $Is{NW5} ) { $^O = 'NetWare'; @@ -68,7 +68,6 @@ $Is{VOS} = $^O eq 'vos'; $Is{QNX} = $^O eq 'qnx'; $Is{AIX} = $^O eq 'aix'; $Is{Darwin} = $^O eq 'darwin'; -$Is{Haiku} = $^O eq 'haiku'; $Is{Unix} = !grep { $_ } values %Is; diff --git a/lib/ExtUtils/MM_AIX.pm b/lib/ExtUtils/MM_AIX.pm index e4d5735..7e5a44a 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.48'; +our $VERSION = '6.49_01'; 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 2cee73f..69b63a5 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.48_01'; +our $VERSION = '6.49_01'; use Carp; use File::Spec; @@ -354,7 +354,7 @@ to do some normalization on the information from %Config or the user. sub make { my $self = shift; - my $make = lc($self->{MAKE}|| ''); + my $make = lc $self->{MAKE}; # Truncate anything like foomake6 to just foomake. $make =~ s/^(\w+make).*/$1/; @@ -832,6 +832,10 @@ sub metafile_data { 'ExtUtils::MakeMaker' => 0 }, + build_requires => { + 'ExtUtils::MakeMaker' => 0 + }, + no_index => { directory => [qw(t inc)] }, diff --git a/lib/ExtUtils/MM_BeOS.pm b/lib/ExtUtils/MM_BeOS.pm index 74d1fbc..8c0e550 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.48'; +our $VERSION = '6.49_01'; =item os_flavor diff --git a/lib/ExtUtils/MM_Cygwin.pm b/lib/ExtUtils/MM_Cygwin.pm index 8eff244..8bcecf7 100644 --- a/lib/ExtUtils/MM_Cygwin.pm +++ b/lib/ExtUtils/MM_Cygwin.pm @@ -9,7 +9,7 @@ require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '6.48'; +our $VERSION = '6.49_01'; =head1 NAME diff --git a/lib/ExtUtils/MM_DOS.pm b/lib/ExtUtils/MM_DOS.pm index ab36bda..3d4ed66 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.48; +our $VERSION = 6.49_01; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_Darwin.pm b/lib/ExtUtils/MM_Darwin.pm index 95f2bfa..3632753 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.48'; +our $VERSION = '6.49_01'; =head1 NAME diff --git a/lib/ExtUtils/MM_MacOS.pm b/lib/ExtUtils/MM_MacOS.pm index ca70aa8..cce12f5 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.48; +our $VERSION = 6.49_01; sub new { die <<'UNSUPPORTED'; diff --git a/lib/ExtUtils/MM_NW5.pm b/lib/ExtUtils/MM_NW5.pm index c76e731..b116825 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.48'; +our $VERSION = '6.49_01'; 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 9e6fdfa..dfdf58d 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.48'; +our $VERSION = '6.49_01'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_QNX.pm b/lib/ExtUtils/MM_QNX.pm index ae52418..bdac347 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.48'; +our $VERSION = '6.49_01'; 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 b98a1d8..a73f81e 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.48; +our $VERSION = 6.49_01; 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 3624619..1eca13a 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.48_01'; +$VERSION = '6.49_01'; require ExtUtils::MM_Any; our @ISA = qw(ExtUtils::MM_Any); diff --git a/lib/ExtUtils/MM_VMS.pm b/lib/ExtUtils/MM_VMS.pm index 2455733..e76f19c 100644 --- a/lib/ExtUtils/MM_VMS.pm +++ b/lib/ExtUtils/MM_VMS.pm @@ -15,7 +15,7 @@ BEGIN { use File::Basename; -our $VERSION = '6.48'; +our $VERSION = '6.49_01'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_VOS.pm b/lib/ExtUtils/MM_VOS.pm index 7fa41b4..16d30fb 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.48'; +our $VERSION = '6.49_01'; 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 4021b9d..9246ca7 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.48'; +our $VERSION = '6.49_01'; $ENV{EMXSHELL} = 'sh'; # to run `commands` @@ -338,10 +338,13 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). q{ $(LD) -out:$@ $(LDDLFLAGS) }.$ldfrom.q{ $(OTHERLDFLAGS) } .q{$(MYEXTLIB) $(PERL_ARCHIVE) $(LDLOADLIBS) -def:$(EXPORT_LIST)}); - # Embed the manifest file if it exists - push(@m, q{ - if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 - if exist $@.manifest del $@.manifest}); + # VS2005 (aka VC 8) or higher, but not for 64-bit compiler from Platform SDK + if ($Config{ivsize} == 4 && $Config{cc} eq 'cl' and $Config{ccversion} =~ /^(\d+)/ and $1 >= 14) + { + push(@m, + q{ + mt -nologo -manifest $@.manifest -outputresource:$@;2 && del $@.manifest}); + } } push @m, ' $(CHMOD) $(PERM_RWX) $@ diff --git a/lib/ExtUtils/MM_Win95.pm b/lib/ExtUtils/MM_Win95.pm index e2dd56a..27c71a8 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.48'; +our $VERSION = '6.49_01'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); diff --git a/lib/ExtUtils/MY.pm b/lib/ExtUtils/MY.pm index e41b6f5..935524a 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.48; +our $VERSION = 6.49_01; our @ISA = qw(ExtUtils::MM); { diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm index 639b76a..8a6065f 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.48_01'; +our $VERSION = '6.49_01'; # Emulate something resembling CVS $Revision$ (our $Revision = $VERSION) =~ s{_}{}; @@ -2587,7 +2587,13 @@ following parameters are recognized: An example: - WriteMakefile( 'dist' => { COMPRESS=>"bzip2", SUFFIX=>".bz2" }) + WriteMakefile( + ...other options... + dist => { + COMPRESS => "bzip2", + SUFFIX => ".bz2" + } + ); =head2 Module Meta-Data diff --git a/lib/ExtUtils/MakeMaker/Config.pm b/lib/ExtUtils/MakeMaker/Config.pm index 0e5e8c0..c9f8fee 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.48'; +our $VERSION = '6.49_01'; use Config (); diff --git a/lib/ExtUtils/MakeMaker/bytes.pm b/lib/ExtUtils/MakeMaker/bytes.pm index 0d2ccc8..6f17791 100644 --- a/lib/ExtUtils/MakeMaker/bytes.pm +++ b/lib/ExtUtils/MakeMaker/bytes.pm @@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::bytes; use strict; -our $VERSION = 6.48; +our $VERSION = 6.49_01; my $Have_Bytes = eval { require bytes; 1; }; diff --git a/lib/ExtUtils/MakeMaker/vmsish.pm b/lib/ExtUtils/MakeMaker/vmsish.pm index 225b9c7..666047a 100644 --- a/lib/ExtUtils/MakeMaker/vmsish.pm +++ b/lib/ExtUtils/MakeMaker/vmsish.pm @@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::vmsish; use strict; -our $VERSION = 6.48; +our $VERSION = 6.49_01; my $IsVMS = $^O eq 'VMS'; diff --git a/lib/ExtUtils/Mkbootstrap.pm b/lib/ExtUtils/Mkbootstrap.pm index bb1a5b9..66274b0 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.48'; +our $VERSION = '6.49_01'; require Exporter; our @ISA = ('Exporter'); diff --git a/lib/ExtUtils/Mksymlists.pm b/lib/ExtUtils/Mksymlists.pm index 9675d5c..da25100 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.48'; +our $VERSION = '6.49_01'; sub Mksymlists { my(%spec) = @_; diff --git a/lib/ExtUtils/t/INST.t b/lib/ExtUtils/t/INST.t index 2a85f08..49938cb 100644 --- a/lib/ExtUtils/t/INST.t +++ b/lib/ExtUtils/t/INST.t @@ -24,8 +24,6 @@ use File::Spec; use TieOut; use Config; -my $Is_VMS = $^O eq 'VMS'; - chdir 't'; perl_lib; @@ -76,7 +74,6 @@ 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); - $perl_src = VMS::Filespec::vmsify($perl_src) if $Is_VMS; $perl_src = File::Spec->canonpath($perl_src); $mm_perl_src = File::Spec->canonpath($mm->{PERL_SRC}); } @@ -93,28 +90,22 @@ is( $mm->{PERM_RWX}, 755, 'PERM_RWX' ); # INST_* -my $expect = File::Spec->catdir($Curdir, 'blib', 'arch'); -$expect = VMS::Filespec::vmspath($expect) if $Is_VMS; is( $mm->{INST_ARCHLIB}, $mm->{PERL_CORE} ? $mm->{PERL_ARCHLIB} - : $expect, - 'INST_ARCHLIB'); -$expect = File::Spec->catdir($Curdir, 'blib', 'bin'); -$expect = VMS::Filespec::vmspath($expect) if $Is_VMS; -is( $mm->{INST_BIN}, $expect, 'INST_BIN' ); + : File::Spec->catdir($Curdir, 'blib', 'arch'), + 'INST_ARCHLIB'); +is( $mm->{INST_BIN}, File::Spec->catdir($Curdir, 'blib', 'bin'), + 'INST_BIN' ); is( keys %{$mm->{CHILDREN}}, 1 ); my($child_pack) = keys %{$mm->{CHILDREN}}; my $c_mm = $mm->{CHILDREN}{$child_pack}; -$expect = File::Spec->catdir($Updir, 'blib', 'arch'); -$expect = VMS::Filespec::vmspath($expect) if $Is_VMS; is( $c_mm->{INST_ARCHLIB}, $c_mm->{PERL_CORE} ? $c_mm->{PERL_ARCHLIB} - : $expect, - 'CHILD INST_ARCHLIB'); -$expect = File::Spec->catdir($Updir, 'blib', 'bin'); -$expect = VMS::Filespec::vmspath($expect) if $Is_VMS; -is( $c_mm->{INST_BIN}, $expect, 'CHILD INST_BIN' ); + : File::Spec->catdir($Updir, 'blib', 'arch'), + 'CHILD INST_ARCHLIB'); +is( $c_mm->{INST_BIN}, File::Spec->catdir($Updir, 'blib', 'bin'), + 'CHILD INST_BIN' ); my $inst_lib = File::Spec->catdir($Curdir, 'blib', 'lib'); diff --git a/lib/ExtUtils/t/INSTALL_BASE.t b/lib/ExtUtils/t/INSTALL_BASE.t index 4442762..95c62cc 100644 --- a/lib/ExtUtils/t/INSTALL_BASE.t +++ b/lib/ExtUtils/t/INSTALL_BASE.t @@ -16,7 +16,7 @@ use strict; use File::Path; use Config; -use Test::More tests => 21; +use Test::More tests => 20; use MakeMaker::Test::Utils; use MakeMaker::Test::Setup::BFD; @@ -48,12 +48,9 @@ ok( grep(/^Writing $makefile for Big::Dummy/, my $make = make_run(); run("$make"); # this is necessary due to a dmake bug. -# Test 'make install VERBINST=1' -my $make_install_verbinst = make_macro($make, 'install', VERBINST => 1); -my $install_out = run($make_install_verbinst); -is( $?, 0, 'install' ) || diag $install_out; +my $install_out = run("$make install"); +is( $?, 0, ' make install exited normally' ) || diag $install_out; like( $install_out, qr/^Installing /m ); -like( $install_out, qr/^Writing /m ); ok( -r '../dummy-install', ' install dir created' ); diff --git a/lib/ExtUtils/t/INST_PREFIX.t b/lib/ExtUtils/t/INST_PREFIX.t index 1d580dd..57e7eb2 100644 --- a/lib/ExtUtils/t/INST_PREFIX.t +++ b/lib/ExtUtils/t/INST_PREFIX.t @@ -103,7 +103,6 @@ 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); - $perl_src = VMS::Filespec::vmsify($perl_src) if $Is_VMS; $perl_src = File::Spec->canonpath($perl_src); $mm_perl_src = File::Spec->canonpath($mm->{PERL_SRC}); } @@ -154,7 +153,6 @@ while( my($type, $vars) = each %Install_Vars) { _set_config(installman3dir => ''); my $wibble = File::Spec->catdir(qw(wibble and such)); - $wibble = VMS::Filespec::vmspath($wibble) if $Is_VMS; my $stdout = tie *STDOUT, 'TieOut' or die; my $mm = WriteMakefile( NAME => 'Big::Dummy', @@ -189,9 +187,7 @@ while( my($type, $vars) = each %Install_Vars) { INSTALLMAN3DIR=> 'foo/bar/baz', ); - my $expect = File::Spec->catdir('foo','bar'); - $expect = VMS::Filespec::vmspath($expect) if $Is_VMS; - is( $mm->{INSTALLVENDORMAN1DIR}, $expect, + is( $mm->{INSTALLVENDORMAN1DIR}, File::Spec->catdir('foo','bar'), 'installvendorman1dir (in %Config) not modified' ); isnt( $mm->{INSTALLVENDORMAN3DIR}, '', 'installvendorman3dir (not in %Config) set' ); @@ -216,14 +212,9 @@ while( my($type, $vars) = each %Install_Vars) { VERSION_FROM => 'lib/Big/Dummy.pm', PERL_CORE => $ENV{PERL_CORE}, ); - my $expect1 = File::Spec->catdir('foo', 'bar'); - my $expect2 = File::Spec->catdir('foo', 'baz'); - if ($Is_VMS) { - $expect1 = VMS::Filespec::vmspath($expect1); - $expect2 = VMS::Filespec::vmspath($expect2); - } - is( $mm->{INSTALLMAN1DIR}, $expect1 ); - is( $mm->{INSTALLMAN3DIR}, $expect2 ); + + is( $mm->{INSTALLMAN1DIR}, File::Spec->catdir('foo', 'bar') ); + is( $mm->{INSTALLMAN3DIR}, File::Spec->catdir('foo', 'baz') ); SKIP: { skip "VMS must expand macros in INSTALL* vars", 4 if $Is_VMS; @@ -255,14 +246,8 @@ while( my($type, $vars) = each %Install_Vars) { PERL_CORE => $ENV{PERL_CORE}, ); - my $expect1 = File::Spec->catdir('foo', 'bar'); - my $expect2 = File::Spec->catdir('foo', 'baz'); - if ($Is_VMS) { - $expect1 = VMS::Filespec::vmspath($expect1); - $expect2 = VMS::Filespec::vmspath($expect2); - } - is( $mm->{INSTALLMAN1DIR}, $expect1 ); - is( $mm->{INSTALLMAN3DIR}, $expect2 ); + is( $mm->{INSTALLMAN1DIR}, File::Spec->catdir('foo', 'bar') ); + is( $mm->{INSTALLMAN3DIR}, File::Spec->catdir('foo', 'baz') ); SKIP: { skip "VMS must expand macros in INSTALL* vars", 2 if $Is_VMS; is( $mm->{INSTALLSITEMAN1DIR}, '$(INSTALLMAN1DIR)' ); diff --git a/lib/ExtUtils/t/MM_BeOS.t b/lib/ExtUtils/t/MM_BeOS.t index 6587ced..bb9583d 100644 --- a/lib/ExtUtils/t/MM_BeOS.t +++ b/lib/ExtUtils/t/MM_BeOS.t @@ -14,7 +14,7 @@ chdir 't'; use Test::More; BEGIN { - if ($^O =~ /beos/i) { + if ($^O =~ /beos/i or $^O eq 'haiku') { plan tests => 4; } else { plan skip_all => 'This is not BeOS'; diff --git a/lib/ExtUtils/t/basic.t b/lib/ExtUtils/t/basic.t index 97e7d9c..a0dc157 100644 --- a/lib/ExtUtils/t/basic.t +++ b/lib/ExtUtils/t/basic.t @@ -13,31 +13,320 @@ BEGIN { } } -# The test logic is shared between MakeMaker and Install -# because in MakeMaker we test aspects that we are uninterested -# in with Install.pm, however MakeMaker needs to know if it -# accidentally breaks Install. So we have this two stage test file -# thing happening. - -# This version is distinct to MakeMaker and the core. - -use vars qw/$TESTS $TEST_INSTALL_ONLY/; -use Cwd qw(cwd); - -$::TESTS= 55 + 30; -$::TEST_INSTALL_ONLY= 0; - -(my $start=$0)=~s/\.t$/.pl/; -(my $finish=$start)=~s/\.pl$/_finish.pl/; -my $code; -for my $file ($start,$finish) { - open my $fh,$file or die "Failed to read: $file"; - $code .= do { - local $/; - <$fh>; - }; - close $fh; - $code .= "\n;\n"; -} -eval $code or die $@,$code; +use strict; +use Config; +use ExtUtils::MakeMaker; +use Test::More tests => 81; +use MakeMaker::Test::Utils; +use MakeMaker::Test::Setup::BFD; +use File::Find; +use File::Spec; +use File::Path; + +# 'make disttest' sets a bunch of environment variables which interfere +# with our testing. +delete @ENV{qw(PREFIX LIB MAKEFLAGS)}; + +my $perl = which_perl(); +my $Is_VMS = $^O eq 'VMS'; + +# GNV logical interferes with testing +$ENV{'bin'} = '[.bin]' if $Is_VMS; + +chdir 't'; + +perl_lib; + +my $Touch_Time = calibrate_mtime(); + +$| = 1; + +ok( setup_recurs(), 'setup' ); +END { + ok( chdir File::Spec->updir ); + ok( teardown_recurs(), 'teardown' ); +} + +ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy" ) || + diag("chdir failed: $!"); + +my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=../dummy-install"}); +END { rmtree '../dummy-install'; } + +cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || + diag(@mpl_out); + +my $makefile = makefile_name(); +ok( grep(/^Writing $makefile for Big::Dummy/, + @mpl_out) == 1, + 'Makefile.PL output looks right'); + +ok( grep(/^Current package is: main$/, + @mpl_out) == 1, + 'Makefile.PL run in package main'); + +ok( -e $makefile, 'Makefile exists' ); + +# -M is flakey on VMS +my $mtime = (stat($makefile))[9]; +cmp_ok( $Touch_Time, '<=', $mtime, ' its been touched' ); + +END { unlink makefile_name(), makefile_backup() } + +my $make = make_run(); + +{ + # Supress 'make manifest' noise + local $ENV{PERL_MM_MANIFEST_VERBOSE} = 0; + my $manifest_out = run("$make manifest"); + ok( -e 'MANIFEST', 'make manifest created a MANIFEST' ); + ok( -s 'MANIFEST', ' its not empty' ); +} + +END { unlink 'MANIFEST'; } + + +my $ppd_out = run("$make ppd"); +is( $?, 0, ' exited normally' ) || diag $ppd_out; +ok( open(PPD, 'Big-Dummy.ppd'), ' .ppd file generated' ); +my $ppd_html; +{ local $/; $ppd_html = } +close PPD; +like( $ppd_html, qr{^}m, + ' ' ); +like( $ppd_html, qr{^\s*Big-Dummy}m, ' ' ); +like( $ppd_html, qr{^\s*<ABSTRACT>Try "our" hot dog's</ABSTRACT>}m, + ' <ABSTRACT>'); +like( $ppd_html, + qr{^\s*<AUTHOR>Michael G Schwern <schwern\@pobox.com></AUTHOR>}m, + ' <AUTHOR>' ); +like( $ppd_html, qr{^\s*<IMPLEMENTATION>}m, ' <IMPLEMENTATION>'); +like( $ppd_html, qr{^\s*<DEPENDENCY NAME="strict" VERSION="0,0,0,0" />}m, + ' <DEPENDENCY>' ); +like( $ppd_html, qr{^\s*<OS NAME="$Config{osname}" />}m, + ' <OS>' ); +my $archname = $Config{archname}; +$archname .= "-". substr($Config{version},0,3) if $] >= 5.008; +like( $ppd_html, qr{^\s*<ARCHITECTURE NAME="$archname" />}m, + ' <ARCHITECTURE>'); +like( $ppd_html, qr{^\s*<CODEBASE HREF="" />}m, ' <CODEBASE>'); +like( $ppd_html, qr{^\s*</IMPLEMENTATION>}m, ' </IMPLEMENTATION>'); +like( $ppd_html, qr{^\s*</SOFTPKG>}m, ' </SOFTPKG>'); +END { unlink 'Big-Dummy.ppd' } + + +my $test_out = run("$make test"); +like( $test_out, qr/All tests successful/, 'make test' ); +is( $?, 0, ' exited normally' ) || + diag $test_out; + +# Test 'make test TEST_VERBOSE=1' +my $make_test_verbose = make_macro($make, 'test', TEST_VERBOSE => 1); +$test_out = run("$make_test_verbose"); +like( $test_out, qr/ok \d+ - TEST_VERBOSE/, 'TEST_VERBOSE' ); +like( $test_out, qr/All tests successful/, ' successful' ); +is( $?, 0, ' exited normally' ) || + diag $test_out; + + +my $install_out = run("$make install"); +is( $?, 0, 'install' ) || diag $install_out; +like( $install_out, qr/^Installing /m ); + +ok( -r '../dummy-install', ' install dir created' ); +my %files = (); +find( sub { + # do it case-insensitive for non-case preserving OSs + my $file = lc $_; + + # VMS likes to put dots on the end of things that don't have them. + $file =~ s/\.$// if $Is_VMS; + + $files{$file} = $File::Find::name; +}, '../dummy-install' ); +ok( $files{'dummy.pm'}, ' Dummy.pm installed' ); +ok( $files{'liar.pm'}, ' Liar.pm installed' ); +ok( $files{'program'}, ' program installed' ); +ok( $files{'.packlist'}, ' packlist created' ); +ok( $files{'perllocal.pod'},' perllocal.pod created' ); + + +SKIP: { + skip 'VMS install targets do not preserve $(PREFIX)', 9 if $Is_VMS; + + $install_out = run("$make install PREFIX=elsewhere"); + is( $?, 0, 'install with PREFIX override' ) || diag $install_out; + like( $install_out, qr/^Installing /m ); + + ok( -r 'elsewhere', ' install dir created' ); + %files = (); + find( sub { $files{$_} = $File::Find::name; }, 'elsewhere' ); + ok( $files{'Dummy.pm'}, ' Dummy.pm installed' ); + ok( $files{'Liar.pm'}, ' Liar.pm installed' ); + ok( $files{'program'}, ' program installed' ); + ok( $files{'.packlist'}, ' packlist created' ); + ok( $files{'perllocal.pod'},' perllocal.pod created' ); + rmtree('elsewhere'); +} + + +SKIP: { + skip 'VMS install targets do not preserve $(DESTDIR)', 11 if $Is_VMS; + + $install_out = run("$make install PREFIX= DESTDIR=other"); + is( $?, 0, 'install with DESTDIR' ) || + diag $install_out; + like( $install_out, qr/^Installing /m ); + + ok( -d 'other', ' destdir created' ); + %files = (); + my $perllocal; + find( sub { + $files{$_} = $File::Find::name; + }, 'other' ); + ok( $files{'Dummy.pm'}, ' Dummy.pm installed' ); + ok( $files{'Liar.pm'}, ' Liar.pm installed' ); + ok( $files{'program'}, ' program installed' ); + ok( $files{'.packlist'}, ' packlist created' ); + ok( $files{'perllocal.pod'},' perllocal.pod created' ); + + ok( open(PERLLOCAL, $files{'perllocal.pod'} ) ) || + diag("Can't open $files{'perllocal.pod'}: $!"); + { local $/; + unlike(<PERLLOCAL>, qr/other/, 'DESTDIR should not appear in perllocal'); + } + close PERLLOCAL; + +# TODO not available in the min version of Test::Harness we require +# ok( open(PACKLIST, $files{'.packlist'} ) ) || +# diag("Can't open $files{'.packlist'}: $!"); +# { local $/; +# local $TODO = 'DESTDIR still in .packlist'; +# unlike(<PACKLIST>, qr/other/, 'DESTDIR should not appear in .packlist'); +# } +# close PACKLIST; + + rmtree('other'); +} + + +SKIP: { + skip 'VMS install targets do not preserve $(PREFIX)', 10 if $Is_VMS; + + $install_out = run("$make install PREFIX=elsewhere DESTDIR=other/"); + is( $?, 0, 'install with PREFIX override and DESTDIR' ) || + diag $install_out; + like( $install_out, qr/^Installing /m ); + + ok( !-d 'elsewhere', ' install dir not created' ); + ok( -d 'other/elsewhere', ' destdir created' ); + %files = (); + find( sub { $files{$_} = $File::Find::name; }, 'other/elsewhere' ); + ok( $files{'Dummy.pm'}, ' Dummy.pm installed' ); + ok( $files{'Liar.pm'}, ' Liar.pm installed' ); + ok( $files{'program'}, ' program installed' ); + ok( $files{'.packlist'}, ' packlist created' ); + ok( $files{'perllocal.pod'},' perllocal.pod created' ); + rmtree('other'); +} + + +my $dist_test_out = run("$make disttest"); +is( $?, 0, 'disttest' ) || diag($dist_test_out); + +# Test META.yml generation +use ExtUtils::Manifest qw(maniread); + +my $distdir = 'Big-Dummy-0.01'; +$distdir =~ s/\./_/g if $Is_VMS; +my $meta_yml = "$distdir/META.yml"; + +ok( !-f 'META.yml', 'META.yml not written to source dir' ); +ok( -f $meta_yml, 'META.yml written to dist dir' ); +ok( !-e "META_new.yml", 'temp META.yml file not left around' ); + +SKIP: { + # META.yml spec 1.4 was added in 0.11 + skip "Test::YAML::Meta >= 0.11 required", 2 + unless eval { require Test::YAML::Meta } and + Test::YAML::Meta->VERSION >= 0.11; + + Test::YAML::Meta::meta_spec_ok($meta_yml); +} + +ok open META, $meta_yml or diag $!; +my $meta = join '', <META>; +ok close META; + +is $meta, <<"END"; +--- #YAML:1.0 +name: Big-Dummy +version: 0.01 +abstract: Try "our" hot dog's +author: + - Michael G Schwern <schwern\@pobox.com> +license: unknown +distribution_type: module +configure_requires: + ExtUtils::MakeMaker: 0 +build_requires: + ExtUtils::MakeMaker: 0 +requires: + strict: 0 +no_index: + directory: + - t + - inc +generated_by: ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +END + +my $manifest = maniread("$distdir/MANIFEST"); +# VMS is non-case preserving, so we can't know what the MANIFEST will +# look like. :( +_normalize($manifest); +is( $manifest->{'meta.yml'}, 'Module meta-data (added by MakeMaker)' ); + + +# Test NO_META META.yml suppression +unlink $meta_yml; +ok( !-f $meta_yml, 'META.yml deleted' ); +@mpl_out = run(qq{$perl Makefile.PL "NO_META=1"}); +cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diag(@mpl_out); +my $distdir_out = run("$make distdir"); +is( $?, 0, 'distdir' ) || diag($distdir_out); +ok( !-f $meta_yml, 'META.yml generation suppressed by NO_META' ); + + +# Make sure init_dirscan doesn't go into the distdir +@mpl_out = run(qq{$perl Makefile.PL "PREFIX=../dummy-install"}); + +cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diag(@mpl_out); + +ok( grep(/^Writing $makefile for Big::Dummy/, @mpl_out) == 1, + 'init_dirscan skipped distdir') || + diag(@mpl_out); + +# I know we'll get ignored errors from make here, that's ok. +# Send STDERR off to oblivion. +open(SAVERR, ">&STDERR") or die $!; +open(STDERR, ">".File::Spec->devnull) or die $!; + +my $realclean_out = run("$make realclean"); +is( $?, 0, 'realclean' ) || diag($realclean_out); + +open(STDERR, ">&SAVERR") or die $!; +close SAVERR; + + +sub _normalize { + my $hash = shift; + + while(my($k,$v) = each %$hash) { + delete $hash->{$k}; + $hash->{lc $k} = $v; + } +} diff --git a/lib/ExtUtils/t/metafile_data.t b/lib/ExtUtils/t/metafile_data.t index 9d63560..c1b1679 100644 --- a/lib/ExtUtils/t/metafile_data.t +++ b/lib/ExtUtils/t/metafile_data.t @@ -39,6 +39,9 @@ my $new_mm = sub { configure_requires => { 'ExtUtils::MakeMaker' => 0, }, + build_requires => { + 'ExtUtils::MakeMaker' => 0, + }, no_index => { directory => [qw(t inc)], @@ -63,6 +66,9 @@ my $new_mm = sub { configure_requires => { 'ExtUtils::MakeMaker' => 0, }, + build_requires => { + 'ExtUtils::MakeMaker' => 0, + }, no_index => { directory => [qw(t inc foo)], @@ -113,6 +119,10 @@ my $new_mm = sub { configure_requires => { Stuff => 2.34, }, + build_requires => { + 'ExtUtils::MakeMaker' => 0, + }, + requires => { Foo => 2.34, Bar => 4.56, @@ -157,6 +167,9 @@ my $new_mm = sub { configure_requires => { 'ExtUtils::MakeMaker' => 0, }, + build_requires => { + 'ExtUtils::MakeMaker' => 0, + }, requires => { perl => '5.006', @@ -200,6 +213,9 @@ my $new_mm = sub { configure_requires => { 'ExtUtils::MakeMaker' => 0, }, + build_requires => { + 'ExtUtils::MakeMaker' => 0, + }, requires => { perl => '5.006', diff --git a/lib/ExtUtils/testlib.pm b/lib/ExtUtils/testlib.pm index 9437b53..44a8e9a 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.48; +our $VERSION = 6.49_01; use Cwd; use File::Spec;