X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=Makefile.PL;h=8ef3d6c9baf2c436910d63a593b1ed460ab5f5e4;hp=395af4bd3083702e8147c48da7028e5f8e932e01;hb=ca8e67d622c1a14bee4933ad64b1e465c5d63766;hpb=92ff14d0110c9bf2a8a19dc6f0b16b34799ec690

diff --git a/Makefile.PL b/Makefile.PL
index 395af4b..8ef3d6c 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: $!";
@@ -25,40 +25,56 @@ if($] < 5.010) {
     recommends 'Class::C3';
 }
 
-require 'lib/Mouse/Spec.pm'; # for the version
-
-if(Mouse::Spec->MouseVersion =~ /_/){ # DEVEL RELEASE
-    require Carp::Always; Carp::Always->import();
-    include_deps 'Carp::Always';
+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"
+            );
+        }
+    }
 }
 
-my $use_xs;
+require 'lib/Mouse/Spec.pm'; # for the version
 
-if($] < 5.008_001){
-    $use_xs = 0;
-}
+#if(Mouse::Spec->MouseVersion =~ /_/){ # DEVEL RELEASE
+#    require Carp::Always; Carp::Always->import();
+#    include_deps 'Carp::Always';
+#}
 
-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{
     print "Mouse configured with Pure Perl.\n";
 }
 
+
+tests 't/*.t t/*/*.t';
+author_tests 'xt';
+
+
+repository 'git://git.moose.perl.org/Mouse.git';
+
+clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
+
+
 if (author_context()) {
     my $require_version = Mouse::Spec->MooseVersion;
 
@@ -66,7 +82,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";
         }
@@ -77,20 +101,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;
     }
 }
 
-repository 'git://git.moose.perl.org/Mouse.git';
-
-tests 't/*.t t/*/*.t';
-
-clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
 
 WriteAll check_nmake => 0;