Change 33006 by [EMAIL PROTECTED] on 2008/01/18 20:15:11
Integrate:
[ 31767]
Subject: [PATCH at 31761] RE: MakeMaker + static misbehaviour
From: "Konovalov, Vadim Vladimirovich \(Vadim\)** CTR **" <[EMAIL
PROTECTED]>
Date: Thu, 30 Aug 2007 08:11:04 +0200
Message-ID: <[EMAIL PROTECTED]>
[ 31768]
Need to bump MakeMaker's $VERSION too.
[ 31968]
DragonflyBSD is a BSD too
[ 31969]
Hey, but "or" is low-prec. So this statement never worked.
[ 32494]
Upgrade to ExtUtils::MakeMaker 6.37_02
[ 32517]
Upgrade to ExtUtils::MakeMaker 6.37_03
[ 32520]
Ignore .git directories
[ 32546]
Upgrade to ExtUtils::MakeMaker 6.38
[ 32585]
Upgrade to ExtUtils::MakeMaker 6.40.
[ 32600]
Upgrade to ExtUtils::MakeMaker 6.42
Affected files ...
... //depot/maint-5.8/perl/MANIFEST#414 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/Changes#17 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/Command/MM.pm#9 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/Liblist.pm#6 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/Liblist/Kid.pm#14 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MANIFEST.SKIP#9 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM.pm#8 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_AIX.pm#4 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_Any.pm#20 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_BeOS.pm#7 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_Cygwin.pm#9 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_DOS.pm#6 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_MacOS.pm#11 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_NW5.pm#11 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_OS2.pm#8 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_QNX.pm#4 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_UWIN.pm#6 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_Unix.pm#36 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_VMS.pm#20 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_VOS.pm#4 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_Win32.pm#18 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_Win95.pm#14 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MY.pm#4 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker.pm#26 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker/Config.pm#4 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker/bytes.pm#7 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker/vmsish.pm#7 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/Mkbootstrap.pm#4 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/Mksymlists.pm#4 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/PATCHING#6 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/t/MM_Unix.t#13 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/t/MM_VMS.t#4 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/t/WriteEmptyMakefile.t#2 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/t/basic.t#15 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/t/maketext_filter.t#1 branch
... //depot/maint-5.8/perl/lib/ExtUtils/t/parse_version.t#5 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/t/prereq.t#2 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/t/writemakefile_args.t#6 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/t/xs.t#2 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/testlib.pm#4 integrate
... //depot/maint-5.8/perl/t/lib/MakeMaker/Test/Setup/XS.pm#1 branch
Differences ...
==== //depot/maint-5.8/perl/MANIFEST#414 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#413~32545~ 2007-11-28 15:35:51.000000000 -0800
+++ perl/MANIFEST 2008-01-18 12:15:11.000000000 -0800
@@ -1542,6 +1542,7 @@
lib/ExtUtils/t/INST.t Check MakeMaker INST_* macros
lib/ExtUtils/t/Liblist.t See if ExtUtils::Liblist works
lib/ExtUtils/t/make.t See if make detection works
+lib/ExtUtils/t/maketext_filter.t See if maketext_filter works
lib/ExtUtils/t/Manifest.t See if ExtUtils::Manifest works
lib/ExtUtils/t/Mkbootstrap.t See if ExtUtils::Mkbootstrap works
lib/ExtUtils/t/MM_Any.t See if ExtUtils::MM_Any works
@@ -2834,6 +2835,7 @@
t/lib/MakeMaker/Test/Setup/PL_FILES.pm MakeMaker test utilities
t/lib/MakeMaker/Test/Setup/Problem.pm MakeMaker test utilities
t/lib/MakeMaker/Test/Setup/Recurs.pm MakeMaker test utilities
+t/lib/MakeMaker/Test/Setup/XS.pm MakeMaker test utilities
t/lib/MakeMaker/Test/Utils.pm MakeMaker test utilities
t/lib/Math/BigFloat/Subclass.pm Empty subclass of BigFloat for test
t/lib/Math/BigInt/BareCalc.pm Bigint's simulation of Calc
==== //depot/maint-5.8/perl/lib/ExtUtils/Changes#17 (text) ====
Index: perl/lib/ExtUtils/Changes
--- perl/lib/ExtUtils/Changes#16~30299~ 2007-02-14 13:31:37.000000000 -0800
+++ perl/lib/ExtUtils/Changes 2008-01-18 12:15:11.000000000 -0800
@@ -1,3 +1,156 @@
+6.42 Fri Dec 7 17:00:14 PST 2007
+ Bug Fixes
+ - 6.33 moved PREREQ_FATAL to happen after CONFIGURE. This meant if
+ your CONFIGURE use a prereq it would fail and no PREREQ_FATAL
+ message would be displayed.
+ - Put the "nicetext" functionality back, VMS needs it to deal with
+ other people's custom make. But rename it to the more
+ accurate maketext_filter(), test it and fix a bug where it would
+ stop processing if it saw a macro declaration.
+
+6.40 Thu Dec 6 03:00:47 PST 2007
+ Bug Fixes
+ - Remove the dubious nicetext() Makefile formatting hack to account for
+ a lack of space between the target and colon needed on VMS. This
+ interfered with META.yml creation on VMS and possibly other output.
+ - Fix the remaining targets which don't have a space between the target
+ and the colon.
+
+6.38 Wed Nov 28 16:01:12 PST 2007
+ Releasing 6.37_03 as 6.38.
+
+6.37_03 Mon Nov 26 14:15:34 PST 2007
+ Tests
+ - parse_version.t had wrong test count when version.pm isn't installed.
+ - Fixed some warnings in the XS module we're using for testing.
+ - "our $VERSION" test in parse_version.t was never running
+ - Quoting uses of 1.2.3 style versions in parse_version.t to protect
+ older perls.
+
+ Portability
+ - Moved the minimum required version up to 5.6.0.
+
+6.37_02 Sun Nov 25 23:33:14 PST 2007
+ Test Improvements
+ - Added a test for a basic XS build.
+
+ Bug Fixes
+ - A refactoring in 6.37_01 broke XS compilation.
+
+6.37_01 Sun Nov 25 17:05:53 PST 2007
+ Improvements
+ - Upgraded the META.yml to version 1.3 of the spec (which really
+ doesn't change anything). Thanks bdfoy.
+ - MakeMaker now always includes the required 'author' field in
+ the META.yml even if it's undef to comply with the META.yml spec.
+ - Updated ExtUtils-Install to latest version (1.44)
+ - Unified the version numbers of all modules.
+
+ Test Fixes
+ - cd() test on VMS used non-native paths. [bleadperl 31534]
+ - Removed uses of "no_plan" in tests to remain compatible with
+ old versions of Test::Harness.
+ - writemakefile_args.t had the wrong test count if version.pm isn't
+ installed.
+
+ Bug Fixes
+ - $VERSION detection code would be confused by "sub version"
+ [rt.cpan.org 30747]
+ - LINKTYPE=static will now be propagated to child builds.
+ [bleadperl 31761]
+
+ Portability Fixes
+ - Add "dragonfly" to the list of BSDish operating systems
+ - BSD detection code would not pick up bsdos or internix
+ - Fix detection of shared libperl on NetBSD [bleadperl 31526]
+
+
+6.36 Tue Jul 3 01:06:40 PDT 2007
+ Test Fixes
+ - version.pm prior to 0.7203 caused Foo->VERSION to reformat
+ $Foo::VERSION. This caused prereq.t to fail.
+
+6.35 Sun Jul 1 20:53:38 PDT 2007
+ New Features
+ * MakeMaker will now try to "use version" before parsing $VERSION.
+ This allows "$VERSION = qv(1.2.3)" to work.
+
+ Test Fixes
+ - writemakefile_args.t now works with older versions of version.pm
+
+6.34 Sat Jun 30 11:06:54 CDT 2007
+ Test Fixes
+ - Accidentally hard coded the version of strict.pm [rt.cpan.org 27838]
+
+6.33 Fri Jun 29 17:15:34 CDT 2007
+ New Features
+ * VERSION now accepts version objects without warning.
+ [rt.cpan.org 26075]
+
+ Bug Fixes
+ - Properly not installing MANIFEST.SKIP when ExtUtils::Manifest is not
+ being installed. [rt.cpan.org 21318]
+ - fixin() no longer clobbers $/ [rt.cpan.org 26234]
+ - Fixed bug finding cross-compiled perls [bleadperl 31404]
+ - Looking up to 8 levels up to find uninstalled perls
+ [bleadperl 30932]
+ * A test failure in a sub-project would not cause "make test" to
+ fail. [rt.cpan.org 27804]
+
+ Windows
+ - Embed manifest files in EXEs and DLLs when building with VC++ 8.x
+ [bleadperl #29266] [rt.cpan.org 26208]
+ - Improved the subdir command code so DIR can do more than one level
+ down. [rt.cpan.org 25180]
+ - Fix static builds on Win32 by using -DPERLDLL [bleadperl 31229]
+
+ VMS
+ - Use linker flags rather than compiler flags to determine if the
+ perl sharable image was linked debug. This keeps OPTIMIZE from
+ confusing things. [rt.cpan.org 25268]
+ - Accidental use of $\ in a regex. [bleadperl 30521]
+
+ BSD
+ - If calling perl causes MakeMaker to emit warnings, then it
+ cannot find the location of its binary. [rt.cpan.org 23178]
+
+ Doc Improvements
+ - Typo fixes. $(TOUNIX) -> $(TO_UNIX). [rt.cpan.org 23495]
+ - The example for setting $VERSION from $Revision$ in SVN was
+ incorrect. (Thanks to [EMAIL PROTECTED]) [rt.cpan.org 26995]
+ - Document what's wrong with PREFIX and what to use instead.
+ [rt.cpan.org 12919]
+ - Improve the PREREQ_FATAL docs to make it really clear that you
+ do NOT want to use this!
+
+ Misc
+ - Provide information during the install about whether we're using the
+ installed or provided dependency (ie. ExtUtils::Command).
+ - Updated included versions of ExtUtils::Manifest and Command.
+ - Add .bak and .old to veryclean [rt.cpan.org 21284]
+ - Improved the PREREQ_FATAL message.
+
+6.32 Wed Feb 21 07:59:57 PST 2007
+ New Features
+ - WriteEmptyMakefile() is now exportable upon request.
+
+ Bug Fixes
+ - Set binmode() when writing to files in Command.t for operating
+ systems which need that sort of thing. [bleadperl #29578]
+ - Fixed a minor duplication in manifypod_target(). [rt.cpan.org 22149]
+
+ Test Fixes
+ - The build_man.t test would fail if your Perl is configured to not
+ generate man pages ($Config{installman3dir} is set to none).
+
+ Doc Improvements
+ - Made the home dir install examples a little more friendly to non-Unix
+ folks.
+
+ Misc
+ - miniperl no longer has the Win32 functions.
+ - Turn on "use strict" where it was missing.
+
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,
==== //depot/maint-5.8/perl/lib/ExtUtils/Command/MM.pm#9 (text) ====
Index: perl/lib/ExtUtils/Command/MM.pm
--- perl/lib/ExtUtils/Command/MM.pm#8~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/Command/MM.pm 2008-01-18 12:15:11.000000000 -0800
@@ -9,7 +9,7 @@
@EXPORT = qw(test_harness pod2man perllocal_install uninstall
warn_if_old_packlist);
-$VERSION = '0.07';
+$VERSION = '6.42';
my $Is_VMS = $^O eq 'VMS';
==== //depot/maint-5.8/perl/lib/ExtUtils/Liblist.pm#6 (text) ====
Index: perl/lib/ExtUtils/Liblist.pm
--- perl/lib/ExtUtils/Liblist.pm#5~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/Liblist.pm 2008-01-18 12:15:11.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = '1.03';
+$VERSION = '6.42';
use File::Spec;
require ExtUtils::Liblist::Kid;
==== //depot/maint-5.8/perl/lib/ExtUtils/Liblist/Kid.pm#14 (text) ====
Index: perl/lib/ExtUtils/Liblist/Kid.pm
--- perl/lib/ExtUtils/Liblist/Kid.pm#13~32320~ 2007-11-14 16:09:26.000000000
-0800
+++ perl/lib/ExtUtils/Liblist/Kid.pm 2008-01-18 12:15:11.000000000 -0800
@@ -10,7 +10,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = 1.33;
+$VERSION = 6.42;
use Config;
use Cwd 'cwd';
==== //depot/maint-5.8/perl/lib/ExtUtils/MM.pm#8 (text) ====
Index: perl/lib/ExtUtils/MM.pm
--- perl/lib/ExtUtils/MM.pm#7~30744~ 2007-03-24 05:22:39.000000000 -0700
+++ perl/lib/ExtUtils/MM.pm 2008-01-18 12:15:11.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use ExtUtils::MakeMaker::Config;
use vars qw(@ISA $VERSION);
-$VERSION = '0.07';
+$VERSION = '6.42';
require ExtUtils::Liblist;
require ExtUtils::MakeMaker;
@@ -43,18 +43,19 @@
sub DESTROY {}
}
+sub _is_win95 {
+ # miniperl might not have the Win32 functions available and we need
+ # to run in miniperl.
+ return defined &Win32::IsWin95 ? Win32::IsWin95()
+ : ! defined $ENV{SYSTEMROOT};
+}
+
my %Is = ();
$Is{VMS} = $^O eq 'VMS';
$Is{OS2} = $^O eq 'os2';
$Is{MacOS} = $^O eq 'MacOS';
if( $^O eq 'MSWin32' ) {
- if (defined &DynaLoader::boot_DynaLoader) {
- Win32::IsWin95() ? $Is{Win95} = 1 : $Is{Win32} = 1;
- }
- else {
- # Can't use Win32::* with miniperl
- !(defined $ENV{SYSTEMROOT}) ? $Is{Win95} = 1 : $Is{Win32} = 1;
- }
+ _is_win95() ? $Is{Win95} = 1 : $Is{Win32} = 1;
}
$Is{UWIN} = $^O =~ /^uwin(-nt)?$/;
$Is{Cygwin} = $^O eq 'cygwin';
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_AIX.pm#4 (text) ====
Index: perl/lib/ExtUtils/MM_AIX.pm
--- perl/lib/ExtUtils/MM_AIX.pm#3~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_AIX.pm 2008-01-18 12:15:11.000000000 -0800
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = '0.05';
+$VERSION = '6.42';
require ExtUtils::MM_Unix;
@ISA = qw(ExtUtils::MM_Unix);
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_Any.pm#20 (text) ====
Index: perl/lib/ExtUtils/MM_Any.pm
--- perl/lib/ExtUtils/MM_Any.pm#19~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_Any.pm 2008-01-18 12:15:11.000000000 -0800
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = '0.15';
+$VERSION = '6.42';
use Carp;
use File::Spec;
@@ -236,6 +236,24 @@
}
+=head3 maketext_filter
+
+ my $filter_make_text = $mm->maketext_filter($make_text);
+
+The text of the Makefile is run through this method before writing to
+disk. It allows systems a chance to make portability fixes to the
+Makefile.
+
+By default it does nothing.
+
+This method is protected and not intended to be called outside of
+MakeMaker.
+
+=cut
+
+sub maketext_filter { return $_[1] }
+
+
=head3 cd I<Abstract>
my $subdir_cmd = $MM->cd($subdir, @cmds);
@@ -648,7 +666,7 @@
sub makemakerdflt_target {
return <<'MAKE_FRAG';
-makemakerdflt: all
+makemakerdflt : all
$(NOECHO) $(NOOP)
MAKE_FRAG
@@ -711,7 +729,7 @@
my $self = shift;
return <<'MAKE_FRAG' if $self->{NO_META};
-metafile:
+metafile :
$(NOECHO) $(NOOP)
MAKE_FRAG
@@ -721,12 +739,17 @@
$prereq_pm .= sprintf "\n %-30s %s", "$mod:", $ver;
}
+ my $author_value = defined $self->{AUTHOR}
+ ? "\n - $self->{AUTHOR}"
+ : undef;
+
# Use a list to preserve order.
my @meta_to_mm = (
name => $self->{DISTNAME},
version => $self->{VERSION},
abstract => $self->{ABSTRACT},
license => $self->{LICENSE},
+ author => $author_value,
generated_by =>
"ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION",
distribution_type => $self->{PM} ? 'module' : 'script',
@@ -745,13 +768,8 @@
$meta .= <<"YAML";
requires: $prereq_pm
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
-YAML
-
- $meta .= <<"YAML" if defined $self->{AUTHOR};
-author:
- - $self->{AUTHOR}
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
YAML
$meta .= $self->{EXTRA_META} if $self->{EXTRA_META};
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_BeOS.pm#7 (text) ====
Index: perl/lib/ExtUtils/MM_BeOS.pm
--- perl/lib/ExtUtils/MM_BeOS.pm#6~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_BeOS.pm 2008-01-18 12:15:11.000000000 -0800
@@ -27,7 +27,7 @@
use vars qw(@ISA $VERSION);
@ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-$VERSION = '1.07';
+$VERSION = '6.42';
=item os_flavor
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_Cygwin.pm#9 (text) ====
Index: perl/lib/ExtUtils/MM_Cygwin.pm
--- perl/lib/ExtUtils/MM_Cygwin.pm#8~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_Cygwin.pm 2008-01-18 12:15:11.000000000 -0800
@@ -10,7 +10,7 @@
require ExtUtils::MM_Unix;
@ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-$VERSION = '1.1';
+$VERSION = '6.42';
=head1 NAME
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_DOS.pm#6 (text) ====
Index: perl/lib/ExtUtils/MM_DOS.pm
--- perl/lib/ExtUtils/MM_DOS.pm#5~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_DOS.pm 2008-01-18 12:15:11.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = 0.04;
+$VERSION = 6.42;
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_MacOS.pm#11 (text) ====
Index: perl/lib/ExtUtils/MM_MacOS.pm
--- perl/lib/ExtUtils/MM_MacOS.pm#10~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_MacOS.pm 2008-01-18 12:15:11.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = 1.1;
+$VERSION = 6.42;
sub new {
die <<'UNSUPPORTED';
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_NW5.pm#11 (text) ====
Index: perl/lib/ExtUtils/MM_NW5.pm
--- perl/lib/ExtUtils/MM_NW5.pm#10~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_NW5.pm 2008-01-18 12:15:11.000000000 -0800
@@ -23,7 +23,7 @@
use File::Basename;
use vars qw(@ISA $VERSION);
-$VERSION = '2.1';
+$VERSION = '6.42';
require ExtUtils::MM_Win32;
@ISA = qw(ExtUtils::MM_Win32);
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_OS2.pm#8 (text) ====
Index: perl/lib/ExtUtils/MM_OS2.pm
--- perl/lib/ExtUtils/MM_OS2.pm#7~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_OS2.pm 2008-01-18 12:15:11.000000000 -0800
@@ -6,7 +6,7 @@
use ExtUtils::MakeMaker qw(neatvalue);
use File::Spec;
-$VERSION = '1.07';
+$VERSION = '6.42';
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_QNX.pm#4 (text) ====
Index: perl/lib/ExtUtils/MM_QNX.pm
--- perl/lib/ExtUtils/MM_QNX.pm#3~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_QNX.pm 2008-01-18 12:15:11.000000000 -0800
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = '0.04';
+$VERSION = '6.42';
require ExtUtils::MM_Unix;
@ISA = qw(ExtUtils::MM_Unix);
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_UWIN.pm#6 (text) ====
Index: perl/lib/ExtUtils/MM_UWIN.pm
--- perl/lib/ExtUtils/MM_UWIN.pm#5~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_UWIN.pm 2008-01-18 12:15:11.000000000 -0800
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = 0.04;
+$VERSION = 6.42;
require ExtUtils::MM_Unix;
@ISA = qw(ExtUtils::MM_Unix);
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_Unix.pm#36 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm#35~32421~ 2007-11-20 07:23:54.000000000
-0800
+++ perl/lib/ExtUtils/MM_Unix.pm 2008-01-18 12:15:11.000000000 -0800
@@ -18,7 +18,7 @@
use ExtUtils::MakeMaker qw($Verbose neatvalue);
-$VERSION = '1.54_01';
+$VERSION = '6.42';
require ExtUtils::MM_Any;
@ISA = qw(ExtUtils::MM_Any);
@@ -35,8 +35,9 @@
$Is_SunOS4 = $^O eq 'sunos';
$Is_Solaris = $^O eq 'solaris';
$Is_SunOS = $Is_SunOS4 || $Is_Solaris;
- $Is_BSD = $^O =~ /^(?:free|net|open)bsd$/ or
- $^O eq 'bsdos' or $^O eq 'interix';
+ $Is_BSD = ($^O =~ /^(?:free|net|open)bsd$/ or
+ grep( $^O eq $_, qw(bsdos interix dragonfly) )
+ );
}
BEGIN {
@@ -129,37 +130,42 @@
my($self) = shift;
return '' unless $self->needs_linking();
my(@m);
+
+ my $command = '$(CCCMD)';
+ my $flags = '$(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE)';
+
if (my $cpp = $Config{cpprun}) {
my $cpp_cmd = $self->const_cccmd;
$cpp_cmd =~ s/^CCCMD\s*=\s*\$\(CC\)/$cpp/;
- push @m, '
+ push @m, qq{
.c.i:
- '. $cpp_cmd . ' $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE)
$(DEFINE) $*.c > $*.i
-';
+ $cpp_cmd $flags \$*.c > \$*.i
+};
}
- push @m, '
+
+ push @m, qq{
.c.s:
- $(CCCMD) -S $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE)
$*.c
-';
- push @m, '
-.c$(OBJ_EXT):
- $(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.c
-';
- push @m, '
-.C$(OBJ_EXT):
- $(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.C
-' if !$Is_OS2 and !$Is_Win32 and !$Is_Dos; #Case-specific
- push @m, '
-.cpp$(OBJ_EXT):
- $(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE)
$*.cpp
+ $command -S $flags \$*.c
-.cxx$(OBJ_EXT):
- $(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE)
$*.cxx
+.c\$(OBJ_EXT):
+ $command $flags \$*.c
-.cc$(OBJ_EXT):
- $(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.cc
-';
- join "", @m;
+.cpp\$(OBJ_EXT):
+ $command $flags \$*.cpp
+
+.cxx\$(OBJ_EXT):
+ $command $flags \$*.cxx
+
+.cc\$(OBJ_EXT):
+ $command $flags \$*.cc
+};
+
+ push @m, qq{
+.C\$(OBJ_EXT):
+ $command \$*.C
+} if !$Is_OS2 and !$Is_Win32 and !$Is_Dos; #Case-specific
+
+ return join "", @m;
}
=item cflags (o)
@@ -1192,7 +1198,7 @@
sub force {
my($self) = shift;
'# Phony target to force checking subdirectories.
-FORCE:
+FORCE :
$(NOECHO) $(NOOP)
';
}
@@ -2533,7 +2539,7 @@
push @m, q{
-doc_inst_perl:
+doc_inst_perl :
$(NOECHO) $(ECHO) Appending installation info to
$(DESTINSTALLARCHLIB)/perllocal.pod
-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
-$(NOECHO) $(DOC_INSTALL) \
@@ -2546,9 +2552,9 @@
};
push @m, q{
-inst_perl: pure_inst_perl doc_inst_perl
+inst_perl : pure_inst_perl doc_inst_perl
-pure_inst_perl: $(MAP_TARGET)
+pure_inst_perl : $(MAP_TARGET)
}.$self->{CP}.q{ $(MAP_TARGET)
}.$self->catfile('$(DESTINSTALLBIN)','$(MAP_TARGET)').q{
clean :: map_clean
@@ -2640,22 +2646,6 @@
return $self->{NEEDS_LINKING} = 0;
}
-=item nicetext
-
-misnamed method (will have to be changed). The MM_Unix method just
-returns the argument without further processing.
-
-On VMS used to insure that colons marking targets are preceded by
-space - most Unix Makes don't need this, but it's necessary under VMS
-to distinguish the target delimiter from a colon appearing as part of
-a filespec.
-
-=cut
-
-sub nicetext {
- my($self,$text) = @_;
- $text;
-}
=item parse_abstract
@@ -2708,27 +2698,32 @@
open(FH,$parsefile) or die "Could not open '$parsefile': $!";
my $inpod = 0;
while (<FH>) {
- $inpod = /^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $inpod;
- next if $inpod || /^\s*#/;
- chop;
- next unless /(?<!\\)([\$*])(([\w\:\']*)\bVERSION)\b.*\=/;
- my $eval = qq{
- package ExtUtils::MakeMaker::_version;
- no strict;
- BEGIN { eval {
- require version;
- "version"->import;
- } }
-
- local $1$2;
- \$$2=undef; do {
- $_
- }; \$$2
- };
+ $inpod = /^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $inpod;
+ next if $inpod || /^\s*#/;
+ chop;
+ next unless /(?<!\\)([\$*])(([\w\:\']*)\bVERSION)\b.*\=/;
+ my $eval = qq{
+ package ExtUtils::MakeMaker::_version;
+ no strict;
+ BEGIN { eval {
+ # Ensure any version() routine which might have leaked
+ # into this package has been deleted. Interferes with
+ # version->import()
+ undef *version;
+ require version;
+ "version"->import;
+ } }
+
+ local $1$2;
+ \$$2=undef;
+ do {
+ $_
+ }; \$$2
+ };
local $^W = 0;
- $result = eval($eval);
- warn "Could not eval '$eval' in $parsefile: $@" if $@;
- last;
+ $result = eval($eval);
+ warn "Could not eval '$eval' in $parsefile: $@" if $@;
+ last;
}
close FH;
@@ -3027,7 +3022,7 @@
return sprintf <<'PPD_OUT', join "\n\t", @ppd_cmds;
# Creates a PPD (Perl Package Description) for a binary distribution.
-ppd:
+ppd :
%s
PPD_OUT
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_VMS.pm#20 (text) ====
Index: perl/lib/ExtUtils/MM_VMS.pm
--- perl/lib/ExtUtils/MM_VMS.pm#19~32320~ 2007-11-14 16:09:26.000000000
-0800
+++ perl/lib/ExtUtils/MM_VMS.pm 2008-01-18 12:15:11.000000000 -0800
@@ -18,7 +18,7 @@
# $Revision can't be on the same line or SVN/K gets confused
use vars qw($Revision
$VERSION @ISA);
-$VERSION = '5.76';
+$VERSION = '6.42';
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
@@ -1571,10 +1571,10 @@
join '', @m;
}
-
+
# --- Output postprocessing section ---
-=item nicetext (override)
+=item maketext_filter (override)
Insure that colons marking targets are preceded by space, in order
to distinguish the target delimiter from a colon appearing as
@@ -1582,11 +1582,11 @@
=cut
-sub nicetext {
- my($self,$text) = @_;
- return $text if $text =~ m/^\w+\s*=/; # leave macro defs alone
- $text =~ s/([^\s:])(:+\s)/$1 $2/gs;
- $text;
+sub maketext_filter {
+ my($self, $text) = @_;
+
+ $text =~ s/^([^\s:=]+)(:+\s)/$1 $2/mg;
+ return $text;
}
=item prefixify (override)
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_VOS.pm#4 (text) ====
Index: perl/lib/ExtUtils/MM_VOS.pm
--- perl/lib/ExtUtils/MM_VOS.pm#3~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_VOS.pm 2008-01-18 12:15:11.000000000 -0800
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = '0.04';
+$VERSION = '6.42';
require ExtUtils::MM_Unix;
@ISA = qw(ExtUtils::MM_Unix);
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_Win32.pm#18 (text) ====
Index: perl/lib/ExtUtils/MM_Win32.pm
--- perl/lib/ExtUtils/MM_Win32.pm#17~32320~ 2007-11-14 16:09:26.000000000
-0800
+++ perl/lib/ExtUtils/MM_Win32.pm 2008-01-18 12:15:11.000000000 -0800
@@ -29,7 +29,7 @@
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
@ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-$VERSION = '1.15';
+$VERSION = '6.42';
$ENV{EMXSHELL} = 'sh'; # to run `commands`
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_Win95.pm#14 (text) ====
Index: perl/lib/ExtUtils/MM_Win95.pm
--- perl/lib/ExtUtils/MM_Win95.pm#13~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/MM_Win95.pm 2008-01-18 12:15:11.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = '0.06';
+$VERSION = '6.42';
require ExtUtils::MM_Win32;
@ISA = qw(ExtUtils::MM_Win32);
==== //depot/maint-5.8/perl/lib/ExtUtils/MY.pm#4 (text) ====
Index: perl/lib/ExtUtils/MY.pm
--- perl/lib/ExtUtils/MY.pm#3~30744~ 2007-03-24 05:22:39.000000000 -0700
+++ perl/lib/ExtUtils/MY.pm 2008-01-18 12:15:11.000000000 -0800
@@ -4,7 +4,7 @@
require ExtUtils::MM;
use vars qw(@ISA $VERSION);
-$VERSION = 0.03;
+$VERSION = 6.42;
@ISA = qw(ExtUtils::MM);
{
==== //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker.pm#26 (text) ====
Index: perl/lib/ExtUtils/MakeMaker.pm
--- perl/lib/ExtUtils/MakeMaker.pm#25~32320~ 2007-11-14 16:09:26.000000000
-0800
+++ perl/lib/ExtUtils/MakeMaker.pm 2008-01-18 12:15:11.000000000 -0800
@@ -1,4 +1,4 @@
-# $Id:
/mirror/svn.schwern.org/CPAN/ExtUtils-MakeMaker/trunk/lib/ExtUtils/MakeMaker.pm
32261 2007-07-03T08:08:29.826721Z schwern $
+# $Id:
/mirror/svn.schwern.org/CPAN/ExtUtils-MakeMaker/trunk/lib/ExtUtils/MakeMaker.pm
41145 2007-12-08T01:01:11.051959Z schwern $
package ExtUtils::MakeMaker;
BEGIN {require 5.005_03;}
@@ -21,8 +21,8 @@
use vars qw($Revision);
use strict;
-$VERSION = '6.36';
-($Revision) = q$Revision: 32261 $ =~ /Revision:\s+(\S+)/;
+$VERSION = '6.42';
+($Revision) = q$Revision: 41145 $ =~ /Revision:\s+(\S+)/;
@ISA = qw(Exporter);
@EXPORT = qw(&WriteMakefile &writeMakefile $Verbose &prompt);
@@ -425,6 +425,18 @@
$self->{PREREQ_PM}->{$prereq} : 'unknown version' ;
}
}
+
+ if (%unsatisfied && $self->{PREREQ_FATAL}){
+ my $failedprereqs = join "\n", map {" $_ $unsatisfied{$_}"}
+ sort { $a cmp $b } keys %unsatisfied;
+ die <<"END";
+MakeMaker FATAL: prerequisites not found.
+$failedprereqs
+
+Please install these modules first and rerun 'perl Makefile.PL'.
+END
+ }
+
if (defined $self->{CONFIGURE}) {
if (ref $self->{CONFIGURE} eq 'CODE') {
%configure_att = %{&{$self->{CONFIGURE}}};
@@ -480,7 +492,7 @@
}
if ($self->{PARENT}) {
$self->{PARENT}->{CHILDREN}->{$newclass} = $self;
- foreach my $opt (qw(POLLUTE PERL_CORE)) {
+ foreach my $opt (qw(POLLUTE PERL_CORE LINKTYPE)) {
if (exists $self->{PARENT}->{$opt}
and not exists $self->{$opt})
{
@@ -494,16 +506,6 @@
} else {
parse_args($self,split(' ', $ENV{PERL_MM_OPT} || ''),@ARGV);
}
- if (%unsatisfied && $self->{PREREQ_FATAL}){
- my $failedprereqs = join "\n", map {" $_ $unsatisfied{$_}"}
- sort { $a cmp $b } keys %unsatisfied;
- die <<"END";
-MakeMaker FATAL: prerequisites not found.
-$failedprereqs
-
-Please install these modules first and rerun 'perl Makefile.PL'.
-END
- }
$self->{NAME} ||= $self->guess_name;
@@ -635,7 +637,9 @@
my(%a) = %{$self->{$section} || {}};
push @{$self->{RESULT}}, "\n# --- MakeMaker $section section:";
push @{$self->{RESULT}}, "# " . join ", ", %a if $Verbose && %a;
- push @{$self->{RESULT}}, $self->nicetext($self->$method( %a ));
+ push @{$self->{RESULT}}, $self->maketext_filter(
+ $self->$method( %a )
+ );
}
}
@@ -660,15 +664,15 @@
}
open MF, '>'.$new or die "open $new for write: $!";
print MF <<'EOP';
-all:
+all :
-clean:
+clean :
-install:
+install :
-makemakerdflt:
+makemakerdflt :
-test:
+test :
EOP
close MF or die "close $new for write: $!";
@@ -2188,7 +2192,7 @@
$VERSION = '1.00';
*VERSION = \'1.01';
- ($VERSION) = q$Revision: 32261 $ =~ /(\d+)/g;
+ ($VERSION) = q$Revision: 41145 $ =~ /(\d+)/g;
$FOO::VERSION = '1.10';
*FOO::VERSION = \'1.11';
our $VERSION = 1.2.3; # new for perl5.6.0
==== //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker/Config.pm#4 (text) ====
Index: perl/lib/ExtUtils/MakeMaker/Config.pm
--- perl/lib/ExtUtils/MakeMaker/Config.pm#3~30744~ 2007-03-24
05:22:39.000000000 -0700
+++ perl/lib/ExtUtils/MakeMaker/Config.pm 2008-01-18 12:15:11.000000000
-0800
@@ -1,6 +1,6 @@
package ExtUtils::MakeMaker::Config;
-$VERSION = '0.04';
+$VERSION = '6.42';
use strict;
use Config ();
==== //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker/bytes.pm#7 (text) ====
Index: perl/lib/ExtUtils/MakeMaker/bytes.pm
--- perl/lib/ExtUtils/MakeMaker/bytes.pm#6~30744~ 2007-03-24
05:22:39.000000000 -0700
+++ perl/lib/ExtUtils/MakeMaker/bytes.pm 2008-01-18 12:15:11.000000000
-0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = 0.03;
+$VERSION = 6.42;
my $Have_Bytes = eval q{require bytes; 1;};
==== //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker/vmsish.pm#7 (text) ====
Index: perl/lib/ExtUtils/MakeMaker/vmsish.pm
--- perl/lib/ExtUtils/MakeMaker/vmsish.pm#6~30744~ 2007-03-24
05:22:39.000000000 -0700
+++ perl/lib/ExtUtils/MakeMaker/vmsish.pm 2008-01-18 12:15:11.000000000
-0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = 0.03;
+$VERSION = 6.42;
my $IsVMS = $^O eq 'VMS';
==== //depot/maint-5.8/perl/lib/ExtUtils/Mkbootstrap.pm#4 (text) ====
Index: perl/lib/ExtUtils/Mkbootstrap.pm
--- perl/lib/ExtUtils/Mkbootstrap.pm#3~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/Mkbootstrap.pm 2008-01-18 12:15:11.000000000 -0800
@@ -4,7 +4,7 @@
use strict 'refs';
use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '1.17';
+$VERSION = '6.42';
require Exporter;
@ISA = ('Exporter');
==== //depot/maint-5.8/perl/lib/ExtUtils/Mksymlists.pm#4 (text) ====
Index: perl/lib/ExtUtils/Mksymlists.pm
--- perl/lib/ExtUtils/Mksymlists.pm#3~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/Mksymlists.pm 2008-01-18 12:15:11.000000000 -0800
@@ -11,7 +11,7 @@
use vars qw(@ISA @EXPORT $VERSION);
@ISA = 'Exporter';
@EXPORT = '&Mksymlists';
-$VERSION = '1.21';
+$VERSION = '6.42';
sub Mksymlists {
my(%spec) = @_;
==== //depot/maint-5.8/perl/lib/ExtUtils/PATCHING#6 (text) ====
Index: perl/lib/ExtUtils/PATCHING
--- perl/lib/ExtUtils/PATCHING#5~30299~ 2007-02-14 13:31:37.000000000 -0800
+++ perl/lib/ExtUtils/PATCHING 2008-01-18 12:15:11.000000000 -0800
@@ -106,7 +106,7 @@
- MakeMaker must be backwards compatible to 5.5.4 (5.005_04). Avoid any
obvious 5.6-isms (threads, warnings.pm, Unicode, our, v1.2.3, attributes
- open my $fh, lvalue subroutines, any new core modules, etc...).
+ open my $fh, lvalue subroutines, qr//, any new core modules, etc...).
- MakeMaker should avoid having module dependencies. Avoid using modules
which didn't come with 5.5.4 and avoid using features from newer
@@ -126,7 +126,7 @@
and MMK to name the most common. Keep your make code as simple as
possible.
-- Avoid special variables (even $@).
+- Avoid special make variables (even $@).
- Format targets as "target : dependency", the spacing is important.
==== //depot/maint-5.8/perl/lib/ExtUtils/t/MM_Unix.t#13 (text) ====
Index: perl/lib/ExtUtils/t/MM_Unix.t
--- perl/lib/ExtUtils/t/MM_Unix.t#12~32320~ 2007-11-14 16:09:26.000000000
-0800
+++ perl/lib/ExtUtils/t/MM_Unix.t 2008-01-18 12:15:11.000000000 -0800
@@ -18,7 +18,7 @@
plan skip_all => 'Non-Unix platform';
}
else {
- plan tests => 110;
+ plan tests => 109;
}
}
@@ -37,9 +37,7 @@
+ ($ExtUtils::MM_Unix::Is_VMS || 0);
ok ( $os <= 1, 'There can be only one (or none)');
-my $version = $ExtUtils::MM_Unix::VERSION;
- $version =~ s/_//g;
-cmp_ok ($version, '>=', '1.12606', 'Should be at least version 1.12606');
+cmp_ok ($ExtUtils::MM_Unix::VERSION, '>=', '1.12606', 'Should be at least
version 1.12606');
# when the following calls like canonpath, catdir etc are replaced by
# File::Spec calls, the test's become a bit pointless
@@ -178,11 +176,6 @@
ok ($t->maybe_command('command'), "executable file is a command");
unlink "command";
-###############################################################################
-# nicetext (dummy method)
-
-is ($t->nicetext('LOTR'),'LOTR','nicetext');
-
###############################################################################
# perl_script (on unix any ordinary, readable file)
==== //depot/maint-5.8/perl/lib/ExtUtils/t/MM_VMS.t#4 (text) ====
Index: perl/lib/ExtUtils/t/MM_VMS.t
--- perl/lib/ExtUtils/t/MM_VMS.t#3~20349~ 2003-07-30 06:38:17.000000000
-0700
+++ perl/lib/ExtUtils/t/MM_VMS.t 2008-01-18 12:15:11.000000000 -0800
@@ -56,7 +56,6 @@
test_via_harness
test_via_script
makeaperl
- nicetext
));
}
==== //depot/maint-5.8/perl/lib/ExtUtils/t/WriteEmptyMakefile.t#2 (text) ====
Index: perl/lib/ExtUtils/t/WriteEmptyMakefile.t
--- perl/lib/ExtUtils/t/WriteEmptyMakefile.t#1~32320~ 2007-11-14
16:09:26.000000000 -0800
+++ perl/lib/ExtUtils/t/WriteEmptyMakefile.t 2008-01-18 12:15:11.000000000
-0800
@@ -15,7 +15,7 @@
chdir 't';
use strict;
-use Test::More 'no_plan';
+use Test::More tests => 5;
use ExtUtils::MakeMaker qw(WriteEmptyMakefile);
use TieOut;
==== //depot/maint-5.8/perl/lib/ExtUtils/t/basic.t#15 (text) ====
Index: perl/lib/ExtUtils/t/basic.t
--- perl/lib/ExtUtils/t/basic.t#14~32320~ 2007-11-14 16:09:26.000000000
-0800
+++ perl/lib/ExtUtils/t/basic.t 2008-01-18 12:15:11.000000000 -0800
@@ -15,6 +15,7 @@
use strict;
use Config;
+use ExtUtils::MakeMaker;
use Test::More tests => 83;
use MakeMaker::Test::Utils;
@@ -250,10 +251,26 @@
ok( !-e "META_new.yml", 'temp META.yml file not left around' );
ok open META, $meta_yml or diag $!;
-my @meta = <META>;
-like $meta[-1], '/\n$/', "META.yml ends with a newline";
+my $meta = join '', <META>;
ok close META;
+is $meta, <<"END";
+--- #YAML:1.0
+name: Big-Dummy
+version: 0.01
+abstract: Try "our" hot dog's
+license: ~
+author:
+ - Michael G Schwern <[EMAIL PROTECTED]>
+generated_by: ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION
+distribution_type: module
+requires:
+ strict: 0
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
+END
+
my $manifest = maniread("$distdir/MANIFEST");
# VMS is non-case preserving, so we can't know what the MANIFEST will
# look like. :(
==== //depot/maint-5.8/perl/lib/ExtUtils/t/maketext_filter.t#1 (text) ====
Index: perl/lib/ExtUtils/t/maketext_filter.t
--- /dev/null 2008-01-18 14:34:01.563607150 -0800
+++ perl/lib/ExtUtils/t/maketext_filter.t 2008-01-18 12:15:11.000000000
-0800
@@ -0,0 +1,65 @@
+#!/usr/bin/perl -w
+
+BEGIN {
+ if( $ENV{PERL_CORE} ) {
+ chdir 't' if -d 't';
+ @INC = '../lib';
+ }
+ else {
+ unshift @INC, 't/lib';
+ }
+}
+chdir 't';
+
+use Test::More tests => 6;
+
+use ExtUtils::MakeMaker;
+use ExtUtils::MM_VMS;
+
+sub test_filter {
+ my($text, $vms_text) = @_;
+
+ local $Test::Builder::Level = $Test::Builder::Level + 1;
+ is( ExtUtils::MM_Any->maketext_filter($text), $text, 'default filter'
);
+ is( ExtUtils::MM_VMS->maketext_filter($text), $vms_text, 'VMS filter' );
+}
+
+
+# VMS filter puts a space after the target
+test_filter(<<'END', <<'VMS');
+foo: bar
+ thing: splat
+END
+foo : bar
+ thing: splat
+VMS
+
+
+# And it does it for all targets
+test_filter(<<'END', <<'VMS');
+foo: bar
+ thing: splat
+
+up: down
+ yes
+END
+foo : bar
+ thing: splat
+
+up : down
+ yes
+VMS
+
+
+# And it doesn't mess with macros
+test_filter(<<'END', <<'VMS');
+CLASS=Foo: Bar
+
+target: stuff
+ $(PROGRAM) And::Stuff
+END
+CLASS=Foo: Bar
+
+target : stuff
+ $(PROGRAM) And::Stuff
+VMS
==== //depot/maint-5.8/perl/lib/ExtUtils/t/parse_version.t#5 (text) ====
Index: perl/lib/ExtUtils/t/parse_version.t
--- perl/lib/ExtUtils/t/parse_version.t#4~32320~ 2007-11-14
16:09:26.000000000 -0800
+++ perl/lib/ExtUtils/t/parse_version.t 2008-01-18 12:15:11.000000000 -0800
@@ -14,40 +14,60 @@
use Test::More;
use ExtUtils::MakeMaker;
-my %versions = (q[$VERSION = '1.00'] => '1.00',
- q[*VERSION = \'1.01'] => '1.01',
+my $Has_Version = eval 'require version; "version"->import; 1';
+
+my %versions = (q[$VERSION = '1.00'] => '1.00',
+ q[*VERSION = \'1.01'] => '1.01',
q[($VERSION) = q$Revision: 32208 $ =~ /(\d+)/g;] => 32208,
- q[$FOO::VERSION = '1.10';] => '1.10',
- q[*FOO::VERSION = \'1.11';] => '1.11',
- '$VERSION = 0.02' => 0.02,
- '$VERSION = 0.0' => 0.0,
- '$VERSION = -1.0' => -1.0,
- '$VERSION = undef' => 'undef',
- '$wibble = 1.0' => 'undef',
+ q[$FOO::VERSION = '1.10';] => '1.10',
+ q[*FOO::VERSION = \'1.11';] => '1.11',
+ '$VERSION = 0.02' => 0.02,
+ '$VERSION = 0.0' => 0.0,
+ '$VERSION = -1.0' => -1.0,
+ '$VERSION = undef' => 'undef',
+ '$wibble = 1.0' => 'undef',
q[my $VERSION = '1.01'] => 'undef',
q[local $VERISON = '1.02'] => 'undef',
q[local $FOO::VERSION = '1.30'] => 'undef',
+ q[our $VERSION = '1.23';] => '1.23',
);
-if( eval 'our $foo' ) {
- $versions{q[our $VERSION = '1.23';]} = '1.23',
+if( $Has_Version ) {
+ $versions{q[use version; $VERSION = qv("1.2.3");]} = qv("1.2.3");
+ $versions{q[$VERSION = qv("1.2.3")]} = qv("1.2.3");
}
-if( eval 'require version; "version"->import' ) {
- $versions{q[use version; $VERSION = qv(1.2.3);]} = qv(1.2.3);
- $versions{q[$VERSION = qv(1.2.3)]} = qv(1.2.3);
+plan tests => (2 * keys %versions) + 4;
+
+while( my($code, $expect) = each %versions ) {
+ is( parse_version_string($code), $expect, $code );
}
-plan tests => 2 * keys %versions;
-while( my($code, $expect) = each %versions ) {
+sub parse_version_string {
+ my $code = shift;
+
open(FILE, ">VERSION.tmp") || die $!;
print FILE "$code\n";
close FILE;
$_ = 'foo';
- is( MM->parse_version('VERSION.tmp'), $expect, $code );
+ my $version = MM->parse_version('VERSION.tmp');
is( $_, 'foo', '$_ not leaked by parse_version' );
-
+
unlink "VERSION.tmp";
+
+ return $version;
+}
+
+
+# This is a specific test to see if a version subroutine in the $VERSION
+# declaration confuses later calls to the version class.
+# [rt.cpan.org 30747]
+SKIP: {
+ skip "need version.pm", 4 unless $Has_Version;
+ is parse_version_string(q[ $VERSION = '1.00'; sub version { $VERSION } ]),
+ '1.00';
+ is parse_version_string(q[ use version; $VERSION = version->new("1.2.3")
]),
+ qv("1.2.3");
}
==== //depot/maint-5.8/perl/lib/ExtUtils/t/prereq.t#2 (text) ====
Index: perl/lib/ExtUtils/t/prereq.t
--- perl/lib/ExtUtils/t/prereq.t#1~32320~ 2007-11-14 16:09:26.000000000
-0800
+++ perl/lib/ExtUtils/t/prereq.t 2008-01-18 12:15:11.000000000 -0800
@@ -14,7 +14,7 @@
}
use strict;
-use Test::More 'no_plan';
+use Test::More tests => 13;
use TieOut;
use MakeMaker::Test::Utils;
@@ -107,4 +107,27 @@
Please install these modules first and rerun 'perl Makefile.PL'.
END
+
+ $warnings = '';
+ eval {
+ WriteMakefile(
+ NAME => 'Big::Dummy',
+ PREREQ_PM => {
+ "I::Do::Not::Exist" => 0,
+ },
+ CONFIGURE => sub {
+ require I::Do::Not::Exist;
+ },
+ PREREQ_FATAL => 1,
+ );
+ };
+
+ is $warnings, '';
+ is $@, <<'END', "PREREQ_FATAL happens before CONFIGURE";
+MakeMaker FATAL: prerequisites not found.
+ I::Do::Not::Exist not installed
+
+Please install these modules first and rerun 'perl Makefile.PL'.
+END
+
}
==== //depot/maint-5.8/perl/lib/ExtUtils/t/writemakefile_args.t#6 (text) ====
Index: perl/lib/ExtUtils/t/writemakefile_args.t
--- perl/lib/ExtUtils/t/writemakefile_args.t#5~32320~ 2007-11-14
16:09:26.000000000 -0800
+++ perl/lib/ExtUtils/t/writemakefile_args.t 2008-01-18 12:15:11.000000000
-0800
@@ -14,7 +14,7 @@
}
use strict;
-use Test::More 'no_plan';
+use Test::More tests => 28;
use TieOut;
use MakeMaker::Test::Utils;
@@ -164,7 +164,7 @@
SKIP: {
- skip("Can't test version objects",2) unless eval { require version };
+ skip("Can't test version objects",6) unless eval { require version };
version->import;
my $version = version->new("1.2.3");
==== //depot/maint-5.8/perl/lib/ExtUtils/t/xs.t#2 (text) ====
Index: perl/lib/ExtUtils/t/xs.t
--- perl/lib/ExtUtils/t/xs.t#1~25817~ 2005-10-21 08:28:21.000000000 -0700
+++ perl/lib/ExtUtils/t/xs.t 2008-01-18 12:15:11.000000000 -0800
@@ -13,12 +13,49 @@
use Test::More;
use MakeMaker::Test::Utils;
+use MakeMaker::Test::Setup::XS;
+use File::Find;
+use File::Spec;
+use File::Path;
if( have_compiler() ) {
- plan tests => 1;
+ plan tests => 7;
}
else {
plan skip_all => "ExtUtils::CBuilder not installed or couldn't find a
compiler";
}
-pass("You have a compiler, isn't that great?");
+my $Is_VMS = $^O eq 'VMS';
+my $perl = which_perl();
+
+# GNV logical interferes with testing
+$ENV{'bin'} = '[.bin]' if $Is_VMS;
+
+chdir 't';
+
+perl_lib;
+
+$| = 1;
+
+ok( setup_xs(), 'setup' );
+END {
+ ok( chdir File::Spec->updir );
+ ok( teardown_xs(), 'teardown' );
+}
+
+ok( chdir('XS-Test'), "chdir'd to XS-Test" ) ||
+ diag("chdir failed: $!");
+
+my @mpl_out = run(qq{$perl Makefile.PL});
+
+cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) ||
+ diag(@mpl_out);
+
+my $make = make_run();
+my $make_out = run("$make");
+is( $?, 0, ' make exited normally' ) ||
+ diag $make_out;
+
+my $test_out = run("$make");
+is( $?, 0, ' make test exited normally' ) ||
+ diag $test_out;
==== //depot/maint-5.8/perl/lib/ExtUtils/testlib.pm#4 (text) ====
Index: perl/lib/ExtUtils/testlib.pm
--- perl/lib/ExtUtils/testlib.pm#3~30744~ 2007-03-24 05:22:39.000000000
-0700
+++ perl/lib/ExtUtils/testlib.pm 2008-01-18 12:15:11.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = 1.17;
+$VERSION = 6.42;
use Cwd;
use File::Spec;
==== //depot/maint-5.8/perl/t/lib/MakeMaker/Test/Setup/XS.pm#1 (text) ====
Index: perl/t/lib/MakeMaker/Test/Setup/XS.pm
--- /dev/null 2008-01-18 14:34:01.563607150 -0800
+++ perl/t/lib/MakeMaker/Test/Setup/XS.pm 2008-01-18 12:15:11.000000000
-0800
@@ -0,0 +1,97 @@
+package MakeMaker::Test::Setup::XS;
+
[EMAIL PROTECTED] = qw(Exporter);
+require Exporter;
[EMAIL PROTECTED] = qw(setup_xs teardown_xs);
+
+use strict;
+use File::Path;
+use File::Basename;
+use MakeMaker::Test::Utils;
+
+my $Is_VMS = $^O eq 'VMS';
+
+my %Files = (
+ 'XS-Test/lib/XS/Test.pm' => <<'END',
+package XS::Test;
+
+require Exporter;
+require DynaLoader;
+
+$VERSION = 1.01;
[EMAIL PROTECTED] = qw(Exporter DynaLoader);
[EMAIL PROTECTED] = qw(is_even);
+
+bootstrap XS::Test $VERSION;
+
+1;
+END
+
+ 'XS-Test/Makefile.PL' => <<'END',
+use ExtUtils::MakeMaker;
+
+WriteMakefile(
+ NAME => 'XS::Test',
+ VERSION_FROM => 'lib/XS/Test.pm',
+);
+END
+
+ 'XS-Test/Test.xs' => <<'END',
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+MODULE = XS::Test PACKAGE = XS::Test
+
+PROTOTYPES: DISABLE
+
+int
+is_even(input)
+ int input
+ CODE:
+ RETVAL = (input % 2 == 0);
+ OUTPUT:
+ RETVAL
+END
+
+ 'XS-Test/t/is_even.t' => <<'END',
+#!/usr/bin/perl -w
+
+use Test::More tests => 3;
+
+use_ok "XS::Test";
+ok !is_even(1);
+ok is_even(2);
+END
+ );
+
+
+sub setup_xs {
+ setup_mm_test_root();
+ chdir 'MM_TEST_ROOT:[t]' if $Is_VMS;
+
+ while(my($file, $text) = each %Files) {
+ # Convert to a relative, native file path.
+ $file = File::Spec->catfile(File::Spec->curdir, split m{\/}, $file);
+
+ my $dir = dirname($file);
+ mkpath $dir;
+ open(FILE, ">$file") || die "Can't create $file: $!";
+ print FILE $text;
+ close FILE;
+ }
+
+ return 1;
+}
+
+sub teardown_xs {
+ foreach my $file (keys %Files) {
+ my $dir = dirname($file);
+ if( -e $dir ) {
+ rmtree($dir) || return;
+ }
+ }
+ return 1;
+}
+
+1;
\ No newline at end of file
End of Patch.
