From d00e3d8a4128dcffa1eb58ae423543a07d0589f8 Mon Sep 17 00:00:00 2001 From: David Mitchell Date: Fri, 10 Jul 2009 15:16:14 +0100 Subject: [PATCH] ExtUtils::MakeMaker 6.54 --- MANIFEST | 1 + Porting/Maintainers.pl | 2 +- lib/ExtUtils/Changes | 6 ++++++ 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 | 2 +- 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 | 2 +- lib/ExtUtils/MakeMaker/Config.pm | 2 +- lib/ExtUtils/Mkbootstrap.pm | 2 +- lib/ExtUtils/Mksymlists.pm | 2 +- lib/ExtUtils/t/fix_libs.t | 10 +++++++++- lib/ExtUtils/t/installed_file.t | 10 +++++++++- lib/ExtUtils/t/is_of_type.t | 9 +++++++++ lib/ExtUtils/t/test_boilerplate.t | 26 ++++++++++++++++++++++++++ lib/ExtUtils/testlib.pm | 2 +- 33 files changed, 87 insertions(+), 29 deletions(-) create mode 100644 lib/ExtUtils/t/test_boilerplate.t diff --git a/MANIFEST b/MANIFEST index f115e84..85cbd13 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2230,6 +2230,7 @@ lib/ExtUtils/t/Constant.t See if ExtUtils::Constant works lib/ExtUtils/t/cp.t See if ExtUtils::Command works lib/ExtUtils/t/dir_target.t Verify if dir_target() is supported lib/ExtUtils/t/Embed.t See if ExtUtils::Embed and embedding works +lib/ExtUtils/t/test_boilerplate.t MakeMaker test lib/ExtUtils/testlib.pm Fixes up @INC to use just-built extension lib/ExtUtils/t/eu_command.t See if ExtUtils::Command works lib/ExtUtils/t/FIRST_MAKEFILE.t See if FIRST_MAKEFILE works diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 697aa4f..4a90b40 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -694,7 +694,7 @@ package Maintainers; 'ExtUtils::MakeMaker' => { 'MAINTAINER' => 'mschwern', - 'DISTRIBUTION' => 'MSCHWERN/ExtUtils-MakeMaker-6.53_03.tar.gz', + 'DISTRIBUTION' => 'MSCHWERN/ExtUtils-MakeMaker-6.54.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 88c431e..bacd445 100644 --- a/lib/ExtUtils/Changes +++ b/lib/ExtUtils/Changes @@ -1,3 +1,9 @@ +6.54 Tue Jul 7 16:48:22 PDT 2009 + Test Fixes + * Added perl core boilerplate code to a few new tests which were missing + them. + + 6.53_03 Thu Jul 2 14:47:45 PDT 2009 Bug Fixes * You'd get a warning if you had a PREREQ_PM on a module with no $VERSION diff --git a/lib/ExtUtils/Command/MM.pm b/lib/ExtUtils/Command/MM.pm index e13baa9..8748d79 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.53_03'; +our $VERSION = '6.54'; my $Is_VMS = $^O eq 'VMS'; diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm index 94fb8ef..ae33db5 100644 --- a/lib/ExtUtils/Liblist.pm +++ b/lib/ExtUtils/Liblist.pm @@ -2,7 +2,7 @@ package ExtUtils::Liblist; use strict; -our $VERSION = '6.53_03'; +our $VERSION = '6.54'; use File::Spec; require ExtUtils::Liblist::Kid; diff --git a/lib/ExtUtils/Liblist/Kid.pm b/lib/ExtUtils/Liblist/Kid.pm index adb8a48..730b4d0 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.53_03; +our $VERSION = 6.54; use Config; use Cwd 'cwd'; diff --git a/lib/ExtUtils/MM.pm b/lib/ExtUtils/MM.pm index 39e3b4d..d3ff875 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.53_03'; +our $VERSION = '6.54'; require ExtUtils::Liblist; require ExtUtils::MakeMaker; diff --git a/lib/ExtUtils/MM_AIX.pm b/lib/ExtUtils/MM_AIX.pm index e0dc539..dcfb171 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.53_03'; +our $VERSION = '6.54'; 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 9a971b4..ce723b5 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.53_03'; +our $VERSION = '6.54'; use Carp; use File::Spec; diff --git a/lib/ExtUtils/MM_BeOS.pm b/lib/ExtUtils/MM_BeOS.pm index 1629333..3c8978a 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.53_03'; +our $VERSION = '6.54'; =item os_flavor diff --git a/lib/ExtUtils/MM_Cygwin.pm b/lib/ExtUtils/MM_Cygwin.pm index e57d004..79894e2 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.53_03'; +our $VERSION = '6.54'; =head1 NAME diff --git a/lib/ExtUtils/MM_DOS.pm b/lib/ExtUtils/MM_DOS.pm index af80bde..fd7f28e 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.53_03; +our $VERSION = 6.54; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_Darwin.pm b/lib/ExtUtils/MM_Darwin.pm index b3a90a0..39d469e 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.53_03'; +our $VERSION = '6.54'; =head1 NAME diff --git a/lib/ExtUtils/MM_MacOS.pm b/lib/ExtUtils/MM_MacOS.pm index 3e42998..54b656e 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.53_03; +our $VERSION = 6.54; sub new { die <<'UNSUPPORTED'; diff --git a/lib/ExtUtils/MM_NW5.pm b/lib/ExtUtils/MM_NW5.pm index 6efd4a4..536959a 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.53_03'; +our $VERSION = '6.54'; 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 6b780a7..183c8b4 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.53_03'; +our $VERSION = '6.54'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_QNX.pm b/lib/ExtUtils/MM_QNX.pm index bd97c3a..190e3ca 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.53_03'; +our $VERSION = '6.54'; 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 ea59ef5..f5c2f50 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.53_03; +our $VERSION = 6.54; 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 59a612a..81dc41b 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.53_03'; +$VERSION = '6.54'; 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 f524b2b..96b8a97 100644 --- a/lib/ExtUtils/MM_VMS.pm +++ b/lib/ExtUtils/MM_VMS.pm @@ -15,7 +15,7 @@ BEGIN { use File::Basename; -our $VERSION = '6.53_03'; +our $VERSION = '6.54'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_VOS.pm b/lib/ExtUtils/MM_VOS.pm index af703eb..b09b954 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.53_03'; +our $VERSION = '6.54'; 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 5e5aaf2..bd5f15b 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.53_03'; +our $VERSION = '6.54'; $ENV{EMXSHELL} = 'sh'; # to run `commands` diff --git a/lib/ExtUtils/MM_Win95.pm b/lib/ExtUtils/MM_Win95.pm index 52bfca4..fc1be24 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.53_03'; +our $VERSION = '6.54'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); diff --git a/lib/ExtUtils/MY.pm b/lib/ExtUtils/MY.pm index 5d14b3e..e38e404 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.53_03; +our $VERSION = 6.54; our @ISA = qw(ExtUtils::MM); { diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm index 2d140be..9b021e1 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.53_03'; +our $VERSION = '6.54'; # Emulate something resembling CVS $Revision$ (our $Revision = $VERSION) =~ s{_}{}; diff --git a/lib/ExtUtils/MakeMaker/Config.pm b/lib/ExtUtils/MakeMaker/Config.pm index fc028ba..5b58ab3 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.53_03'; +our $VERSION = '6.54'; use Config (); diff --git a/lib/ExtUtils/Mkbootstrap.pm b/lib/ExtUtils/Mkbootstrap.pm index 5684934..37e2404 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.53_03'; +our $VERSION = '6.54'; require Exporter; our @ISA = ('Exporter'); diff --git a/lib/ExtUtils/Mksymlists.pm b/lib/ExtUtils/Mksymlists.pm index f9d517c..ce57289 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.53_03'; +our $VERSION = '6.54'; sub Mksymlists { my(%spec) = @_; diff --git a/lib/ExtUtils/t/fix_libs.t b/lib/ExtUtils/t/fix_libs.t index c683fc5..2a9bf0c 100644 --- a/lib/ExtUtils/t/fix_libs.t +++ b/lib/ExtUtils/t/fix_libs.t @@ -2,8 +2,16 @@ # Unit test the code which fixes up $self->{LIBS} +BEGIN { + chdir 't' if -d 't'; + + if( $ENV{PERL_CORE} ) { + @INC = '../lib'; + } +} + use strict; -use lib 't/lib'; +use lib './lib'; use Test::More 'no_plan'; use ExtUtils::MakeMaker; diff --git a/lib/ExtUtils/t/installed_file.t b/lib/ExtUtils/t/installed_file.t index ebb6585..c2dfce7 100644 --- a/lib/ExtUtils/t/installed_file.t +++ b/lib/ExtUtils/t/installed_file.t @@ -2,10 +2,18 @@ # Test MM->_installed_file_for_module() +BEGIN { + chdir 't' if -d 't'; + + if( $ENV{PERL_CORE} ) { + @INC = '../lib'; + } +} + use strict; use warnings; -use lib 't/lib'; +use lib './lib'; use ExtUtils::MakeMaker; use Test::More; use File::Spec; diff --git a/lib/ExtUtils/t/is_of_type.t b/lib/ExtUtils/t/is_of_type.t index d123ee3..8a95d0d 100644 --- a/lib/ExtUtils/t/is_of_type.t +++ b/lib/ExtUtils/t/is_of_type.t @@ -2,6 +2,15 @@ # Test _is_of_type() +BEGIN { + chdir 't' if -d 't'; + + if( $ENV{PERL_CORE} ) { + @INC = '../lib'; + } +} + +use lib './lib'; use strict; use ExtUtils::MakeMaker; diff --git a/lib/ExtUtils/t/test_boilerplate.t b/lib/ExtUtils/t/test_boilerplate.t new file mode 100644 index 0000000..899ad57 --- /dev/null +++ b/lib/ExtUtils/t/test_boilerplate.t @@ -0,0 +1,26 @@ +#!/usr/bin/perl -w + +# <<>> +# Copy this when writing new tests to avoid forgetting the core boilerplate + +# Magic for core +BEGIN { + # Always run in t to unify behavor with core + chdir 't' if -d 't'; + + # Only use the about to be installed modules + if( $ENV{PERL_CORE} ) { + @INC = '../lib'; + } +} + +# Use things from t/lib/ +use lib './lib'; +use strict; +use ExtUtils::MakeMaker; + +use Test::More; + +pass("Your test code goes here"); + +done_testing(); diff --git a/lib/ExtUtils/testlib.pm b/lib/ExtUtils/testlib.pm index ab0ab897..0af41d2 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.53_03; +our $VERSION = 6.54; use Cwd; use File::Spec; -- 1.8.3.1