From: Florian Ragwitz Date: Thu, 2 Jul 2009 23:10:14 +0000 (+0000) Subject: Port to Module::Install::AuthorRequires. X-Git-Tag: 5.80025~20^2 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=a85294b6627a8b1b9006f478f125be7e203247fa Port to Module::Install::AuthorRequires. --- diff --git a/Makefile.PL b/Makefile.PL index a08a13b..1162175 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -45,8 +45,8 @@ test_requires 'Test::Exception'; # 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 @@ else { 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 @@ my @force_build_requires_if_author = qw( ); if ($Module::Install::AUTHOR) { - foreach my $module (@force_build_requires_if_author) { - build_requires $module; - } darwin_check_no_resource_forks(); } @@ -73,11 +70,6 @@ auto_install; 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 darwin_check_no_resource_forks { } } -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 = @_;