X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=1f1149cb7ec064858a3b6047b4d5a8bf39e87d57;hp=4f551cabc2b50399b13e0ac0ef55d87c39ad4001;hb=af58f1a4c026af6455284db586242a02ec07c27e;hpb=27c47255d4bd1cc7456c847327b18569ff6b46f0

diff --git a/Makefile.PL b/Makefile.PL
index 4f551ca..1f1149c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -16,7 +16,6 @@ requires 'Carp';
 requires 'Class::C3::Adopt::NEXT' => '0.07';
 requires 'CGI::Simple::Cookie';
 requires 'Data::Dump';
-requires 'File::Modified';
 requires 'HTML::Entities';
 requires 'HTTP::Body'    => '1.04'; # makes uploadtmp work
 requires 'HTTP::Headers' => '1.64';
@@ -45,8 +44,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,41 +53,29 @@ else {
         map  { glob } qw[t/*.t t/aggregate/*.t];
 }
 
-my @force_build_requires_if_author = qw(
+author_requires(map {; $_ => 0 } qw(
   Test::NoTabs
   Test::Pod
   Test::Pod::Coverage
   Pod::Coverage
-);
+));
 
 if ($Module::Install::AUTHOR) {
-    foreach my $module (@force_build_requires_if_author) {
-        build_requires $module;
-    }
     darwin_check_no_resource_forks();
 }
 
+resources(
+    'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst',
+    'IRC'         => 'irc://irc.perl.org/#catalyst',
+    'license',    => 'http://dev.perl.org/licenses/',
+    'homepage',   => 'http://dev.catalyst.perl.org/',
+    'repository', => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/',
+);
+
 install_script glob('script/*.pl');
 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' ],
-    [ 'license',    => 'http://dev.perl.org/licenses/' ],
-    [ 'homepage',   => 'http://dev.catalyst.perl.org/'],
-    [ 'repository', => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/' ],
-  ];
-
-  Meta->write;
-}
-
 print <<"EOF";
 
  Important:
@@ -101,7 +88,7 @@ print <<"EOF";
         perl -MCPANPLUS -e 'install Catalyst::Devel' # or
         perl -MCPAN -e 'install Catalyst::Devel'
 
-    To get some commonly used plugins, as well as the TT view and DBIC 
+    To get some commonly used plugins, as well as the TT view and DBIC
     model, install Task::Catalyst in the same way.
 
  Have fun!
@@ -147,24 +134,11 @@ sub darwin_check_no_resource_forks {
 
         # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE
         # On 10.5 (Leopard) it wants COPYFILE_DISABLE
-        my $attr = $osx_ver eq '10.5' ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE';
+        die("Oh, you got Snow Lepoard, snazzy. Please read the man page for tar to find out if Apple renamed COPYFILE_DISABLE again and fix this Makefile.PL please?\n") if $osx_ver =~ /^10.6/;
+        my $attr = $osx_ver =~ /^10.5/ ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE';
 
         makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}.
                                           qq{ echo "You must set the ENV variable $attr to true,"; }.
                                           ' echo "to avoid getting resource forks in your dist."; exit 255; fi' });
-        }
-}
-
-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}} ];
+    }
 }