Change 19820 by [EMAIL PROTECTED] on 2003/06/19 14:25:53
Upgrade to MakeMaker 6.10_07 (from makemaker.org snapshot
as of 2003-06-19 18:39 EET).
Affected files ...
... //depot/perl/lib/ExtUtils/MM_Any.pm#9 edit
... //depot/perl/lib/ExtUtils/MM_OS2.pm#22 edit
... //depot/perl/lib/ExtUtils/MM_Unix.pm#174 edit
... //depot/perl/lib/ExtUtils/MM_VMS.pm#66 edit
... //depot/perl/lib/ExtUtils/MakeMaker.pm#101 edit
... //depot/perl/lib/ExtUtils/t/Command.t#11 edit
... //depot/perl/lib/ExtUtils/t/MM_OS2.t#7 edit
... //depot/perl/lib/ExtUtils/t/MM_Unix.t#14 edit
Differences ...
==== //depot/perl/lib/ExtUtils/MM_Any.pm#9 (text) ====
Index: perl/lib/ExtUtils/MM_Any.pm
--- perl/lib/ExtUtils/MM_Any.pm#8~19721~ Mon Jun 9 10:04:50 2003
+++ perl/lib/ExtUtils/MM_Any.pm Thu Jun 19 07:25:53 2003
@@ -490,7 +490,7 @@
sub libscan {
my($self,$path) = @_;
my($dirs,$file) = ($self->splitpath($path))[1,2];
- return '' if grep /^RCS|CVS|SCCS|\.svn$/,
+ return '' if grep /^(?:RCS|CVS|SCCS|\.svn)$/,
$self->splitdir($dirs), $file;
return $path;
==== //depot/perl/lib/ExtUtils/MM_OS2.pm#22 (text) ====
Index: perl/lib/ExtUtils/MM_OS2.pm
--- perl/lib/ExtUtils/MM_OS2.pm#21~19162~ Mon Apr 7 11:23:29 2003
+++ perl/lib/ExtUtils/MM_OS2.pm Thu Jun 19 07:25:53 2003
@@ -130,9 +130,9 @@
$self->{PERL_ARCHIVE} = "\$(PERL_INC)/libperl\$(LIB_EXT)";
- $self->{PERL_ARCHIVE_AFTER} = !$OS2::is_aout
- ? "\$(PERL_INC)/libperl_override\$(LIB_EXT)"
- : '';
+ $self->{PERL_ARCHIVE_AFTER} = $OS2::is_aout
+ ? ''
+ : '$(PERL_INC)/libperl_override$(LIB_EXT)';
$self->{EXPORT_LIST} = '$(BASEEXT).def';
}
==== //depot/perl/lib/ExtUtils/MM_Unix.pm#174 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm#173~19703~ Fri Jun 6 22:11:50 2003
+++ perl/lib/ExtUtils/MM_Unix.pm Thu Jun 19 07:25:53 2003
@@ -792,7 +792,7 @@
my $date_check = $self->oneliner(<<'CODE', ['-l']);
print 'Warning: Makefile possibly out of date with $(VERSION_FROM)'
- if -e '$(VERSION_FROM)' and -M '$(VERSION_FROM)' < -M '$(FIRST_MAKEFILE)';
+ if -e '$(VERSION_FROM)' and -M '$(VERSION_FROM)' < -M '$(FIRST_MAKEFILE)';
CODE
return sprintf <<'MAKE_FRAG', $date_check;
@@ -2591,8 +2591,7 @@
} . ($Is_Win32
? q{FIXIN = pl2bat.bat
-} : q{FIXIN = $(PERLRUN) "-MExtUtils::MY" \
- -e "MY->fixin(shift)"
+} : q{FIXIN = $(PERLRUN) "-MExtUtils::MY" -e "MY->fixin(shift)"
}).qq{
pure_all :: @to
\$(NOECHO) \$(NOOP)
@@ -3566,7 +3565,8 @@
$cmd =~ s{^\n+}{};
$cmd =~ s{\n+$}{};
- $cmd = $self->quote_literal($cmd);
+ my @cmds = split /\n/, $cmd;
+ $cmd = join "\n\t-e ", map $self->quote_literal($_), @cmds;
$cmd = $self->escape_newlines($cmd);
$switches = join ' ', @$switches;
==== //depot/perl/lib/ExtUtils/MM_VMS.pm#66 (text) ====
Index: perl/lib/ExtUtils/MM_VMS.pm
--- perl/lib/ExtUtils/MM_VMS.pm#65~19594~ Fri May 23 06:06:25 2003
+++ perl/lib/ExtUtils/MM_VMS.pm Thu Jun 19 07:25:53 2003
@@ -21,7 +21,7 @@
use File::Basename;
use vars qw($Revision @ISA $VERSION);
($VERSION) = '5.67';
-($Revision) = q$Revision: 1.95 $ =~ /Revision:\s+(\S+)/;
+($Revision) = q$Revision: 1.97 $ =~ /Revision:\s+(\S+)/;
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
==== //depot/perl/lib/ExtUtils/MakeMaker.pm#101 (text) ====
Index: perl/lib/ExtUtils/MakeMaker.pm
--- perl/lib/ExtUtils/MakeMaker.pm#100~19703~ Fri Jun 6 22:11:50 2003
+++ perl/lib/ExtUtils/MakeMaker.pm Thu Jun 19 07:25:53 2003
@@ -2,8 +2,8 @@
BEGIN {require 5.005_03;}
-$VERSION = '6.10_05';
-($Revision) = q$Revision: 1.115 $ =~ /Revision:\s+(\S+)/;
+$VERSION = '6.10_07';
+($Revision) = q$Revision: 1.117 $ =~ /Revision:\s+(\S+)/;
require Exporter;
use Config;
@@ -2029,7 +2029,7 @@
$VERSION = '1.00';
*VERSION = \'1.01';
- $VERSION = sprintf "%d.%03d", q$Revision: 1.115 $ =~ /(\d+)/g;
+ $VERSION = sprintf "%d.%03d", q$Revision: 1.117 $ =~ /(\d+)/g;
$FOO::VERSION = '1.10';
*FOO::VERSION = \'1.11';
our $VERSION = 1.2.3; # new for perl5.6.0
==== //depot/perl/lib/ExtUtils/t/Command.t#11 (text) ====
Index: perl/lib/ExtUtils/t/Command.t
--- perl/lib/ExtUtils/t/Command.t#10~19099~ Mon Mar 31 01:54:52 2003
+++ perl/lib/ExtUtils/t/Command.t Thu Jun 19 07:25:53 2003
@@ -31,11 +31,14 @@
}
{
- # get a file in the current directory, replace last char with wildcard
+ # get a file in the MM test directory, replace last char with wildcard
my $file;
{
local *DIR;
- opendir(DIR, File::Spec->curdir());
+ my $mmtestdir = $ENV{PERL_CORE}
+ ? File::Spec->catdir(File::Spec->updir, 'lib', 'ExtUtils', 't')
+ : File::Spec->curdir;
+ opendir(DIR, $mmtestdir);
while ($file = readdir(DIR)) {
$file =~ s/\.\z// if $^O eq 'VMS';
last if $file =~ /^\w/;
==== //depot/perl/lib/ExtUtils/t/MM_OS2.t#7 (text) ====
Index: perl/lib/ExtUtils/t/MM_OS2.t
--- perl/lib/ExtUtils/t/MM_OS2.t#6~19789~ Sun Jun 15 10:08:02 2003
+++ perl/lib/ExtUtils/t/MM_OS2.t Thu Jun 19 07:25:53 2003
@@ -259,12 +259,13 @@
local *OS2::is_aout;
*OS2::is_aout = \$aout;
- $mm->init_linker;
+ $mm->init_linker;
isnt( $mm->{PERL_ARCHIVE_AFTER}, '',
'PERL_ARCHIVE_AFTER should be empty without $is_aout set' );
$aout = 1;
- is( $mm->{PERL_ARCHIVE_AFTER}, '$(PERL_INC)/libperl_override$(LIB_EXT)',
- '... and `$(PERL_INC)/libperl_override$(LIB_EXT)\' if it is set' );
+ is( $mm->{PERL_ARCHIVE_AFTER},
+ '$(PERL_INC)/libperl_override$(LIB_EXT)',
+ '... and has libperl_override if it is set' );
}
# EXPORT_LIST
==== //depot/perl/lib/ExtUtils/t/MM_Unix.t#14 (text) ====
Index: perl/lib/ExtUtils/t/MM_Unix.t
--- perl/lib/ExtUtils/t/MM_Unix.t#13~19099~ Mon Mar 31 01:54:52 2003
+++ perl/lib/ExtUtils/t/MM_Unix.t Thu Jun 19 07:25:53 2003
@@ -18,7 +18,7 @@
plan skip_all => 'Non-Unix platform';
}
else {
- plan tests => 115;
+ plan tests => 116;
}
}
@@ -167,7 +167,8 @@
is ($t->libscan('CVS/bar/car'), '', 'libscan on CVS');
is ($t->libscan('SCCS'), '', 'libscan on SCCS');
is ($t->libscan('.svn/something'), '', 'libscan on Subversion');
-is ($t->libscan('foo/b~r'), 'foo/b~r', 'libscan on file with ~');
+is ($t->libscan('foo/b~r'), 'foo/b~r', 'libscan on file with ~');
+is ($t->libscan('foo/RCS.pm'), 'foo/RCS.pm', 'libscan on file with RCS');
is ($t->libscan('Fatty'), 'Fatty', 'libscan on something not a VC file' );
End of Patch.
