From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 26 Mar 2009 14:39:02 +0000 (+0000)
Subject: make_ext.pl's automatic Makefile.PL generation can write a suitalbe Makfile.PL
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fc833dfd81cd6e92f06c5ff246eeff2a33cdd6e6;p=p5sagit%2Fp5-mst-13.2.git

make_ext.pl's automatic Makefile.PL generation can write a suitalbe Makfile.PL
---

diff --git a/MANIFEST b/MANIFEST
index b4257dc..23f47ed 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1233,7 +1233,6 @@ ext/Test-Harness/lib/TAP/Parser/Utils.pm		A parser for Test Anything Protocol
 ext/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm	A parser for Test Anything Protocol
 ext/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm	A parser for Test Anything Protocol
 ext/Test-Harness/lib/Test/Harness.pm			A test harness
-ext/Test-Harness/Makefile.PL				Makefile.PL for Test::Harness
 ext/Test-Harness/t/000-load.t				Test::Harness test
 ext/Test-Harness/t/aggregator.t				Test::Harness test
 ext/Test-Harness/t/bailout.t				Test::Harness test
diff --git a/ext/Test-Harness/Makefile.PL b/ext/Test-Harness/Makefile.PL
deleted file mode 100644
index 6bc533c..0000000
--- a/ext/Test-Harness/Makefile.PL
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/perl -w
-
-# This Makefile.PL is provided for installation compatibility.
-# Extra developer actions are in the Build.PL.
-
-use ExtUtils::MakeMaker qw/WriteMakefile prompt/;
-
-use strict;
-
-my $core = grep { $_ eq 'PERL_CORE=1' } @ARGV;
-
-my %mm_args = (
-    'NAME'         => 'Test::Harness',
-    'VERSION_FROM' => 'lib/Test/Harness.pm',
-    'PREREQ_PM'    => {
-        'File::Spec' => 0.8,
-    },
-    'INSTALLDIRS' => 'perl',
-    'PL_FILES'    => {},
-    'test'        => { 'TESTS' => 't/*.t t/compat/*.t' },
-
-    # In the core pods will be built by installman, and prove found by
-    # utils/prove.PL
-    $core
-    ? ( 'MAN3PODS' => {} )
-    : ( 'EXE_FILES' => ['bin/prove'],
-    ),
-);
-
-{
-    local $^W = 0;    # Silence warning about non-numeric version
-    if ( $ExtUtils::MakeMaker::VERSION >= '6.31' ) {
-        $mm_args{LICENSE} = 'perl';
-    }
-}
-
-WriteMakefile(%mm_args);
-
-package MY;
-
-# Lifted from MM_Any.pm and modified so that make test tests against our
-# own code rather than the incumbent. If we don't do this we end up
-# loading a confused mixture of installed and new modules.
-sub test_via_harness {
-    my ( $self, $perl, $tests ) = @_;
-
-    return $self->SUPER::test_via_harness(
-        qq{$perl "-I\$(INST_LIB)" "-I\$(INST_ARCHLIB)"}, $tests );
-}