X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=189d86808effb74c182259a8fb0024bf2797536d;hb=6fe2272b04003d989c299dae495c4c6f9730dabc;hp=25e3be59c6ea73bd17253043f9088df7c856c298;hpb=c6cb4ba05f72afd108afd995b705446849648930;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 25e3be5..189d868 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,3 @@
-BEGIN{ $INC{'Module/Install/ExtraTests.pm'} = __FILE__ } # to disable the use of ExtrTests
 use strict;
 use warnings;
 use inc::Module::Install;
@@ -21,11 +20,17 @@ test_requires 'Test::More'      => 0.88;
 test_requires 'Test::Exception' => 0.27;
 # 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)
 
 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) {
@@ -45,20 +50,22 @@ if(!defined $use_xs){
 }
 
 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();
     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) }) {
@@ -85,6 +92,6 @@ if (author_context()) {
     }
 }
 
-clean_files 'lib/Mouse/Tiny.pm';
+clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
 
 WriteAll check_nmake => 0;