Upgrade to MakeMaker 6.20.

p4raw-id: //depot/perl@21675

diff --git a/lib/ExtUtils/Changes b/lib/ExtUtils/Changes
index f4a4bd4..0342d04 100644 (file)
--- a/lib/ExtUtils/Changes
+++ b/lib/ExtUtils/Changes
@@ -1,3 +1,12 @@
+6.20 Thu Nov  6 02:25:58 PST 2003
+    - Fixing dos2unix on Cygwin.  In-place editing doesn't work 100% so we
+      take a more conservative approach.
+    - Small postamble.t test temp file cleanup fix for Cygwin and Windows.
+    - Small Command.t test fix for 5.5.3.  No real bug [rt 4290]
+    - Small Liblist fix for Cygwin and import libraries [Gerrit P. Haase]
+    - metafile error message slightly mangled.  Bare $! mistake confusing 
+      nmake [rt 4285 4301]
+
 6.19 Mon Nov  3 22:53:56 PST 2003
     - Removed 00setup_dummy.t and zz_cleanup_dummy.t.  Tests now setup and
       teardown the dummy modules as needed.

diff --git a/lib/ExtUtils/Command.pm b/lib/ExtUtils/Command.pm
index c2ba82e..f83c774 100644 (file)
--- a/lib/ExtUtils/Command.pm
+++ b/lib/ExtUtils/Command.pm
@@ -12,7 +12,7 @@ use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
 @ISA       = qw(Exporter);
 @EXPORT    = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f chmod 
                 dos2unix);
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 my $Is_VMS = $^O eq 'VMS';
 
@@ -223,18 +223,25 @@ Converts DOS and OS/2 linefeeds to Unix style recursively.
 sub dos2unix {
     require File::Find;
     File::Find::find(sub {
-        return if -d $_;
+        return if -d;
         return unless -w _;
+        return unless -r _;
         return if -B _;
 
-        local @ARGV = $_;
-        local $^I = '';
         local $\;
 
-        while (<>) { 
-            s/\015\012/\012/g;
-            print;
+       my $orig = $_;
+       my $temp = '.dos2unix_tmp';
+       open ORIG, $_ or do { warn "dos2unix can't open $_: $!"; return };
+       open TEMP, ">$temp" or 
+           do { warn "dos2unix can't create .dos2unix_tmp: $!"; return };
+        while (my $line = <ORIG>) { 
+            $line =~ s/\015\012/\012/g;
+            print TEMP $line;
         }
+       close ORIG;
+       close TEMP;
+       rename $temp, $orig;
 
     }, @ARGV);
 }

diff --git a/lib/ExtUtils/Liblist/Kid.pm b/lib/ExtUtils/Liblist/Kid.pm
index 6544509..e3c7a1f 100644 (file)
--- a/lib/ExtUtils/Liblist/Kid.pm
+++ b/lib/ExtUtils/Liblist/Kid.pm
@@ -132,6 +132,7 @@ sub _unix_os2_ext {
                 && ($thislib .= "_s") ){ # we must explicitly use _s version
            } elsif (-f ($fullname="$thispth/lib$thislib$Config_libext")){
            } elsif (-f ($fullname="$thispth/$thislib$Config_libext")){
+            } elsif (-f ($fullname="$thispth/lib$thislib.dll$Config_libext")){
            } elsif (-f ($fullname="$thispth/Slib$thislib$Config_libext")){
            } elsif ($^O eq 'dgux'
                 && -l ($fullname="$thispth/lib$thislib$Config_libext")

diff --git a/lib/ExtUtils/MANIFEST.SKIP b/lib/ExtUtils/MANIFEST.SKIP
index b989d68..854b78c 100644 (file)
--- a/lib/ExtUtils/MANIFEST.SKIP
+++ b/lib/ExtUtils/MANIFEST.SKIP
@@ -1,18 +1,23 @@
-\.ppd$
+# Avoid version control files.
+\bRCS\b
 \bCVS\b
+,v$
+\B\.svn\b
+
+# Avoid Makemaker generated and utility files.
+\bMANIFEST\.bak
+\bMakefile$
+\bblib/
+\bMakeMaker-\d
+\bpm_to_blib$
+\bblibdirs$
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+
+# Avoid temp and backup files.
 ~$
-t/lib/File/
-t/Big-Dummy
-t/Problem-Module
-.gz$
-.bak$
-Makefile$
-MANIFEST.perl$
 \.old$
-merge_bleadperl$
-^blib/
-^pm_to_blib
-^blibdirs
-.DS_Store
-\#
-^bleadperl\.patch$
+\#$
+\b\.#

diff --git a/lib/ExtUtils/META.yml b/lib/ExtUtils/META.yml
index 15bd218..60a0ef4 100644 (file)
--- a/lib/ExtUtils/META.yml
+++ b/lib/ExtUtils/META.yml
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         ExtUtils-MakeMaker
-version:      6.19
+version:      6.20
 version_from: lib/ExtUtils/MakeMaker.pm
 installdirs:  perl
 requires:
@@ -11,4 +11,4 @@ requires:
     Pod::Man:                      0
 
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.19
+generated_by: ExtUtils::MakeMaker version 6.20

diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
index 98e6a48..f03985b 100644 (file)
--- a/lib/ExtUtils/MM_Any.pm
+++ b/lib/ExtUtils/MM_Any.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_Any;
 
 use strict;
 use vars qw($VERSION @ISA);
-$VERSION = 0.08;
+$VERSION = 0.09;
 @ISA = qw(File::Spec);
 
 use Config;
@@ -628,7 +628,7 @@ YAML
 
     my @write_meta = $self->echo($meta, 'META_new.yml');
     my $move = $self->oneliner(<<'CODE', ['-MExtUtils::Command', '-MFile::Compare']);
-compare(@ARGV) != 0 ? (mv or warn "Cannot move @ARGV: $!\n") : unlink(shift);
+compare(@ARGV) != 0 ? (mv or warn "Cannot move @ARGV: $$!\n") : unlink(shift);
 CODE
 
     return sprintf <<'MAKE_FRAG', join("\n\t", @write_meta), $move;

diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 97fdb1d..d1fe68b 100644 (file)
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -2,8 +2,8 @@ package ExtUtils::MakeMaker;
 
 BEGIN {require 5.005_03;}
 
-$VERSION = '6.19';
-($Revision) = q$Revision: 1.141 $ =~ /Revision:\s+(\S+)/;
+$VERSION = '6.20';
+($Revision) = q$Revision: 1.142 $ =~ /Revision:\s+(\S+)/;
 
 require Exporter;
 use Config;
@@ -2064,7 +2064,7 @@ MakeMaker object. The following lines will be parsed o.k.:
 
     $VERSION = '1.00';
     *VERSION = \'1.01';
-    $VERSION = sprintf "%d.%03d", q$Revision: 1.141 $ =~ /(\d+)/g;
+    $VERSION = sprintf "%d.%03d", q$Revision: 1.142 $ =~ /(\d+)/g;
     $FOO::VERSION = '1.10';
     *FOO::VERSION = \'1.11';
     our $VERSION = 1.2.3;       # new for perl5.6.0 

diff --git a/lib/ExtUtils/MakeMaker/Tutorial.pod b/lib/ExtUtils/MakeMaker/Tutorial.pod
index fbfcf8a..aec12b6 100644 (file)
--- a/lib/ExtUtils/MakeMaker/Tutorial.pod
+++ b/lib/ExtUtils/MakeMaker/Tutorial.pod
@@ -86,7 +86,7 @@ A simple listing of all the files in your distribution.
         MANIFEST
         lib/Your/Module.pm
 
-Filepaths in a MANIFEST always use Unix conventions (ie. /) even if you're
+File paths in a MANIFEST always use Unix conventions (ie. /) even if you're
 not on Unix.
 
 You can write this by hand or generate it with 'make manifest'.
@@ -144,7 +144,7 @@ Suggested information to include here:
 
 A file full of regular expressions to exclude when using 'make
 manifest' to generate the MANIFEST.  These regular expressions
-are checked against each filepath found in the distribution (so
+are checked against each file path found in the distribution (so
 you're matching against "t/foo.t" not "foo.t").
 
 Here's a sample:

diff --git a/lib/ExtUtils/t/Command.t b/lib/ExtUtils/t/Command.t
index 943296c..a937bc3 100644 (file)
--- a/lib/ExtUtils/t/Command.t
+++ b/lib/ExtUtils/t/Command.t
@@ -216,7 +216,7 @@ BEGIN {
 }
 
 {
-    mkdir 'd2utest';
+    { local @ARGV = 'd2utest'; mkpath; }
     open(FILE, '>d2utest/foo');
     print FILE "stuff\015\012and thing\015\012";
     close FILE;

diff --git a/lib/ExtUtils/t/postamble.t b/lib/ExtUtils/t/postamble.t
index 2b47b12..0fbeabd 100644 (file)
--- a/lib/ExtUtils/t/postamble.t
+++ b/lib/ExtUtils/t/postamble.t
@@ -70,3 +70,4 @@ ok( open(MAKEFILE, $Makefile) ) or diag "Can't open $Makefile: $!";
   like( <MAKEFILE>, qr/^\# This makes sure the postamble gets written\n/m,
         'postamble added to the Makefile' );
 }
+close MAKEFILE;