Change 34541 by [EMAIL PROTECTED] on 2008/10/20 20:29:13
Upgrade to ExtUtils-MakeMaker-6.48
Affected files ...
... //depot/perl/lib/ExtUtils/Changes#44 edit
... //depot/perl/lib/ExtUtils/Command/MM.pm#23 edit
... //depot/perl/lib/ExtUtils/Liblist.pm#51 edit
... //depot/perl/lib/ExtUtils/Liblist/Kid.pm#29 edit
... //depot/perl/lib/ExtUtils/MM.pm#20 edit
... //depot/perl/lib/ExtUtils/MM_AIX.pm#16 edit
... //depot/perl/lib/ExtUtils/MM_Any.pm#40 edit
... //depot/perl/lib/ExtUtils/MM_BeOS.pm#22 edit
... //depot/perl/lib/ExtUtils/MM_Cygwin.pm#33 edit
... //depot/perl/lib/ExtUtils/MM_DOS.pm#17 edit
... //depot/perl/lib/ExtUtils/MM_Darwin.pm#2 edit
... //depot/perl/lib/ExtUtils/MM_MacOS.pm#29 edit
... //depot/perl/lib/ExtUtils/MM_NW5.pm#49 edit
... //depot/perl/lib/ExtUtils/MM_OS2.pm#36 edit
... //depot/perl/lib/ExtUtils/MM_QNX.pm#14 edit
... //depot/perl/lib/ExtUtils/MM_UWIN.pm#16 edit
... //depot/perl/lib/ExtUtils/MM_Unix.pm#244 edit
... //depot/perl/lib/ExtUtils/MM_VMS.pm#96 edit
... //depot/perl/lib/ExtUtils/MM_VOS.pm#14 edit
... //depot/perl/lib/ExtUtils/MM_Win32.pm#77 edit
... //depot/perl/lib/ExtUtils/MM_Win95.pm#32 edit
... //depot/perl/lib/ExtUtils/MY.pm#14 edit
... //depot/perl/lib/ExtUtils/MakeMaker.pm#146 edit
... //depot/perl/lib/ExtUtils/MakeMaker/Config.pm#14 edit
... //depot/perl/lib/ExtUtils/MakeMaker/bytes.pm#15 edit
... //depot/perl/lib/ExtUtils/MakeMaker/vmsish.pm#15 edit
... //depot/perl/lib/ExtUtils/Mkbootstrap.pm#24 edit
... //depot/perl/lib/ExtUtils/Mksymlists.pm#47 edit
... //depot/perl/lib/ExtUtils/TODO#8 edit
... //depot/perl/lib/ExtUtils/testlib.pm#24 edit
... //depot/perl/t/lib/MakeMaker/Test/Utils.pm#13 edit
Differences ...
==== //depot/perl/lib/ExtUtils/Changes#44 (text) ====
Index: perl/lib/ExtUtils/Changes
--- perl/lib/ExtUtils/Changes#43~34440~ 2008-09-29 02:14:25.000000000 -0700
+++ perl/lib/ExtUtils/Changes 2008-10-20 13:29:13.000000000 -0700
@@ -1,3 +1,34 @@
+6.48 Mon Oct 20 11:18:13 PDT 2008
+ Test Fixes
+ * Protect against stray environment variables effecting the tests.
+ [rt.cpan.org 14930]
+
+
+6.47_02 Thu Oct 16 16:14:20 PDT 2008
+ Test Fixes
+ * MIN_PERL_VERSION test had some goofs on VMS. [thanks Craig Berry]
+
+
+6.47_01 Tue Oct 14 12:38:05 EDT 2008
+ New Features
+ * Added optional parameter MIN_PERL_VERSION, to define minimal
+ required perl version for dependency checks and to pass on to
+ META.yml and ppd files. [rt.cpan.org 28374]
+ Thanks to David Golden, Alexandr Ciornii (chorny) and Martin Becker
+
+ Bug Fixes
+ * Guard against a path to Perl with a space in it.
+ From Max Maischein. [EMAIL PROTECTED]
+
+ Test Fixes
+ - Small fix for VOS from Paul Green [EMAIL PROTECTED]
+
+ Other
+ * $ExtUtils::MakeMaker::Revision, $ExtUtils::MM_Unix::Revision and
+ $ExtUtils::MM_VMS::Revision are all now based on $VERSION. You
+ shouldn't be using them for anything anyway.
+
+
6.46 Sat Sep 27 17:34:03 EDT 2008
Bug Fixes
- Fix META_MERGE for more than one level of hashes. [rt.cpan.org 39348]
@@ -9,7 +40,7 @@
1.50 and ExtUtils::Manifest to 1.54
Test Fixes
- - t/writemakefile_args.t had the wrong skip amoung causing failures
+ - t/writemakefile_args.t had the wrong skip amount causing failures
when run without version.pm (mostly 5.6 users)
==== //depot/perl/lib/ExtUtils/Command/MM.pm#23 (text) ====
Index: perl/lib/ExtUtils/Command/MM.pm
--- perl/lib/ExtUtils/Command/MM.pm#22~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/Command/MM.pm 2008-10-20 13:29:13.000000000 -0700
@@ -10,7 +10,7 @@
our @EXPORT = qw(test_harness pod2man perllocal_install uninstall
warn_if_old_packlist);
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
my $Is_VMS = $^O eq 'VMS';
==== //depot/perl/lib/ExtUtils/Liblist.pm#51 (text) ====
Index: perl/lib/ExtUtils/Liblist.pm
--- perl/lib/ExtUtils/Liblist.pm#50~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/Liblist.pm 2008-10-20 13:29:13.000000000 -0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
use File::Spec;
require ExtUtils::Liblist::Kid;
==== //depot/perl/lib/ExtUtils/Liblist/Kid.pm#29 (text) ====
Index: perl/lib/ExtUtils/Liblist/Kid.pm
--- perl/lib/ExtUtils/Liblist/Kid.pm#28~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/Liblist/Kid.pm 2008-10-20 13:29:13.000000000 -0700
@@ -9,7 +9,7 @@
# Broken out of MakeMaker from version 4.11
use strict;
-our $VERSION = 6.47_02;
+our $VERSION = 6.48;
use Config;
use Cwd 'cwd';
==== //depot/perl/lib/ExtUtils/MM.pm#20 (text) ====
Index: perl/lib/ExtUtils/MM.pm
--- perl/lib/ExtUtils/MM.pm#19~34498~ 2008-10-17 01:46:28.000000000 -0700
+++ perl/lib/ExtUtils/MM.pm 2008-10-20 13:29:13.000000000 -0700
@@ -3,7 +3,7 @@
use strict;
use ExtUtils::MakeMaker::Config;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
require ExtUtils::Liblist;
require ExtUtils::MakeMaker;
==== //depot/perl/lib/ExtUtils/MM_AIX.pm#16 (text) ====
Index: perl/lib/ExtUtils/MM_AIX.pm
--- perl/lib/ExtUtils/MM_AIX.pm#15~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_AIX.pm 2008-10-20 13:29:13.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_AIX;
use strict;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
require ExtUtils::MM_Unix;
our @ISA = qw(ExtUtils::MM_Unix);
==== //depot/perl/lib/ExtUtils/MM_Any.pm#40 (text) ====
Index: perl/lib/ExtUtils/MM_Any.pm
--- perl/lib/ExtUtils/MM_Any.pm#39~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Any.pm 2008-10-20 13:29:13.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_Any;
use strict;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
use Carp;
use File::Spec;
==== //depot/perl/lib/ExtUtils/MM_BeOS.pm#22 (text) ====
Index: perl/lib/ExtUtils/MM_BeOS.pm
--- perl/lib/ExtUtils/MM_BeOS.pm#21~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_BeOS.pm 2008-10-20 13:29:13.000000000 -0700
@@ -26,7 +26,7 @@
require ExtUtils::MM_Unix;
our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
=item os_flavor
==== //depot/perl/lib/ExtUtils/MM_Cygwin.pm#33 (text) ====
Index: perl/lib/ExtUtils/MM_Cygwin.pm
--- perl/lib/ExtUtils/MM_Cygwin.pm#32~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Cygwin.pm 2008-10-20 13:29:13.000000000 -0700
@@ -9,7 +9,7 @@
require ExtUtils::MM_Unix;
our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
=head1 NAME
==== //depot/perl/lib/ExtUtils/MM_DOS.pm#17 (text) ====
Index: perl/lib/ExtUtils/MM_DOS.pm
--- perl/lib/ExtUtils/MM_DOS.pm#16~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_DOS.pm 2008-10-20 13:29:13.000000000 -0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = 6.47_02;
+our $VERSION = 6.48;
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
==== //depot/perl/lib/ExtUtils/MM_Darwin.pm#2 (text) ====
Index: perl/lib/ExtUtils/MM_Darwin.pm
--- perl/lib/ExtUtils/MM_Darwin.pm#1~33251~ 2008-02-08 05:09:27.000000000
-0800
+++ perl/lib/ExtUtils/MM_Darwin.pm 2008-10-20 13:29:13.000000000 -0700
@@ -7,6 +7,8 @@
our @ISA = qw( ExtUtils::MM_Unix );
}
+our $VERSION = '6.48';
+
=head1 NAME
==== //depot/perl/lib/ExtUtils/MM_MacOS.pm#29 (text) ====
Index: perl/lib/ExtUtils/MM_MacOS.pm
--- perl/lib/ExtUtils/MM_MacOS.pm#28~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_MacOS.pm 2008-10-20 13:29:13.000000000 -0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = 6.47_02;
+our $VERSION = 6.48;
sub new {
die <<'UNSUPPORTED';
==== //depot/perl/lib/ExtUtils/MM_NW5.pm#49 (text) ====
Index: perl/lib/ExtUtils/MM_NW5.pm
--- perl/lib/ExtUtils/MM_NW5.pm#48~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_NW5.pm 2008-10-20 13:29:13.000000000 -0700
@@ -22,7 +22,7 @@
use ExtUtils::MakeMaker::Config;
use File::Basename;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
require ExtUtils::MM_Win32;
our @ISA = qw(ExtUtils::MM_Win32);
==== //depot/perl/lib/ExtUtils/MM_OS2.pm#36 (text) ====
Index: perl/lib/ExtUtils/MM_OS2.pm
--- perl/lib/ExtUtils/MM_OS2.pm#35~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_OS2.pm 2008-10-20 13:29:13.000000000 -0700
@@ -5,7 +5,7 @@
use ExtUtils::MakeMaker qw(neatvalue);
use File::Spec;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
==== //depot/perl/lib/ExtUtils/MM_QNX.pm#14 (text) ====
Index: perl/lib/ExtUtils/MM_QNX.pm
--- perl/lib/ExtUtils/MM_QNX.pm#13~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_QNX.pm 2008-10-20 13:29:13.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_QNX;
use strict;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
require ExtUtils::MM_Unix;
our @ISA = qw(ExtUtils::MM_Unix);
==== //depot/perl/lib/ExtUtils/MM_UWIN.pm#16 (text) ====
Index: perl/lib/ExtUtils/MM_UWIN.pm
--- perl/lib/ExtUtils/MM_UWIN.pm#15~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_UWIN.pm 2008-10-20 13:29:13.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_UWIN;
use strict;
-our $VERSION = 6.47_02;
+our $VERSION = 6.48;
require ExtUtils::MM_Unix;
our @ISA = qw(ExtUtils::MM_Unix);
==== //depot/perl/lib/ExtUtils/MM_Unix.pm#244 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm#243~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Unix.pm 2008-10-20 13:29:13.000000000 -0700
@@ -15,7 +15,7 @@
# If we make $VERSION an our variable parse_version() breaks
use vars qw($VERSION);
-$VERSION = '6.47_02';
+$VERSION = '6.48';
require ExtUtils::MM_Any;
our @ISA = qw(ExtUtils::MM_Any);
==== //depot/perl/lib/ExtUtils/MM_VMS.pm#96 (text) ====
Index: perl/lib/ExtUtils/MM_VMS.pm
--- perl/lib/ExtUtils/MM_VMS.pm#95~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_VMS.pm 2008-10-20 13:29:13.000000000 -0700
@@ -15,7 +15,7 @@
use File::Basename;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
==== //depot/perl/lib/ExtUtils/MM_VOS.pm#14 (text) ====
Index: perl/lib/ExtUtils/MM_VOS.pm
--- perl/lib/ExtUtils/MM_VOS.pm#13~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_VOS.pm 2008-10-20 13:29:13.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_VOS;
use strict;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
require ExtUtils::MM_Unix;
our @ISA = qw(ExtUtils::MM_Unix);
==== //depot/perl/lib/ExtUtils/MM_Win32.pm#77 (text) ====
Index: perl/lib/ExtUtils/MM_Win32.pm
--- perl/lib/ExtUtils/MM_Win32.pm#76~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Win32.pm 2008-10-20 13:29:13.000000000 -0700
@@ -27,7 +27,7 @@
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
$ENV{EMXSHELL} = 'sh'; # to run `commands`
==== //depot/perl/lib/ExtUtils/MM_Win95.pm#32 (text) ====
Index: perl/lib/ExtUtils/MM_Win95.pm
--- perl/lib/ExtUtils/MM_Win95.pm#31~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Win95.pm 2008-10-20 13:29:13.000000000 -0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
require ExtUtils::MM_Win32;
our @ISA = qw(ExtUtils::MM_Win32);
==== //depot/perl/lib/ExtUtils/MY.pm#14 (text) ====
Index: perl/lib/ExtUtils/MY.pm
--- perl/lib/ExtUtils/MY.pm#13~34498~ 2008-10-17 01:46:28.000000000 -0700
+++ perl/lib/ExtUtils/MY.pm 2008-10-20 13:29:13.000000000 -0700
@@ -3,7 +3,7 @@
use strict;
require ExtUtils::MM;
-our $VERSION = 6.47_02;
+our $VERSION = 6.48;
our @ISA = qw(ExtUtils::MM);
{
==== //depot/perl/lib/ExtUtils/MakeMaker.pm#146 (text) ====
Index: perl/lib/ExtUtils/MakeMaker.pm
--- perl/lib/ExtUtils/MakeMaker.pm#145~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/MakeMaker.pm 2008-10-20 13:29:13.000000000 -0700
@@ -18,7 +18,7 @@
my @Prepend_parent;
my %Recognized_Att_Keys;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
# Emulate something resembling CVS $Revision$
(our $Revision = $VERSION) =~ s{_}{};
==== //depot/perl/lib/ExtUtils/MakeMaker/Config.pm#14 (text) ====
Index: perl/lib/ExtUtils/MakeMaker/Config.pm
--- perl/lib/ExtUtils/MakeMaker/Config.pm#13~34498~ 2008-10-17
01:46:28.000000000 -0700
+++ perl/lib/ExtUtils/MakeMaker/Config.pm 2008-10-20 13:29:13.000000000
-0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
use Config ();
==== //depot/perl/lib/ExtUtils/MakeMaker/bytes.pm#15 (text) ====
Index: perl/lib/ExtUtils/MakeMaker/bytes.pm
--- perl/lib/ExtUtils/MakeMaker/bytes.pm#14~34498~ 2008-10-17
01:46:28.000000000 -0700
+++ perl/lib/ExtUtils/MakeMaker/bytes.pm 2008-10-20 13:29:13.000000000
-0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = 6.47_02;
+our $VERSION = 6.48;
my $Have_Bytes = eval { require bytes; 1; };
==== //depot/perl/lib/ExtUtils/MakeMaker/vmsish.pm#15 (text) ====
Index: perl/lib/ExtUtils/MakeMaker/vmsish.pm
--- perl/lib/ExtUtils/MakeMaker/vmsish.pm#14~34498~ 2008-10-17
01:46:28.000000000 -0700
+++ perl/lib/ExtUtils/MakeMaker/vmsish.pm 2008-10-20 13:29:13.000000000
-0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = 6.47_02;
+our $VERSION = 6.48;
my $IsVMS = $^O eq 'VMS';
==== //depot/perl/lib/ExtUtils/Mkbootstrap.pm#24 (text) ====
Index: perl/lib/ExtUtils/Mkbootstrap.pm
--- perl/lib/ExtUtils/Mkbootstrap.pm#23~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/Mkbootstrap.pm 2008-10-20 13:29:13.000000000 -0700
@@ -3,7 +3,7 @@
# There's just too much Dynaloader incest here to turn on strict vars.
use strict 'refs';
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
require Exporter;
our @ISA = ('Exporter');
==== //depot/perl/lib/ExtUtils/Mksymlists.pm#47 (text) ====
Index: perl/lib/ExtUtils/Mksymlists.pm
--- perl/lib/ExtUtils/Mksymlists.pm#46~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/Mksymlists.pm 2008-10-20 13:29:13.000000000 -0700
@@ -10,7 +10,7 @@
our @ISA = qw(Exporter);
our @EXPORT = qw(&Mksymlists);
-our $VERSION = '6.47_02';
+our $VERSION = '6.48';
sub Mksymlists {
my(%spec) = @_;
==== //depot/perl/lib/ExtUtils/TODO#8 (text) ====
Index: perl/lib/ExtUtils/TODO
--- perl/lib/ExtUtils/TODO#7~28984~ 2006-10-10 07:33:53.000000000 -0700
+++ perl/lib/ExtUtils/TODO 2008-10-20 13:29:13.000000000 -0700
@@ -73,3 +73,6 @@
http://archive.develooper.com/[EMAIL PROTECTED]/msg01075.html
Make maniadd() return a tied, case-insensitive hash on VMS.
+
+
+TER
\ No newline at end of file
==== //depot/perl/lib/ExtUtils/testlib.pm#24 (text) ====
Index: perl/lib/ExtUtils/testlib.pm
--- perl/lib/ExtUtils/testlib.pm#23~34498~ 2008-10-17 01:46:28.000000000
-0700
+++ perl/lib/ExtUtils/testlib.pm 2008-10-20 13:29:13.000000000 -0700
@@ -3,7 +3,7 @@
use strict;
use warnings;
-our $VERSION = 6.47_02;
+our $VERSION = 6.48;
use Cwd;
use File::Spec;
==== //depot/perl/t/lib/MakeMaker/Test/Utils.pm#13 (text) ====
Index: perl/t/lib/MakeMaker/Test/Utils.pm
--- perl/t/lib/MakeMaker/Test/Utils.pm#12~34498~ 2008-10-17
01:46:28.000000000 -0700
+++ perl/t/lib/MakeMaker/Test/Utils.pm 2008-10-20 13:29:13.000000000 -0700
@@ -20,6 +20,41 @@
);
+# Setup the code to clean out %ENV
+{
+ # Environment variables which might effect our testing
+ my @delete_env_keys = qw(
+ PERL_MM_OPT
+ PERL_MM_USE_DEFAULT
+ HARNESS_TIMER
+ HARNESS_OPTIONS
+ HARNESS_VERBOSE
+ );
+
+ # Remember the ENV values because on VMS %ENV is global
+ # to the user, not the process.
+ my %restore_env_keys;
+
+ sub clean_env {
+ for my $key (@delete_env_keys) {
+ if( exists $ENV{$key} ) {
+ $restore_env_keys{$key} = delete $ENV{$key};
+ }
+ else {
+ delete $ENV{$key};
+ }
+ }
+ }
+
+ END {
+ while( my($key, $val) = each %restore_env_keys ) {
+ $ENV{$key} = $val;
+ }
+ }
+}
+clean_env();
+
+
=head1 NAME
MakeMaker::Test::Utils - Utility routines for testing MakeMaker
End of Patch.