X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=5b8329c5f3025abdb8839ee3a54f2aa377b57345;hb=884bf37f78889fef10be116db24951cc2886d72b;hp=02450a7ac127673eceb990fbb07410dee0aa2edc;hpb=3ea28db6c35f2f60bfcce151cb4fcee58d6edcf7;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 02450a7..5b8329c 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,8 +1,10 @@
-BEGIN{ $INC{'Module/Install/ExtraTests.pm'} = __FILE__ } # to disable the use of ExtrTests
 use strict;
 use warnings;
 use inc::Module::Install;
 
+# for co-developpers
+use Module::Install::XSUtil 0.17;
+
 system($^X, 'author/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
     or warn "Cannot generate Mouse::Tiny: $!";
 
@@ -19,10 +21,17 @@ 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;
 
+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 $use_xs;
 
 for (@ARGV) {
@@ -35,26 +44,22 @@ if($] < 5.008_001){
 }
 
 if(!defined $use_xs){
-    configure_requires 'ExtUtils::CBuilder';
-    require ExtUtils::CBuilder;
-    $use_xs = ExtUtils::CBuilder->new(quiet => 1)->have_compiler();
+    $use_xs = cc_available();
 }
 
 if($use_xs){
-    require Module::Install::XSUtil;
+    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();
     cc_src_paths('xs-src');
-
-    print "Mouse configured in XS (--xs)\n";
 }
 else{
-    print "Mouse configured in Pure Perl (--pp)\n";
+    print "Mouse configured with Pure Perl.\n";
 }
 
 if (author_context()) {
-    local @INC = ('lib', @INC);
-    require 'lib/Mouse/Spec.pm';
     my $require_version = Mouse::Spec->MooseVersion;
 
     if (eval{ require Moose; Moose->VERSION($require_version) }) {
@@ -81,6 +86,6 @@ if (author_context()) {
     }
 }
 
-clean_files 'lib/Mouse/Tiny.pm';
+clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
 
 WriteAll check_nmake => 0;