X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=050fca77e4b007b5b66fb3e33028a47e0c424588;hb=b880de945fcf59e9811132613b5bcbca8a6d8696;hp=cce2956150b779fff6ae2ebf66f3e517f5fc902a;hpb=83eab7b3a3c57c79fe5c3f4585f1eb96efb1669c;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index cce2956..050fca7 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -15,11 +15,14 @@ tests 't/*.t t/*/*.t';
 # > 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!
 
-include 'Test::Exception'; # work around 0.27_0x (its use of diehook might be wrong)
+
+include_deps 'Test::Exception'; # work around 0.27_0x (its use of diehook might be wrong)
 
 recommends 'MRO::Compat' if $] < 5.010;
 
@@ -30,14 +33,21 @@ for (@ARGV) {
     /^--xs$/ and $use_xs = 1;
 }
 
+if($] < 5.008_001){
+    $use_xs = 0;
+}
+
 if(!defined $use_xs){
-    configure_requires 'ExtUtils::CBuilder';
-    require ExtUtils::CBuilder;
-    $use_xs = ExtUtils::CBuilder->new(quiet => 1)->have_compiler();
+    $use_xs = eval {
+        require ExtUtils::CBuilder;
+        ExtUtils::CBuilder->new(quiet => 1)->have_compiler();
+    };
 }
 
 if($use_xs){
     require Module::Install::XSUtil;
+    Module::Install::XSUtil->VERSION(0.15); # for co-developpers
+
     use_ppport(3.19);
     cc_warnings();
     cc_src_paths('xs-src');
@@ -63,23 +73,20 @@ if (author_context()) {
     } else {
         print "you don't have Moose $require_version. skipping moose compatibility test\n";
     }
-}
 
-clean_files 'lib/Mouse/Tiny.pm';
+    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 'author/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
+                               .q{ $(TEST_FILES)} . "\n";
 
-WriteAll check_nmake => 0;
-
-sub MY::postamble{
-    return '' unless author_context() && $use_xs;
-
-    # repeat test
-    # 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{ $(TEST_FILES)} . "\n";
-
-    return   qq{test_dynamic :: test_pp\n\n}
-           . qq{test_pp :: pure_all\n}
-           . qq{\t} . $test_via_harness;
+        postamble qq{test_dynamic :: test_pp\n\n}
+                . qq{test_pp :: pure_all\n}
+                . qq{\t} . $test_via_harness;
+    }
 }
 
+clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
+
+WriteAll check_nmake => 0;