X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=17cdb7e3593e7d2ffdd1f0aa448b10ecc5a3e0dd;hb=37008311d2f225f62af2d3f3f1603740bcbdb81c;hp=66236284379079d1e9eb90961577b2cc382696bf;hpb=3310ddf29da76ecf40333e91b0c855113943dab3;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 6623628..17cdb7e 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,9 +1,18 @@
+# for developpers:
+BEGIN{
+    if(grep{ $_ eq '--author' } @ARGV){
+        print "^X -S cpanm < author/requires.cpanm\n";
+        system "$^X -S cpanm < author/requires.cpanm";
+    }
+}
+
 use strict;
 use warnings;
-use inc::Module::Install;
+use inc::Module::Install 0.99;
 
 # for co-developpers
-use Module::Install::XSUtil 0.21;
+use Module::Install::XSUtil 0.24;
+use Module::Install::AuthorTests;
 
 system($^X, 'tool/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
     or warn "Cannot generate Mouse::Tiny: $!";
@@ -16,17 +25,16 @@ all_from 'lib/Mouse.pm';
 requires 'Scalar::Util' => 1.14;
 
 test_requires 'Test::More'      => 0.88;
-test_requires 'Test::Exception' => 0.27;
+test_requires 'Test::Exception' => 0.29;
+test_requires 'Test::Requires'  => 0.03;
 # test_requires 'Test::Output'    => 0.16; # too many dependencies!
 
-include_deps 'Test::Exception'; # work around 0.27_0x (its use of diehook might be wrong)
-
 if($] < 5.010) {
     recommends 'Class::C3';
 }
 
 my %suggests = (
-    'Class::Method::Modifiers::Fast' => 0.041,
+    'Data::Util'                     => 0.55,
     'MouseX::AttributeHelpers'       => 0.06,
 );
 
@@ -50,8 +58,8 @@ require 'lib/Mouse/Spec.pm'; # for the version
 #    include_deps 'Carp::Always';
 #}
 
-# cc_available recognizes the '--pp' and '--xs' options
-my $use_xs = ($] >= 5.008_001 && cc_available());
+# cc_want deals with the '--pp' and '--xs' options
+my $use_xs = ($] >= 5.008_001 && want_xs());
 
 if($use_xs){
     print "Mouse configured with XS.\n",
@@ -67,10 +75,12 @@ else{
 
 
 tests 't/*.t t/*/*.t';
+author_tests 'xt';
+
 
 repository 'git://git.moose.perl.org/Mouse.git';
 
-clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
+clean_files 'lib/Mouse/Tiny.pm $(O_FILES) test-mydeps-*.log';
 
 
 if (author_context()) {
@@ -80,7 +90,15 @@ if (author_context()) {
         print "You have Moose ", Moose->VERSION, ".\n";
         if (eval { require Module::Install::AuthorTests }) {
             do 'tool/create-moose-compatibility-tests.pl';
-            recursive_author_tests('xt');
+            # repeat testing
+            # see also ExtUtils::MM_Any::test_via_harness()
+            my $t_moose =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
+                          .q{ "test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
+                          .q{ xt/compatibility/t/*/*.t } . "\n";
+
+            postamble qq{test_dynamic :: test_moose\n\n}
+                    . qq{test_moose :: pure_all\n}
+                    . qq{\t} . $t_moose;
         } else {
             print "You don't have a M::I::AuthorTests.\n";
         }
@@ -91,14 +109,15 @@ if (author_context()) {
     if($use_xs){
         # repeat testing
         # see also ExtUtils::MM_Any::test_via_harness()
-        my $test_via_harness =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
-                               .q{ "do 'tool/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
-                               .q{ $(TEST_FILES)} . "\n";
+        my $t_pp =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
+                   .q{ "do 'tool/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
+                   .q{ $(TEST_FILES)} . "\n";
 
         postamble qq{test_dynamic :: test_pp\n\n}
                 . qq{test_pp :: pure_all\n}
-                . qq{\t} . $test_via_harness;
+                . qq{\t} . $t_pp;
     }
 }
 
+
 WriteAll check_nmake => 0;