Change 33581 by [EMAIL PROTECTED] on 2008/03/27 11:34:45
Integrate:
[ 33552]
Upgrade to Module-Pluggable-3.8
[ 33571]
Actually use the computed @path so as to write the awkwardly named test
files to the right place when in core. Without this the open fails
(silently as intended) and the tests are skipped on all OS.
Affected files ...
... //depot/maint-5.10/perl/ext/Module/Pluggable/Makefile.PL#2 integrate
... //depot/maint-5.10/perl/ext/Module/Pluggable/lib/Module/Pluggable.pm#2
integrate
Differences ...
==== //depot/maint-5.10/perl/ext/Module/Pluggable/Makefile.PL#2 (text) ====
Index: perl/ext/Module/Pluggable/Makefile.PL
--- perl/ext/Module/Pluggable/Makefile.PL#1~33524~ 2008-03-14
02:37:22.000000000 -0700
+++ perl/ext/Module/Pluggable/Makefile.PL 2008-03-27 04:34:45.000000000
-0700
@@ -14,9 +14,9 @@
my $core = grep { $_ eq 'PERL_CORE=1' } @ARGV;
my @path = $core ? (File::Spec->updir, File::Spec->updir, File::Spec->updir,
- "t", "Module_Pluggable") : ($FindBin::Bin,"t");
-my @files;
+ "t", "Module_Pluggable") : ($FindBin::Bin,"t");
+my @files;
if ($^O ne 'VMS' && $^O ne 'VOS') {
foreach my $test (keys %dodgy_files) {
my ($file) = (catfile(@path, "lib", $test)=~/^(.*)$/);
@@ -24,24 +24,25 @@
my $name = $dodgy_files{$test};
print $fh "package $name;\nsub new {}\n1;";
close($fh);
- push @files, $file;
+ push @files, $file;
}
}
}
+
WriteMakefile
(
- 'NAME' => 'Module::Pluggable',
+ 'NAME' => 'Module::Pluggable',
'VERSION_FROM' => 'lib/Module/Pluggable.pm',
- 'PREREQ_PM' => {
+ 'PREREQ_PM' => {
'File::Basename' => '0',
'File::Spec' => '3.00',
'Test::More' => '0.62'
},
- 'INSTALLDIRS' => 'site',
- 'EXE_FILES' => [],
- 'PL_FILES' => {},
- 'realclean' => {FILES=> join ' ', @files},
+ 'EXE_FILES' => [],
+ 'INSTALLDIRS' => ($] >= 5.008009) ? "perl" : "site",
+ 'PL_FILES' => {},
+ 'realclean' => {FILES=> join ' ', @files},
# In the core pods will be built by installman.
$core ? (MAN3PODS => {}) : (),
)
==== //depot/maint-5.10/perl/ext/Module/Pluggable/lib/Module/Pluggable.pm#2
(text) ====
Index: perl/ext/Module/Pluggable/lib/Module/Pluggable.pm
--- perl/ext/Module/Pluggable/lib/Module/Pluggable.pm#1~33524~ 2008-03-14
02:37:22.000000000 -0700
+++ perl/ext/Module/Pluggable/lib/Module/Pluggable.pm 2008-03-27
04:34:45.000000000 -0700
@@ -9,7 +9,7 @@
# Peter Gibbons: I wouldn't say I've been missing it, Bob!
-$VERSION = '3.7';
+$VERSION = '3.8';
sub import {
my $class = shift;
End of Patch.
