[Catalyst-commits] r10780 - Catalyst-Runtime/5.80/trunk

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2009-07-03 23:31:33 +0000 (Fri, 03 Jul 2009)
New Revision: 10780

Modified:
   Catalyst-Runtime/5.80/trunk/Makefile.PL
Log:
Merge branch 'author_requires'

* author_requires:
  Port to Module::Install::AuthorRequires.
  Create branch author_requires

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-07-03 22:43:08 UTC (rev 10779)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-07-03 23:31:33 UTC (rev 10780)
@@ -45,8 +45,8 @@
 
 # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
 if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.35_05')) {
-    test_requires('Test::Aggregate', '0.35_05');
-    test_requires('Test::Simple', '0.88');
+    author_requires('Test::Aggregate', '0.35_05');
+    author_requires('Test::Simple', '0.88');
 }
 else {
     tests join q{ },
@@ -54,7 +54,7 @@
         map  { glob } qw[t/*.t t/aggregate/*.t];
 }
 
-my @force_build_requires_if_author = qw(
+author_requires($_) for qw(
   Test::NoTabs
   Test::Pod
   Test::Pod::Coverage
@@ -62,9 +62,6 @@
 );
 
 if ($Module::Install::AUTHOR) {
-    foreach my $module (@force_build_requires_if_author) {
-        build_requires $module;
-    }
     darwin_check_no_resource_forks();
 }
 
@@ -73,11 +70,6 @@
 WriteAll;
 
 if ($Module::Install::AUTHOR) {
-
-  # Strip out the author only build_requires from META.yml
-  # Need to do this _after_ WriteAll else it looses track of them
-  strip_author_only_build_requires(@force_build_requires_if_author, 'Test::Aggregate');
-
   Meta->{values}{resources} = [
     [ 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst' ],
     [ 'IRC'         => 'irc://irc.perl.org/#catalyst' ],
@@ -155,20 +147,6 @@
         }
 }
 
-sub strip_author_only_build_requires {
-    my @build_requires_to_strip = @_;
-    Meta->{values}{build_requires} = [ grep {
-      my $ok = 1;
-      foreach my $module (@build_requires_to_strip) {
-        if ($_->[0] =~ /$module/) {
-          $ok = 0;
-          last;
-        }
-      }
-      $ok;
-    } @{Meta->{values}{build_requires}} ];
-}
-
 sub check_conflicts {
     my %conflicts = @_;