X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=b017211127cec615f86122f297a513c98ee6e7c3;hb=bd0fe31fdcb1aefad78cad60d01dd0615e2cba9c;hp=189d86808effb74c182259a8fb0024bf2797536d;hpb=98f255c5b15681edff2b0933954e3a6b1e24a012;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 189d868..b017211 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,20 +2,19 @@ use strict;
 use warnings;
 use inc::Module::Install;
 
-system($^X, 'author/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
+# for co-developpers
+use Module::Install::XSUtil 0.17;
+
+system($^X, 'tool/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
     or warn "Cannot generate Mouse::Tiny: $!";
 
 name     'Mouse';
 all_from 'lib/Mouse.pm';
 
-tests 't/*.t t/*/*.t';
-
 # Scalar::Util < 1.14 has a bug.
 # > Fixed looks_like_number(undef) to return false for perl >= 5.009002
 requires 'Scalar::Util' => 1.14;
 
-configure_requires 'ExtUtils::CBuilder';
-
 test_requires 'Test::More'      => 0.88;
 test_requires 'Test::Exception' => 0.27;
 # test_requires 'Test::Output'    => 0.16; # too many dependencies!
@@ -43,19 +42,12 @@ if($] < 5.008_001){
 }
 
 if(!defined $use_xs){
-    $use_xs = eval {
-        require ExtUtils::CBuilder;
-        ExtUtils::CBuilder->new(quiet => 1)->have_compiler();
-    };
+    $use_xs = cc_available();
 }
 
 if($use_xs){
     print "Mouse configured with XS.\n",
           "NOTE: You can try --pp option to configure Mouse with Pure Perl.\n";
-    ;
-
-    require Module::Install::XSUtil;
-    Module::Install::XSUtil->VERSION(0.15); # for co-developpers
 
     use_ppport(3.19);
     cc_warnings();
@@ -68,9 +60,9 @@ else{
 if (author_context()) {
     my $require_version = Mouse::Spec->MooseVersion;
 
-    if (eval{ require Moose; Moose->VERSION($require_version) }) {
-        if (eval 'use Module::Install::AuthorTests; 1') {
-            do 'author/create-moose-compatibility-tests.pl';
+    if (eval { require Moose; Moose->VERSION($require_version) }) {
+        if (eval { require Module::Install::AuthorTests }) {
+            do 'tool/create-moose-compatibility-tests.pl';
             recursive_author_tests('xt');
         } else {
             print "you don't have a M::I::AuthorTests.\n";
@@ -83,7 +75,7 @@ if (author_context()) {
         # repeat testing
         # see also ExtUtils::MM_Any::test_via_harness()
         my $test_via_harness =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
-                               .q{ "do 'author/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
+                               .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}
@@ -92,6 +84,8 @@ if (author_context()) {
     }
 }
 
+tests 't/*.t t/*/*.t';
+
 clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
 
 WriteAll check_nmake => 0;