summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorSteffen Mueller <smueller@cpan.org>2009-06-08 21:41:14 +0200
committerSteffen Mueller <smueller@cpan.org>2009-06-08 21:41:14 +0200
commite8ee98b8d6476fafa8aeeec6a876def8fb28063b (patch)
treedb3d03e3bcec06d1947c0c862953b5d8250eda74 /utils
parent9758931364444385e32f6e1abf2e6aba4ddbd236 (diff)
downloadperl-e8ee98b8d6476fafa8aeeec6a876def8fb28063b.tar.gz
Make h2xs add a dependency on Test.pm for < 5.6.2
Also replaces lots of 5.00702 (note missing 0) with 5.006002. This is to allow us to jettison Test.pm from core eventually.
Diffstat (limited to 'utils')
-rw-r--r--utils/h2xs.PL24
1 files changed, 16 insertions, 8 deletions
diff --git a/utils/h2xs.PL b/utils/h2xs.PL
index 125dbf4dc7..428d9bb99d 100644
--- a/utils/h2xs.PL
+++ b/utils/h2xs.PL
@@ -234,7 +234,7 @@ of C<h2xs> may gain the ability to make educated guesses.
When B<--compat-version> (B<-b>) is present the generated tests will use
C<Test::More> rather than C<Test> which is the default for versions before
-5.7.2 . C<Test::More> will be added to PREREQ_PM in the generated
+5.6.2. C<Test::More> will be added to PREREQ_PM in the generated
C<Makefile.PL>.
=item B<--use-old-tests>
@@ -1903,14 +1903,18 @@ open(PL, ">Makefile.PL") || die "Can't create $ext$modpname/Makefile.PL: $!\n";
my $prereq_pm = '';
-if ( $compat_version < 5.00702 and $new_test )
+if ( $compat_version < 5.006002 and $new_test )
{
$prereq_pm .= q%'Test::More' => 0, %;
}
+elsif ( $compat_version < 5.006002 )
+{
+ $prereq_pm .= q%'Test' => 0, %;
+}
-if ( $compat_version < 5.00600 and !$opt_X and $use_xsloader)
+if ( $compat_version < 5.006 and !$opt_X and $use_xsloader)
{
- $prereq_pm .= q%'XSLoader' => 0, %;
+ $prereq_pm .= q%'XSLoader' => 0, %;
}
print PL <<"END";
@@ -2026,13 +2030,17 @@ my $rmheadeq = "=" x length($rmhead);
my $rm_prereq;
-if ( $compat_version < 5.00702 and $new_test )
+if ( $compat_version < 5.006002 and $new_test )
+{
+ $rm_prereq = 'Test::More';
+}
+elsif ( $compat_version < 5.006002 )
{
- $rm_prereq = 'Test::More';
+ $rm_prereq = 'Test';
}
else
{
- $rm_prereq = 'blah blah blah';
+ $rm_prereq = 'blah blah blah';
}
print RM <<_RMEND_;
@@ -2096,7 +2104,7 @@ _END_
my $test_mod = 'Test::More';
-if ( $old_test or ($compat_version < 5.007 and not $new_test ))
+if ( $old_test or ($compat_version < 5.006002 and not $new_test ))
{
my $test_mod = 'Test';