X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=dfea2dc7b8c50e95e5d72d82966327b3839ebebc;hp=910922656b8c3bc0dda234bf67937f9523f91724;hb=0a0c74aae1b56a3d4c60c92bfbeeb6cc649418fc;hpb=a24c0135f19ff9b2fe78359c2aa10f5df3e9ab08

diff --git a/Makefile.PL b/Makefile.PL
index 9109226..dfea2dc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,11 +6,12 @@ name 'Catalyst-Runtime';
 all_from 'lib/Catalyst/Runtime.pm';
 
 requires 'namespace::clean';
-requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00400';
-requires 'Moose' => '0.59';
+requires 'Scope::Upper' => '0.06';
+requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801';
+requires 'Moose' => '0.73';
 requires 'Carp';
-requires 'Class::C3::Adopt::NEXT';
-requires 'Class::MOP';
+requires 'Class::C3::Adopt::NEXT' => '0.07';
+requires 'Class::MOP' => '0.79';
 requires 'CGI::Simple::Cookie';
 requires 'Data::Dump';
 requires 'File::Modified';
@@ -33,8 +34,13 @@ requires 'URI' => '1.35';
 requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
 requires 'MRO::Compat';
 
+recommends 'B::Hooks::OP::Check::StashChange';
+
 test_requires 'Class::Data::Inheritable';
+test_requires 'Test::MockObject';
 
+# Run aggregate tests if AGGREGATE_TESTS environment = 1, but not if it = 0
+# Otherwise default to using Test::Aggregate if installed, but not requiring it.
 if (   ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS})
     || (!exists $ENV{AGGREGATE_TESTS} && !can_use('Test::Aggregate', '0.34_01'))) {
     tests join q{ },
@@ -44,30 +50,41 @@ if (   ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS})
 else {
     test_requires('Test::Aggregate', '0.34_01');
 }
-
-if (-e 'inc/.author') {
-  build_requires 'Test::NoTabs';
-  build_requires 'Test::Pod' => 1.14;
-  build_requires 'Test::Pod::Coverage' => 1.04;
-
-  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' }); 
-  }
+my @force_build_requires_if_author = 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();
 }
 
 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);
+
+  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:
@@ -85,3 +102,87 @@ print <<"EOF";
 
  Have fun!
 EOF
+
+# NOTE - This is the version number of the _incompatible_ code,
+#        not the version number of the fixed version.
+my %conflicts = (
+    'Catalyst::Plugin::SmartURI'       => '0.029',
+    'CatalystX::CRUD'                  => '0.37',
+    'Catalyst::Action::RenderView'     => '0.07',
+    'Catalyst::Plugin::DebugCookie'    => '0.999002',
+    'Catalyst::Plugin::Authentication' => '0.100091',
+    'CatalystX::Imports'               => '0.03',
+    'Catalyst::Plugin::HashedCookies'  => '1.03',
+);
+check_conflicts(%conflicts);
+
+# End of script, helper functions below.
+
+sub darwin_check_no_resource_forks {
+    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' });
+        }
+}
+
+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 = @_;
+
+    my %conflicts_found;
+    for my $mod ( sort keys %conflicts ) {
+        eval "require($mod)";
+        next if $@;
+
+        my $installed = $mod->VERSION();
+        $conflicts_found{$mod} = $installed if ( $installed le $conflicts{$mod} );
+    }
+
+    return unless scalar keys %conflicts_found;
+
+    print <<"EOF";
+
+ WARNING:
+
+    This version of Catalyst conflicts with the versions of
+    some components you have installed.
+
+    You will need to upgrade these modules after installing
+    this version of Catalyst.
+
+    List of the conflicting components and their installed versions:
+
+EOF
+
+    foreach my $mod (keys %conflicts_found) {
+        print sprintf("    %s => %s\n", $mod, $conflicts_found{$mod});
+    }
+    print "\n";
+
+    # More or less copied from Module::Build, via Moose
+    return if $ENV{PERL_MM_USE_DEFAULT};
+    return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
+
+    sleep 4;
+}