Change 34498 by [EMAIL PROTECTED] on 2008/10/17 08:46:28
Upgrade to ExtUtils-MakeMaker-6.47_02
Affected files ...
... //depot/perl/lib/ExtUtils/Command/MM.pm#22 edit
... //depot/perl/lib/ExtUtils/Liblist.pm#50 edit
... //depot/perl/lib/ExtUtils/Liblist/Kid.pm#28 edit
... //depot/perl/lib/ExtUtils/MM.pm#19 edit
... //depot/perl/lib/ExtUtils/MM_AIX.pm#15 edit
... //depot/perl/lib/ExtUtils/MM_Any.pm#39 edit
... //depot/perl/lib/ExtUtils/MM_BeOS.pm#21 edit
... //depot/perl/lib/ExtUtils/MM_Cygwin.pm#32 edit
... //depot/perl/lib/ExtUtils/MM_DOS.pm#16 edit
... //depot/perl/lib/ExtUtils/MM_MacOS.pm#28 edit
... //depot/perl/lib/ExtUtils/MM_NW5.pm#48 edit
... //depot/perl/lib/ExtUtils/MM_OS2.pm#35 edit
... //depot/perl/lib/ExtUtils/MM_QNX.pm#13 edit
... //depot/perl/lib/ExtUtils/MM_UWIN.pm#15 edit
... //depot/perl/lib/ExtUtils/MM_Unix.pm#243 edit
... //depot/perl/lib/ExtUtils/MM_VMS.pm#95 edit
... //depot/perl/lib/ExtUtils/MM_VOS.pm#13 edit
... //depot/perl/lib/ExtUtils/MM_Win32.pm#76 edit
... //depot/perl/lib/ExtUtils/MM_Win95.pm#31 edit
... //depot/perl/lib/ExtUtils/MY.pm#13 edit
... //depot/perl/lib/ExtUtils/MakeMaker.pm#145 edit
... //depot/perl/lib/ExtUtils/MakeMaker/Config.pm#13 edit
... //depot/perl/lib/ExtUtils/MakeMaker/bytes.pm#14 edit
... //depot/perl/lib/ExtUtils/MakeMaker/vmsish.pm#14 edit
... //depot/perl/lib/ExtUtils/Mkbootstrap.pm#23 edit
... //depot/perl/lib/ExtUtils/Mksymlists.pm#46 edit
... //depot/perl/lib/ExtUtils/t/min_perl_version.t#2 edit
... //depot/perl/lib/ExtUtils/testlib.pm#23 edit
... //depot/perl/t/lib/MakeMaker/Test/Utils.pm#12 edit
Differences ...
==== //depot/perl/lib/ExtUtils/Command/MM.pm#22 (text) ====
Index: perl/lib/ExtUtils/Command/MM.pm
--- perl/lib/ExtUtils/Command/MM.pm#21~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/Command/MM.pm 2008-10-17 01:46:28.000000000 -0700
@@ -10,7 +10,7 @@
our @EXPORT = qw(test_harness pod2man perllocal_install uninstall
warn_if_old_packlist);
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
my $Is_VMS = $^O eq 'VMS';
==== //depot/perl/lib/ExtUtils/Liblist.pm#50 (text) ====
Index: perl/lib/ExtUtils/Liblist.pm
--- perl/lib/ExtUtils/Liblist.pm#49~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/Liblist.pm 2008-10-17 01:46:28.000000000 -0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
use File::Spec;
require ExtUtils::Liblist::Kid;
==== //depot/perl/lib/ExtUtils/Liblist/Kid.pm#28 (text) ====
Index: perl/lib/ExtUtils/Liblist/Kid.pm
--- perl/lib/ExtUtils/Liblist/Kid.pm#27~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/Liblist/Kid.pm 2008-10-17 01:46:28.000000000 -0700
@@ -9,7 +9,7 @@
# Broken out of MakeMaker from version 4.11
use strict;
-our $VERSION = 6.47_01;
+our $VERSION = 6.47_02;
use Config;
use Cwd 'cwd';
==== //depot/perl/lib/ExtUtils/MM.pm#19 (text) ====
Index: perl/lib/ExtUtils/MM.pm
--- perl/lib/ExtUtils/MM.pm#18~34482~ 2008-10-15 04:27:28.000000000 -0700
+++ perl/lib/ExtUtils/MM.pm 2008-10-17 01:46:28.000000000 -0700
@@ -3,7 +3,7 @@
use strict;
use ExtUtils::MakeMaker::Config;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
require ExtUtils::Liblist;
require ExtUtils::MakeMaker;
==== //depot/perl/lib/ExtUtils/MM_AIX.pm#15 (text) ====
Index: perl/lib/ExtUtils/MM_AIX.pm
--- perl/lib/ExtUtils/MM_AIX.pm#14~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_AIX.pm 2008-10-17 01:46:28.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_AIX;
use strict;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
require ExtUtils::MM_Unix;
our @ISA = qw(ExtUtils::MM_Unix);
==== //depot/perl/lib/ExtUtils/MM_Any.pm#39 (text) ====
Index: perl/lib/ExtUtils/MM_Any.pm
--- perl/lib/ExtUtils/MM_Any.pm#38~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Any.pm 2008-10-17 01:46:28.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_Any;
use strict;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
use Carp;
use File::Spec;
==== //depot/perl/lib/ExtUtils/MM_BeOS.pm#21 (text) ====
Index: perl/lib/ExtUtils/MM_BeOS.pm
--- perl/lib/ExtUtils/MM_BeOS.pm#20~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_BeOS.pm 2008-10-17 01:46:28.000000000 -0700
@@ -26,7 +26,7 @@
require ExtUtils::MM_Unix;
our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
=item os_flavor
==== //depot/perl/lib/ExtUtils/MM_Cygwin.pm#32 (text) ====
Index: perl/lib/ExtUtils/MM_Cygwin.pm
--- perl/lib/ExtUtils/MM_Cygwin.pm#31~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Cygwin.pm 2008-10-17 01:46:28.000000000 -0700
@@ -9,7 +9,7 @@
require ExtUtils::MM_Unix;
our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
=head1 NAME
==== //depot/perl/lib/ExtUtils/MM_DOS.pm#16 (text) ====
Index: perl/lib/ExtUtils/MM_DOS.pm
--- perl/lib/ExtUtils/MM_DOS.pm#15~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_DOS.pm 2008-10-17 01:46:28.000000000 -0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = 6.47_01;
+our $VERSION = 6.47_02;
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
==== //depot/perl/lib/ExtUtils/MM_MacOS.pm#28 (text) ====
Index: perl/lib/ExtUtils/MM_MacOS.pm
--- perl/lib/ExtUtils/MM_MacOS.pm#27~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_MacOS.pm 2008-10-17 01:46:28.000000000 -0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = 6.47_01;
+our $VERSION = 6.47_02;
sub new {
die <<'UNSUPPORTED';
==== //depot/perl/lib/ExtUtils/MM_NW5.pm#48 (text) ====
Index: perl/lib/ExtUtils/MM_NW5.pm
--- perl/lib/ExtUtils/MM_NW5.pm#47~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_NW5.pm 2008-10-17 01:46:28.000000000 -0700
@@ -22,7 +22,7 @@
use ExtUtils::MakeMaker::Config;
use File::Basename;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
require ExtUtils::MM_Win32;
our @ISA = qw(ExtUtils::MM_Win32);
==== //depot/perl/lib/ExtUtils/MM_OS2.pm#35 (text) ====
Index: perl/lib/ExtUtils/MM_OS2.pm
--- perl/lib/ExtUtils/MM_OS2.pm#34~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_OS2.pm 2008-10-17 01:46:28.000000000 -0700
@@ -5,7 +5,7 @@
use ExtUtils::MakeMaker qw(neatvalue);
use File::Spec;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
==== //depot/perl/lib/ExtUtils/MM_QNX.pm#13 (text) ====
Index: perl/lib/ExtUtils/MM_QNX.pm
--- perl/lib/ExtUtils/MM_QNX.pm#12~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_QNX.pm 2008-10-17 01:46:28.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_QNX;
use strict;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
require ExtUtils::MM_Unix;
our @ISA = qw(ExtUtils::MM_Unix);
==== //depot/perl/lib/ExtUtils/MM_UWIN.pm#15 (text) ====
Index: perl/lib/ExtUtils/MM_UWIN.pm
--- perl/lib/ExtUtils/MM_UWIN.pm#14~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_UWIN.pm 2008-10-17 01:46:28.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_UWIN;
use strict;
-our $VERSION = 6.47_01;
+our $VERSION = 6.47_02;
require ExtUtils::MM_Unix;
our @ISA = qw(ExtUtils::MM_Unix);
==== //depot/perl/lib/ExtUtils/MM_Unix.pm#243 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm#242~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Unix.pm 2008-10-17 01:46:28.000000000 -0700
@@ -15,7 +15,7 @@
# If we make $VERSION an our variable parse_version() breaks
use vars qw($VERSION);
-$VERSION = '6.47_01';
+$VERSION = '6.47_02';
require ExtUtils::MM_Any;
our @ISA = qw(ExtUtils::MM_Any);
==== //depot/perl/lib/ExtUtils/MM_VMS.pm#95 (text) ====
Index: perl/lib/ExtUtils/MM_VMS.pm
--- perl/lib/ExtUtils/MM_VMS.pm#94~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_VMS.pm 2008-10-17 01:46:28.000000000 -0700
@@ -15,7 +15,7 @@
use File::Basename;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
==== //depot/perl/lib/ExtUtils/MM_VOS.pm#13 (text) ====
Index: perl/lib/ExtUtils/MM_VOS.pm
--- perl/lib/ExtUtils/MM_VOS.pm#12~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_VOS.pm 2008-10-17 01:46:28.000000000 -0700
@@ -1,7 +1,7 @@
package ExtUtils::MM_VOS;
use strict;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
require ExtUtils::MM_Unix;
our @ISA = qw(ExtUtils::MM_Unix);
==== //depot/perl/lib/ExtUtils/MM_Win32.pm#76 (text) ====
Index: perl/lib/ExtUtils/MM_Win32.pm
--- perl/lib/ExtUtils/MM_Win32.pm#75~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Win32.pm 2008-10-17 01:46:28.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_01';
+our $VERSION = '6.47_02';
$ENV{EMXSHELL} = 'sh'; # to run `commands`
==== //depot/perl/lib/ExtUtils/MM_Win95.pm#31 (text) ====
Index: perl/lib/ExtUtils/MM_Win95.pm
--- perl/lib/ExtUtils/MM_Win95.pm#30~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MM_Win95.pm 2008-10-17 01:46:28.000000000 -0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
require ExtUtils::MM_Win32;
our @ISA = qw(ExtUtils::MM_Win32);
==== //depot/perl/lib/ExtUtils/MY.pm#13 (text) ====
Index: perl/lib/ExtUtils/MY.pm
--- perl/lib/ExtUtils/MY.pm#12~34482~ 2008-10-15 04:27:28.000000000 -0700
+++ perl/lib/ExtUtils/MY.pm 2008-10-17 01:46:28.000000000 -0700
@@ -3,7 +3,7 @@
use strict;
require ExtUtils::MM;
-our $VERSION = 6.47_01;
+our $VERSION = 6.47_02;
our @ISA = qw(ExtUtils::MM);
{
==== //depot/perl/lib/ExtUtils/MakeMaker.pm#145 (text) ====
Index: perl/lib/ExtUtils/MakeMaker.pm
--- perl/lib/ExtUtils/MakeMaker.pm#144~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/MakeMaker.pm 2008-10-17 01:46:28.000000000 -0700
@@ -18,7 +18,7 @@
my @Prepend_parent;
my %Recognized_Att_Keys;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
# Emulate something resembling CVS $Revision$
(our $Revision = $VERSION) =~ s{_}{};
==== //depot/perl/lib/ExtUtils/MakeMaker/Config.pm#13 (text) ====
Index: perl/lib/ExtUtils/MakeMaker/Config.pm
--- perl/lib/ExtUtils/MakeMaker/Config.pm#12~34482~ 2008-10-15
04:27:28.000000000 -0700
+++ perl/lib/ExtUtils/MakeMaker/Config.pm 2008-10-17 01:46:28.000000000
-0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
use Config ();
==== //depot/perl/lib/ExtUtils/MakeMaker/bytes.pm#14 (text) ====
Index: perl/lib/ExtUtils/MakeMaker/bytes.pm
--- perl/lib/ExtUtils/MakeMaker/bytes.pm#13~34482~ 2008-10-15
04:27:28.000000000 -0700
+++ perl/lib/ExtUtils/MakeMaker/bytes.pm 2008-10-17 01:46:28.000000000
-0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = 6.47_01;
+our $VERSION = 6.47_02;
my $Have_Bytes = eval { require bytes; 1; };
==== //depot/perl/lib/ExtUtils/MakeMaker/vmsish.pm#14 (text) ====
Index: perl/lib/ExtUtils/MakeMaker/vmsish.pm
--- perl/lib/ExtUtils/MakeMaker/vmsish.pm#13~34482~ 2008-10-15
04:27:28.000000000 -0700
+++ perl/lib/ExtUtils/MakeMaker/vmsish.pm 2008-10-17 01:46:28.000000000
-0700
@@ -2,7 +2,7 @@
use strict;
-our $VERSION = 6.47_01;
+our $VERSION = 6.47_02;
my $IsVMS = $^O eq 'VMS';
==== //depot/perl/lib/ExtUtils/Mkbootstrap.pm#23 (text) ====
Index: perl/lib/ExtUtils/Mkbootstrap.pm
--- perl/lib/ExtUtils/Mkbootstrap.pm#22~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/Mkbootstrap.pm 2008-10-17 01:46:28.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_01';
+our $VERSION = '6.47_02';
require Exporter;
our @ISA = ('Exporter');
==== //depot/perl/lib/ExtUtils/Mksymlists.pm#46 (text) ====
Index: perl/lib/ExtUtils/Mksymlists.pm
--- perl/lib/ExtUtils/Mksymlists.pm#45~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/Mksymlists.pm 2008-10-17 01:46:28.000000000 -0700
@@ -10,7 +10,7 @@
our @ISA = qw(Exporter);
our @EXPORT = qw(&Mksymlists);
-our $VERSION = '6.47_01';
+our $VERSION = '6.47_02';
sub Mksymlists {
my(%spec) = @_;
==== //depot/perl/lib/ExtUtils/t/min_perl_version.t#2 (text) ====
Index: perl/lib/ExtUtils/t/min_perl_version.t
--- perl/lib/ExtUtils/t/min_perl_version.t#1~34482~ 2008-10-15
04:27:28.000000000 -0700
+++ perl/lib/ExtUtils/t/min_perl_version.t 2008-10-17 01:46:28.000000000
-0700
@@ -184,6 +184,8 @@
# ----- META.yml output -----
{
my $distdir = 'Min-PerlVers-0.05';
+ $distdir =~ s{\.}{_}g if $Is_VMS;
+
my $meta_yml = "$distdir/META.yml";
my @make_out = run(qq{$make metafile});
END { rmtree $distdir }
==== //depot/perl/lib/ExtUtils/testlib.pm#23 (text) ====
Index: perl/lib/ExtUtils/testlib.pm
--- perl/lib/ExtUtils/testlib.pm#22~34482~ 2008-10-15 04:27:28.000000000
-0700
+++ perl/lib/ExtUtils/testlib.pm 2008-10-17 01:46:28.000000000 -0700
@@ -3,7 +3,7 @@
use strict;
use warnings;
-our $VERSION = 6.47_01;
+our $VERSION = 6.47_02;
use Cwd;
use File::Spec;
==== //depot/perl/t/lib/MakeMaker/Test/Utils.pm#12 (text) ====
Index: perl/t/lib/MakeMaker/Test/Utils.pm
--- perl/t/lib/MakeMaker/Test/Utils.pm#11~34482~ 2008-10-15
04:27:28.000000000 -0700
+++ perl/t/lib/MakeMaker/Test/Utils.pm 2008-10-17 01:46:28.000000000 -0700
@@ -4,21 +4,20 @@
use strict;
use Config;
-use vars qw($VERSION @ISA @EXPORT);
-
require Exporter;
[EMAIL PROTECTED] = qw(Exporter);
+our @ISA = qw(Exporter);
-$VERSION = 0.04;
+our $VERSION = 0.04;
[EMAIL PROTECTED] = qw(which_perl perl_lib makefile_name makefile_backup
- make make_run run make_macro calibrate_mtime
- setup_mm_test_root
- have_compiler slurp
- );
+our $Is_VMS = $^O eq 'VMS';
+our $Is_MacOS = $^O eq 'MacOS';
-my $Is_VMS = $^O eq 'VMS';
-my $Is_MacOS = $^O eq 'MacOS';
+our @EXPORT = qw(which_perl perl_lib makefile_name makefile_backup
+ make make_run run make_macro calibrate_mtime
+ setup_mm_test_root
+ have_compiler slurp
+ $Is_VMS $Is_MacOS
+ );
=head1 NAME
@@ -325,23 +324,22 @@
=item slurp
- $text = slurp($filename);
+ $contents = slurp($filename);
+
+Returns the $contents of $filename.
-Returns the contents of a file if it can be read, otherwise undef.
-Contents of excessively large files are truncated to a couple of
-kilobytes, though.
+Will die if $filename cannot be opened.
=cut
sub slurp {
my $filename = shift;
- my $text = undef;
- local *FH;
- local $/ = \8192;
- if (open FH, $filename) {
- $text = <FH>;
- close FH;
- }
+
+ local $/ = undef;
+ open my $fh, $filename or die "Can't open $filename for reading: $!";
+ my $text = <$fh>;
+ close $fh;
+
return $text;
}
End of Patch.
