From: Steve Peters Date: Tue, 10 Oct 2006 14:33:53 +0000 (+0000) Subject: Upgrade to ExtUtils-Makemaker-6.31. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=562c8117872556faadd31f703c1c1a0907ed9a04;p=p5sagit%2Fp5-mst-13.2.git Upgrade to ExtUtils-Makemaker-6.31. p4raw-id: //depot/perl@28984 --- diff --git a/lib/ExtUtils/Changes b/lib/ExtUtils/Changes index 165aa16..e50f302 100644 --- a/lib/ExtUtils/Changes +++ b/lib/ExtUtils/Changes @@ -1,3 +1,11 @@ +6.31 Mon Oct 9 16:54:47 PDT 2006 + - Update our META.yml to version 1.2 of the spec. + * Update the SEE ALSO to mention Module::Build, Module::Install, + ExtUtils::ModuleMaker and Module::Starter. + - Fix ARCHITECTURE tag in PPD generation for 5.8 (patch taken from + ActiveState 819). [rt.cpan.org 20566] + * Bring ExtUtils::Manifest up to 1.48 + 6.30_04 Mon Sep 11 16:14:06 EDT 2006 - EXTRA_META has been undocumented as I don't like the way the interface works but I don't want to hold up 6.31. It will be diff --git a/lib/ExtUtils/Command/MM.pm b/lib/ExtUtils/Command/MM.pm index 774e1b2..6ca97b9 100644 --- a/lib/ExtUtils/Command/MM.pm +++ b/lib/ExtUtils/Command/MM.pm @@ -9,7 +9,7 @@ use vars qw($VERSION @ISA @EXPORT); @EXPORT = qw(test_harness pod2man perllocal_install uninstall warn_if_old_packlist); -$VERSION = '0.05_01'; +$VERSION = '0.06'; my $Is_VMS = $^O eq 'VMS'; diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm index 4b09808..63df44e 100644 --- a/lib/ExtUtils/Liblist.pm +++ b/lib/ExtUtils/Liblist.pm @@ -1,7 +1,7 @@ package ExtUtils::Liblist; use vars qw($VERSION); -$VERSION = '1.01'; +$VERSION = '1.02'; use File::Spec; require ExtUtils::Liblist::Kid; diff --git a/lib/ExtUtils/Liblist/Kid.pm b/lib/ExtUtils/Liblist/Kid.pm index d67aa01..75d0ba5 100644 --- a/lib/ExtUtils/Liblist/Kid.pm +++ b/lib/ExtUtils/Liblist/Kid.pm @@ -10,7 +10,7 @@ use 5.00503; use strict; use vars qw($VERSION); -$VERSION = 1.30; +$VERSION = 1.31; use Config; use Cwd 'cwd'; diff --git a/lib/ExtUtils/MM.pm b/lib/ExtUtils/MM.pm index 8aaa55f..e592bb8 100644 --- a/lib/ExtUtils/MM.pm +++ b/lib/ExtUtils/MM.pm @@ -3,7 +3,7 @@ package ExtUtils::MM; use strict; use ExtUtils::MakeMaker::Config; use vars qw(@ISA $VERSION); -$VERSION = '0.05'; +$VERSION = '0.06'; require ExtUtils::Liblist; require ExtUtils::MakeMaker; diff --git a/lib/ExtUtils/MM_AIX.pm b/lib/ExtUtils/MM_AIX.pm index 7de7da5..a54d90e 100644 --- a/lib/ExtUtils/MM_AIX.pm +++ b/lib/ExtUtils/MM_AIX.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_AIX; use strict; use vars qw($VERSION @ISA); -$VERSION = '0.03'; +$VERSION = '0.04'; require ExtUtils::MM_Unix; @ISA = qw(ExtUtils::MM_Unix); diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm index a4f6027..6851224 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.13_02'; +$VERSION = '0.14'; use Carp; use File::Spec; @@ -707,10 +707,7 @@ Generate the metafile target. Writes the file META.yml YAML encoded meta-data about the module in the distdir. The format follows Module::Build's as closely as -possible. Additionally, we include: - - version_from - installdirs +possible. =cut @@ -733,10 +730,9 @@ MAKE_FRAG name => $self->{DISTNAME}, version => $self->{VERSION}, abstract => $self->{ABSTRACT}, - license => $self->{LICENSE} || 'unknown', + license => $self->{LICENSE}, generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", - author => $self->{AUTHOR}, distribution_type => $self->{PM} ? 'module' : 'script', ); @@ -750,11 +746,16 @@ MAKE_FRAG $meta .= sprintf "%-20s %s\n", "$key:", $val; }; - $meta .= <{AUTHOR}; +author: + - $self->{AUTHOR} YAML $meta .= $self->{EXTRA_META} if $self->{EXTRA_META}; diff --git a/lib/ExtUtils/MM_BeOS.pm b/lib/ExtUtils/MM_BeOS.pm index 6d93ad4..72f2e9b 100644 --- a/lib/ExtUtils/MM_BeOS.pm +++ b/lib/ExtUtils/MM_BeOS.pm @@ -25,7 +25,7 @@ require ExtUtils::MM_Unix; use vars qw(@ISA $VERSION); @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -$VERSION = '1.05'; +$VERSION = '1.06'; =item os_flavor diff --git a/lib/ExtUtils/MM_Cygwin.pm b/lib/ExtUtils/MM_Cygwin.pm index adb8d42..9dc6e2e 100644 --- a/lib/ExtUtils/MM_Cygwin.pm +++ b/lib/ExtUtils/MM_Cygwin.pm @@ -10,7 +10,7 @@ require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -$VERSION = '1.08'; +$VERSION = '1.09'; =head1 NAME diff --git a/lib/ExtUtils/MM_DOS.pm b/lib/ExtUtils/MM_DOS.pm index b985d00..f5a6c2a 100644 --- a/lib/ExtUtils/MM_DOS.pm +++ b/lib/ExtUtils/MM_DOS.pm @@ -3,7 +3,7 @@ package ExtUtils::MM_DOS; use strict; use vars qw($VERSION @ISA); -$VERSION = 0.02; +$VERSION = 0.03; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_MacOS.pm b/lib/ExtUtils/MM_MacOS.pm index de578f8..61e8f74 100644 --- a/lib/ExtUtils/MM_MacOS.pm +++ b/lib/ExtUtils/MM_MacOS.pm @@ -1,6 +1,6 @@ package ExtUtils::MM_MacOS; -$VERSION = 1.08; +$VERSION = 1.09; sub new { die <<'UNSUPPORTED'; diff --git a/lib/ExtUtils/MM_NW5.pm b/lib/ExtUtils/MM_NW5.pm index 830c5c4..702caab 100644 --- a/lib/ExtUtils/MM_NW5.pm +++ b/lib/ExtUtils/MM_NW5.pm @@ -23,7 +23,7 @@ use ExtUtils::MakeMaker::Config; use File::Basename; use vars qw(@ISA $VERSION); -$VERSION = '2.08_02'; +$VERSION = '2.09'; require ExtUtils::MM_Win32; @ISA = qw(ExtUtils::MM_Win32); diff --git a/lib/ExtUtils/MM_OS2.pm b/lib/ExtUtils/MM_OS2.pm index 6bfb4a3..f540634 100644 --- a/lib/ExtUtils/MM_OS2.pm +++ b/lib/ExtUtils/MM_OS2.pm @@ -6,7 +6,7 @@ use vars qw($VERSION @ISA); use ExtUtils::MakeMaker qw(neatvalue); use File::Spec; -$VERSION = '1.05'; +$VERSION = '1.06'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_QNX.pm b/lib/ExtUtils/MM_QNX.pm index d975289..55f7fab 100644 --- a/lib/ExtUtils/MM_QNX.pm +++ b/lib/ExtUtils/MM_QNX.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_QNX; use strict; use vars qw($VERSION @ISA); -$VERSION = '0.02'; +$VERSION = '0.03'; require ExtUtils::MM_Unix; @ISA = qw(ExtUtils::MM_Unix); diff --git a/lib/ExtUtils/MM_UWIN.pm b/lib/ExtUtils/MM_UWIN.pm index 1667d55..35371c6 100644 --- a/lib/ExtUtils/MM_UWIN.pm +++ b/lib/ExtUtils/MM_UWIN.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_UWIN; use strict; use vars qw($VERSION @ISA); -$VERSION = 0.02; +$VERSION = 0.03; require ExtUtils::MM_Unix; @ISA = qw(ExtUtils::MM_Unix); diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index ba3be67..d5f93a5 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -18,7 +18,7 @@ use vars qw($VERSION @ISA use ExtUtils::MakeMaker qw($Verbose neatvalue); -$VERSION = '1.50_04'; +$VERSION = '1.51'; require ExtUtils::MM_Any; @ISA = qw(ExtUtils::MM_Any); @@ -2977,7 +2977,14 @@ PPD_OUT } - $ppd_xml .= sprintf <<'PPD_OUT', $Config{archname}; + my $archname = $Config{archname}; + if ($] >= 5.008) { + # archname did not change from 5.6 to 5.8, but those versions may + # not be not binary compatible so now we append the part of the + # version that changes when binary compatibility may change + $archname .= "-". substr($Config{version},0,3); + } + $ppd_xml .= sprintf <<'PPD_OUT', $archname; PPD_OUT diff --git a/lib/ExtUtils/MM_VMS.pm b/lib/ExtUtils/MM_VMS.pm index 5968f74..59ecf63 100644 --- a/lib/ExtUtils/MM_VMS.pm +++ b/lib/ExtUtils/MM_VMS.pm @@ -18,7 +18,7 @@ use File::Basename; # $Revision can't be on the same line or SVN/K gets confused use vars qw($Revision $VERSION @ISA); -$VERSION = '5.73_02'; +$VERSION = '5.74'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/lib/ExtUtils/MM_VOS.pm b/lib/ExtUtils/MM_VOS.pm index 82f71ca..71b50f6 100644 --- a/lib/ExtUtils/MM_VOS.pm +++ b/lib/ExtUtils/MM_VOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_VOS; use strict; use vars qw($VERSION @ISA); -$VERSION = '0.02'; +$VERSION = '0.03'; require ExtUtils::MM_Unix; @ISA = qw(ExtUtils::MM_Unix); diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index 8e028b2..86777d3 100644 --- a/lib/ExtUtils/MM_Win32.pm +++ b/lib/ExtUtils/MM_Win32.pm @@ -29,7 +29,7 @@ use vars qw(@ISA $VERSION); require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -$VERSION = '1.12_02'; +$VERSION = '1.13'; $ENV{EMXSHELL} = 'sh'; # to run `commands` diff --git a/lib/ExtUtils/MM_Win95.pm b/lib/ExtUtils/MM_Win95.pm index ebc55e5..96cd76c 100644 --- a/lib/ExtUtils/MM_Win95.pm +++ b/lib/ExtUtils/MM_Win95.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_Win95; use vars qw($VERSION @ISA); -$VERSION = '0.04_02'; +$VERSION = '0.05'; require ExtUtils::MM_Win32; @ISA = qw(ExtUtils::MM_Win32); diff --git a/lib/ExtUtils/MY.pm b/lib/ExtUtils/MY.pm index 97ef42a..9c6a597 100644 --- a/lib/ExtUtils/MY.pm +++ b/lib/ExtUtils/MY.pm @@ -4,7 +4,7 @@ use strict; require ExtUtils::MM; use vars qw(@ISA $VERSION); -$VERSION = 0.01; +$VERSION = 0.02; @ISA = qw(ExtUtils::MM); { diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm index 0d18766..dbc5f8d 100644 --- a/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm @@ -1,4 +1,4 @@ -# $Id: /local/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 18035 2006-09-11T20:18:19.209066Z schwern $ +# $Id: /local/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 19606 2006-10-10T01:01:21.319714Z schwern $ package ExtUtils::MakeMaker; BEGIN {require 5.005_03;} @@ -21,8 +21,8 @@ use vars qw( use vars qw($Revision); use strict; -$VERSION = '6.30_04'; -($Revision) = q$Revision: 18035 $ =~ /Revision:\s+(\S+)/; +$VERSION = '6.31'; +($Revision) = q$Revision: 19606 $ =~ /Revision:\s+(\S+)/; @ISA = qw(Exporter); @EXPORT = qw(&WriteMakefile &writeMakefile $Verbose &prompt); @@ -2162,7 +2162,7 @@ MakeMaker object. The following lines will be parsed o.k.: $VERSION = '1.00'; *VERSION = \'1.01'; - $VERSION = (q$Revision: 18035 $) =~ /(\d+)/g; + $VERSION = (q$Revision: 19606 $) =~ /(\d+)/g; $FOO::VERSION = '1.10'; *FOO::VERSION = \'1.11'; our $VERSION = 1.2.3; # new for perl5.6.0 @@ -2561,8 +2561,15 @@ Same as the PERL_CORE parameter. The parameter overrides this. =head1 SEE ALSO -ExtUtils::MM_Unix, ExtUtils::Manifest ExtUtils::Install, -ExtUtils::Embed +L is a pure-Perl alternative to MakeMaker which does +not rely on make or any other external utility. It is easier to +extend to suit your needs. + +L is a wrapper around MakeMaker which adds features +not normally available. + +L and L are both modules to +help you setup your distribution. =head1 AUTHORS diff --git a/lib/ExtUtils/MakeMaker/Config.pm b/lib/ExtUtils/MakeMaker/Config.pm index 52ae800..e891298 100644 --- a/lib/ExtUtils/MakeMaker/Config.pm +++ b/lib/ExtUtils/MakeMaker/Config.pm @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::Config; -$VERSION = '0.02'; +$VERSION = '0.03'; use strict; use Config (); diff --git a/lib/ExtUtils/MakeMaker/bytes.pm b/lib/ExtUtils/MakeMaker/bytes.pm index 5a2bf75..bad9b62 100644 --- a/lib/ExtUtils/MakeMaker/bytes.pm +++ b/lib/ExtUtils/MakeMaker/bytes.pm @@ -1,7 +1,7 @@ package ExtUtils::MakeMaker::bytes; use vars qw($VERSION); -$VERSION = 0.01; +$VERSION = 0.02; my $Have_Bytes = eval q{require bytes; 1;}; diff --git a/lib/ExtUtils/MakeMaker/vmsish.pm b/lib/ExtUtils/MakeMaker/vmsish.pm index 3380956..7652e1e 100644 --- a/lib/ExtUtils/MakeMaker/vmsish.pm +++ b/lib/ExtUtils/MakeMaker/vmsish.pm @@ -1,7 +1,7 @@ package ExtUtils::MakeMaker::vmsish; use vars qw($VERSION); -$VERSION = 0.01; +$VERSION = 0.02; my $IsVMS = $^O eq 'VMS'; diff --git a/lib/ExtUtils/Mkbootstrap.pm b/lib/ExtUtils/Mkbootstrap.pm index 7ff0050..60896d6 100644 --- a/lib/ExtUtils/Mkbootstrap.pm +++ b/lib/ExtUtils/Mkbootstrap.pm @@ -1,6 +1,6 @@ package ExtUtils::Mkbootstrap; -$VERSION = '1.15_01'; +$VERSION = '1.16'; use Config; use Exporter; diff --git a/lib/ExtUtils/Mksymlists.pm b/lib/ExtUtils/Mksymlists.pm index 430110a..04b017a 100644 --- a/lib/ExtUtils/Mksymlists.pm +++ b/lib/ExtUtils/Mksymlists.pm @@ -11,7 +11,7 @@ use Config; use vars qw(@ISA @EXPORT $VERSION); @ISA = 'Exporter'; @EXPORT = '&Mksymlists'; -$VERSION = '1.19_01'; +$VERSION = '1.2'; sub Mksymlists { my(%spec) = @_; diff --git a/lib/ExtUtils/README b/lib/ExtUtils/README index 81bc190..9586c0b 100644 --- a/lib/ExtUtils/README +++ b/lib/ExtUtils/README @@ -32,8 +32,8 @@ Every stable MakeMaker release is tested at least on: MacOS X Linux/x86 -ActivePerl on Windows 98 -Cygwin on Windows 98 +ActivePerl on Windows +Cygwin OpenVMS Covering the major portability flavors MakeMaker has to cover. @@ -44,13 +44,14 @@ Known Problems: (See http://rt.cpan.org for a full list of open problems.) -ActivePerl likely broken if installed in C:\Program Files or other -prefix with a space in the name. +Windows will likely be broken if Perl is installed in C:\Program Files or +other prefix with a space in the name. Using the MMS utility on VMS causes lots of extra newlines. Unknown why this is so, might be a bug in MMS. Problem not seen with MMK. +GNU make does not work with MakeMaker on Windows. -See TODO for details. -Please report any bugs via http://rt.cpan.org or to makemaker@perl.org. +Please report any bugs via http://rt.cpan.org. +Send questions and discussion to makemaker@perl.org diff --git a/lib/ExtUtils/TODO b/lib/ExtUtils/TODO index 80c69f6..fe5a703 100644 --- a/lib/ExtUtils/TODO +++ b/lib/ExtUtils/TODO @@ -1,3 +1,6 @@ +This TODO list is out of date. See http://rt.cpan.org for the real list. + + Rethink MM_Win32 tests. Investigate one method per make target. diff --git a/lib/ExtUtils/t/basic.t b/lib/ExtUtils/t/basic.t index 8384d97..ba5a7ba 100644 --- a/lib/ExtUtils/t/basic.t +++ b/lib/ExtUtils/t/basic.t @@ -105,7 +105,9 @@ like( $ppd_html, qr{^\s*}m, ' ' ); like( $ppd_html, qr{^\s*}m, ' ' ); -like( $ppd_html, qr{^\s*}m, +my $archname = $Config{archname}; +$archname .= "-". substr($Config{version},0,3) if $] >= 5.008; +like( $ppd_html, qr{^\s*}m, ' '); like( $ppd_html, qr{^\s*}m, ' '); like( $ppd_html, qr{^\s*}m, ' '); diff --git a/lib/ExtUtils/testlib.pm b/lib/ExtUtils/testlib.pm index 043a6d4..fffaed1 100644 --- a/lib/ExtUtils/testlib.pm +++ b/lib/ExtUtils/testlib.pm @@ -1,5 +1,5 @@ package ExtUtils::testlib; -$VERSION = 1.15; +$VERSION = 1.16; use Cwd; use File::Spec;