X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=Makefile.PL;h=d83108e70875eba7dd898ed2f5ac756761fb0e9e;hp=b8519a4cd8b99ff5c4cba9a60115a4f87fc2789f;hb=da1d264b1de0a4762f6e77f61b4d577144b07889;hpb=4c0fe06fa87e7c2c4ed1666e77ed52ae020f19d7

diff --git a/Makefile.PL b/Makefile.PL
index b8519a4..d83108e 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -3,7 +3,7 @@ use warnings;
 use inc::Module::Install;
 
 # for co-developpers
-use Module::Install::XSUtil 0.17;
+use Module::Install::XSUtil 0.21;
 
 system($^X, 'tool/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
     or warn "Cannot generate Mouse::Tiny: $!";
@@ -16,15 +16,31 @@ 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::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,
+    'MouseX::AttributeHelpers'       => 0.06,
+);
+
+while(my($mod, $least) = each %suggests){
+    if(can_use($mod)){
+        if(!eval { $mod->VERSION($least) }){
+            my $ver = $mod->VERSION;
+            warn("\n",
+                "WARNING: $mod is installed, but its version ($ver) is too old (< $least).\n",
+                "         Please update $mod after installation of Mouse.\n",
+                "\n"
+            );
+        }
+    }
+}
+
 require 'lib/Mouse/Spec.pm'; # for the version
 
 #if(Mouse::Spec->MouseVersion =~ /_/){ # DEVEL RELEASE
@@ -32,27 +48,15 @@ require 'lib/Mouse/Spec.pm'; # for the version
 #    include_deps 'Carp::Always';
 #}
 
-my $use_xs;
-
-if($] < 5.008_001){
-    $use_xs = 0;
-}
-
-for (@ARGV) {
-    /^--pp$/ and $use_xs = 0;
-    /^--xs$/ and $use_xs = 1;
-}
-
-if(!defined $use_xs){
-    $use_xs = cc_available();
-}
+# cc_available recognizes the '--pp' and '--xs' options
+my $use_xs = ($] >= 5.008_001 && cc_available());
 
 if($use_xs){
     print "Mouse configured with XS.\n",
           "NOTE: You can try --pp option to configure Mouse with Pure Perl.\n";
 
-    use_ppport(3.19);
     cc_warnings();
+    use_ppport(3.19);
     cc_src_paths('xs-src');
 }
 else{
@@ -61,6 +65,8 @@ else{
 
 
 tests 't/*.t t/*/*.t';
+author_tests 'xt';
+
 
 repository 'git://git.moose.perl.org/Mouse.git';
 
@@ -74,7 +80,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";
         }
@@ -85,14 +99,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;