Backport failing test into 5.70 trunk

[catagits/Catalyst-Runtime.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 443d622..12fc01e 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,12 +1,10 @@
-use inc::Module::Install 0.64;
+use inc::Module::Install 0.77;
 
-use 5.008001; 
-perl_version '5.8.1';
+perl_version '5.008001';
 
 name 'Catalyst-Runtime';
 all_from 'lib/Catalyst/Runtime.pm';
 
-requires 'perl'               => '5.8.1';
 requires 'Carp';
 requires 'Class::Accessor::Fast';
 requires 'Class::Data::Inheritable';
@@ -15,7 +13,7 @@ requires 'CGI::Simple::Cookie';
 requires 'Data::Dump';
 requires 'File::Modified';
 requires 'HTML::Entities';
-requires 'HTTP::Body'    => '0.9';
+requires 'HTTP::Body'    => '1.04'; # makes uploadtmp work
 requires 'HTTP::Headers' => '1.64';
 requires 'HTTP::Request';
 requires 'HTTP::Response';
@@ -33,20 +31,63 @@ requires 'URI' => '1.35';
 requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
 
 
-if (-e 'inc/.author') {
-  build_requires 'Test::Perl::Critic';
+my @force_build_requires_if_author = qw(
+        Test::NoTabs 
+        Test::Pod 
+        Test::Pod::Coverage 
+        Pod::Coverage
+);
+ 
+if ($Module::Install::AUTHOR) {
 
-  if ($^O eq 'darwin') { 
-      makemaker_args(dist => { PREOP => 'if [ "$$COPY_EXTENDED_ATTRIBUTES_DISABLE" != "true" ]; then'.
-                                        ' echo "you must set the ENV variable COPY_EXTENDED_ATTRIBUTES_DISABLE to true,"; '.
-                                        ' echo "to avoid getting resource forks in your dist."; exit 255; fi' }); 
-  }
+    foreach my $module (@force_build_requires_if_author) {
+        build_requires $module;
+    }
+
+
+    if ($^O eq 'darwin') { 
+        my $osx_ver = `/usr/bin/sw_vers -productVersion`;
+        chomp $osx_ver;
+
+# 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';
+
+        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' }); 
+    }
 }
 
 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
+    Meta->{values}{build_requires} = [ grep {
+        my $ok = 1;
+        foreach my $module (@force_build_requires_if_author) {
+            if ($_->[0] =~ /$module/) {
+                $ok = 0;
+                last;
+            }
+        }
+        $ok;
+   } @{Meta->{values}{build_requires}} ];
+
+   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: