ExtUtils::MakeMaker 6.10_06 (plus FAQ update)

Message-ID: <20030607081632.GA16228@windhund.schwern.org>

p4raw-id: //depot/perl@19721

5 files changed, 28 insertions, 13 deletions

diff --git a/lib/ExtUtils/Changes b/lib/ExtUtils/Changes
index 19f2678feb..7b27ae6a07 100644
--- a/lib/ExtUtils/Changes
+++ b/lib/ExtUtils/Changes
@@ -1,3 +1,10 @@
+6.10_06 Sat Jun  7 00:55:29 PDT 2003
+    - Whoops, Liblist.t busted on VMS after I turned strict on in
+      ExtUtils::Liblist::Kid.  Merely a test bug, not a real bug.
+    - Fixed metafile_addtomanifest failure so the proper error shows.
+    - Fixed metafile_addtomanifest failure diagnostic leaking out during
+      the basic.t test on Windows.
+
 6.10_05 Fri Jun  6 18:15:30 PDT 2003
     * Documenting META.yml, NO_META
     * Documenting the fact that distdir will auto generate META.yml and 
diff --git a/lib/ExtUtils/META.yml b/lib/ExtUtils/META.yml
index e01288523a..20b50a8438 100644
--- a/lib/ExtUtils/META.yml
+++ b/lib/ExtUtils/META.yml
@@ -1,6 +1,6 @@
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         ExtUtils-MakeMaker
-version:      6.10_05
+version:      6.10_06
 version_from: lib/ExtUtils/MakeMaker.pm
 installdirs:  perl
 requires:
@@ -10,4 +10,4 @@ requires:
     Pod::Man:                      0
 
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.10_05
+generated_by: ExtUtils::MakeMaker version 6.10_06
diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
index d3208fda70..f7cb4e87ac 100644
--- 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.05;
+$VERSION = 0.06;
 @ISA = qw(File::Spec);
 
 use Config;
@@ -606,7 +606,7 @@ MAKE_FRAG
 
     my $add_meta = $self->oneliner(<<'CODE', ['-MExtUtils::Manifest=maniadd']);
 eval { maniadd({q{META.yml} => q{Module meta-data (added by MakeMaker)}}) } 
-    or warn "Could not add META.yml to MANIFEST: $@\n"
+    or print "Could not add META.yml to MANIFEST: $${'@'}\n"
 CODE
 
     return sprintf <<'MAKE_FRAG', $add_meta;
diff --git a/lib/ExtUtils/MakeMaker/FAQ.pod b/lib/ExtUtils/MakeMaker/FAQ.pod
index 38c50cef04..ca9d53fc61 100644
--- a/lib/ExtUtils/MakeMaker/FAQ.pod
+++ b/lib/ExtUtils/MakeMaker/FAQ.pod
@@ -1,6 +1,6 @@
 package ExtUtils::MakeMaker::FAQ;
 
-(our $VERSION) = sprintf "%03d", q$Revision: 1.6 $ =~ /Revision:\s+(\S+)/;
+(our $VERSION) = sprintf "%03d", q$Revision: 1.7 $ =~ /Revision:\s+(\S+)/;
 
 1;
 __END__
@@ -73,28 +73,35 @@ by hand is a pain and you often forget.
 Simplest way to do it automatically is to use your version control
 system's revision number (you are using version control, right?).
 
-In CVS and RCS you use $Revision: 1.6 $ writing it like so:
+In CVS and RCS you use $Z<>Revision$ writing it like so:
 
-    $VERSION = sprintf "%d.%03d", q$Revision: 1.6 $ =~ /(\d+)/g;
+    $VERSION = sprintf "%d.%03d", q$Revision$ =~ /(\d+)/g;
 
-On your next check in, $Revision: 1.6 $ will magically be expanded to contain
+On your next check in, $Z<>Revision$ will magically be expanded to contain
 the current revision #.
 
-    $VERSION = sprintf "%d.%03d", q$Revision: 1.6 $ =~ /(\d+)/g;
+    $VERSION = sprintf "%d.%03d", q$Revision: 1.7 $ =~ /(\d+)/g;
 
-Every time the file is checked in the $Revision: 1.6 $ will be updated,
+Every time the file is checked in the $Z<>Revision$ will be updated,
 updating your $VERSION.
 
 In CVS version 1.9 is followed by 1.10.  Since CPAN compares version
 numbers numerically we use a sprintf() to convert 1.9 to 1.009 and
 1.10 to 1.010 which compare properly.
 
-If branches are involved (ie. $Revision: 1.5.3.4) its a little more
+If branches are involved (ie. $Z<>Revision: 1.5.3.4) its a little more
 complicated.
 
     # must be all on one line or MakeMaker will get confused.
-    $VERSION = do { my @r = (q$Revision: 1.6 $ =~ /\d+/g); sprintf "%d."."%03d" x $#r, @r };
+    $VERSION = do { my @r = (q$Revision$ =~ /\d+/g); sprintf "%d."."%03d" x $#r, @r };
 
+=item What's this F<META.yml> thing and how did it get in my F<MANIFEST>?!
+
+F<META.yml> is a module meta-data file pioneered by Module::Build and
+automatically generated as part of the 'distdir' target (and thus
+'dist').  See L<ExtUtils::MakeMaker/"Module Meta-Data">.
+
+To shut off its generation, pass the C<NO_META> flag to C<WriteMakefile()>.
 
 =back
 
diff --git a/lib/ExtUtils/t/Liblist.t b/lib/ExtUtils/t/Liblist.t
index 2ba165328b..0ee90be2ee 100644
--- a/lib/ExtUtils/t/Liblist.t
+++ b/lib/ExtUtils/t/Liblist.t
@@ -26,7 +26,8 @@ ok( defined &ExtUtils::Liblist::ext,
     my @warn;
     local $SIG{__WARN__} = sub {push @warn, [@_]};
 
-    my @out = ExtUtils::Liblist->ext('-ln0tt43r3_perl');
+    my $ll = bless {}, 'ExtUtils::Liblist';
+    my @out = $ll->ext('-ln0tt43r3_perl');
     is( @out, 4, 'enough output' );
     unlike( $out[2], qr/-ln0tt43r3_perl/, 'bogus library not added' );
     ok( @warn, 'had warning');