Change 34614 by [EMAIL PROTECTED] on 2008/10/28 10:48:43
Integrate:
[ 34590]
Upgrade to ExtUtils::Command 1.15
[ 34591]
Upgrade to ExtUtils::Manifest 1.55.
Affected files ...
... //depot/maint-5.10/perl/MANIFEST#51 integrate
... //depot/maint-5.10/perl/lib/ExtUtils/Command.pm#3 integrate
... //depot/maint-5.10/perl/lib/ExtUtils/Manifest.pm#3 integrate
... //depot/maint-5.10/perl/lib/ExtUtils/t/Manifest.t#3 integrate
... //depot/maint-5.10/perl/lib/ExtUtils/t/cp.t#1 branch
... //depot/maint-5.10/perl/lib/ExtUtils/t/eu_command.t#3 integrate
Differences ...
==== //depot/maint-5.10/perl/MANIFEST#51 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#50~34547~ 2008-10-21 04:57:57.000000000 -0700
+++ perl/MANIFEST 2008-10-28 03:48:43.000000000 -0700
@@ -1838,6 +1838,7 @@
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/testlib.pm Fixes up @INC to use just-built
extension
+lib/ExtUtils/t/cp.t See if ExtUtils::Command works
lib/ExtUtils/t/eu_command.t See if ExtUtils::Command works
lib/ExtUtils/t/FIRST_MAKEFILE.t See if FIRST_MAKEFILE works
lib/ExtUtils/t/fixin.t See if ExtUtils::MakeMaker works
==== //depot/maint-5.10/perl/lib/ExtUtils/Command.pm#3 (text) ====
Index: perl/lib/ExtUtils/Command.pm
--- perl/lib/ExtUtils/Command.pm#2~33913~ 2008-05-23 05:22:22.000000000
-0700
+++ perl/lib/ExtUtils/Command.pm 2008-10-28 03:48:43.000000000 -0700
@@ -12,9 +12,11 @@
@ISA = qw(Exporter);
@EXPORT = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod
dos2unix);
-$VERSION = '1.14';
+$VERSION = '1.15';
+
+my $Is_VMS = $^O eq 'VMS';
+my $Is_Win32 = $^O eq 'MSWin32';
-my $Is_VMS = $^O eq 'VMS';
=head1 NAME
@@ -210,6 +212,10 @@
my $nok = 0;
foreach my $src (@src) {
$nok ||= !copy($src,$dst);
+
+ # Win32 does not update the mod time of a copied file, just the
+ # created time which make does not look at.
+ utime(time, time, $dst) if $Is_Win32;
}
return $nok;
}
==== //depot/maint-5.10/perl/lib/ExtUtils/Manifest.pm#3 (text) ====
Index: perl/lib/ExtUtils/Manifest.pm
--- perl/lib/ExtUtils/Manifest.pm#2~34257~ 2008-09-03 14:46:38.000000000
-0700
+++ perl/lib/ExtUtils/Manifest.pm 2008-10-28 03:48:43.000000000 -0700
@@ -13,7 +13,7 @@
$Is_MacOS $Is_VMS
$Debug $Verbose $Quiet $MANIFEST $DEFAULT_MSKIP);
-$VERSION = '1.54';
+$VERSION = '1.55';
@ISA=('Exporter');
@EXPORT_OK = qw(mkmanifest
manicheck filecheck fullcheck skipcheck
==== //depot/maint-5.10/perl/lib/ExtUtils/t/Manifest.t#3 (text) ====
Index: perl/lib/ExtUtils/t/Manifest.t
--- perl/lib/ExtUtils/t/Manifest.t#2~34257~ 2008-09-03 14:46:38.000000000
-0700
+++ perl/lib/ExtUtils/t/Manifest.t 2008-10-28 03:48:43.000000000 -0700
@@ -35,8 +35,9 @@
1 while unlink $file; # or else we'll get multiple versions on VMS
open( T, '> '.$file) or return;
print T $data;
- ++$Files{$file};
close T;
+ return 0 unless -e $file; # exists under the name we gave it ?
+ ++$Files{$file};
}
sub read_manifest {
==== //depot/maint-5.10/perl/lib/ExtUtils/t/cp.t#1 (text) ====
Index: perl/lib/ExtUtils/t/cp.t
--- /dev/null 2008-10-24 09:33:31.292628696 -0700
+++ perl/lib/ExtUtils/t/cp.t 2008-10-28 03:48:43.000000000 -0700
@@ -0,0 +1,33 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+ if( $ENV{PERL_CORE} ) {
+ chdir 't';
+ @INC = ('../lib', 'lib/');
+ }
+ else {
+ unshift @INC, 't/lib/';
+ }
+}
+chdir 't';
+
+use ExtUtils::Command;
+use Test::More tests => 1;
+
+open FILE, ">source" or die $!;
+print FILE "stuff\n";
+close FILE;
+
+# Instead of sleeping to make the file time older
+utime time - 900, time - 900, "source";
+
+END { 1 while unlink "source", "dest"; }
+
+# Win32 bug, cp wouldn't update mtime.
+{
+ local @ARGV = qw(source dest);
+ cp();
+ my $mtime = (stat("dest"))[9];
+ my $now = time;
+ cmp_ok( abs($mtime - $now), '<=', 1, 'cp updated mtime' );
+}
==== //depot/maint-5.10/perl/lib/ExtUtils/t/eu_command.t#3 (text) ====
Index: perl/lib/ExtUtils/t/eu_command.t
--- perl/lib/ExtUtils/t/eu_command.t#2~33496~ 2008-03-12 10:43:34.000000000
-0700
+++ perl/lib/ExtUtils/t/eu_command.t 2008-10-28 03:48:43.000000000 -0700
@@ -22,10 +22,8 @@
File::Path::rmtree( 'ecmddir' );
}
-BEGIN {
- use Test::More tests => 41;
- use File::Spec;
-}
+use Test::More tests => 40;
+use File::Spec;
BEGIN {
# bad neighbor, but test_f() uses exit()
@@ -57,9 +55,6 @@
@ARGV = ( $Testfile );
is( test_f(), 1, 'testing non-existent file' );
- @ARGV = ( $Testfile );
- is( ! test_f(), '', 'testing non-existent file' );
-
# these are destructive, have to keep setting @ARGV
@ARGV = ( $Testfile );
touch();
@@ -146,7 +141,7 @@
SKIP: {
if ($^O eq 'amigaos' || $^O eq 'os2' || $^O eq 'MSWin32' ||
$^O eq 'NetWare' || $^O eq 'dos' || $^O eq 'cygwin' ||
- $^O eq 'MacOS' || $^O eq 'vos'
+ $^O eq 'MacOS'
) {
skip( "different file permission semantics on $^O", 5);
}
End of Patch.
