X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=18e0c25f7fb39bb395d30d30e1a52b769eb179a8;hb=38f4a557632e3df5d521ea0f88c885c92826ca33;hp=ee4ed6404fbb2e392862a88caeb10b0660514255;hpb=972340a601c267a54cbe58d0253d7da364b2ee7d;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index ee4ed64..18e0c25 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,26 +9,46 @@ BEGIN{
 
 use strict;
 use warnings;
-use inc::Module::Install 1.00;
-
-# for co-developpers
-use Module::Install::XSUtil 0.30;
-use Module::Install::AuthorTests;
+BEGIN {
+	# author requires, or bundled modules
+    my @devmods = qw(
+        inc::Module::Install             1.00
+        Module::Install::TestTarget      0.13
+        Module::Install::AuthorTests     0.002
+        Module::Install::XSUtil          0.36
+		Test::Exception::LessClever      0.005
+		Test::Requires                   0.06
+    );
+    my @not_available;
+	while(my($mod, $ver) = splice @devmods, 0, 2) {
+        eval qq{use $mod $ver (); 1} or push @not_available, $mod;
+    }
+    if(@not_available) {
+        print qq{# The following modules are not available.\n};
+        print qq{# `perl $0 | cpanm` will install them:\n};
+        print $_, "\n" for @not_available;
+		exit 1;
+     }
+}
+use inc::Module::Install;
 
-name     'Mouse';
 all_from 'lib/Mouse.pm';
 
 # Scalar::Util < 1.14 has a bug.
 # > Fixed looks_like_number(undef) to return false for perl >= 5.009002
 requires 'Scalar::Util' => 1.14;
 
-test_requires 'Test::More'      => 0.88;
-test_requires 'Test::Exception' => 0.29;
+test_requires 'Test::More' => 0.88;
+
+# to keep zero-dependencies
+include 'Test::Exception::LessClever';
+include 'Test::Requires';
 
 my %suggests = (
     'Any::Moose'                     => 0.10,
 
     'MouseX::AttributeHelpers'       => 0.06,
+    'MouseX::NativeTraits'           => 1.00,
 );
 while(my($mod, $least) = each %suggests){
     my $status = system $^X, '-e', <<"CHECK";
@@ -62,6 +82,12 @@ if($use_xs){
     use_xshelper();
     cc_warnings();
     cc_src_paths('xs-src');
+    if($use_xs){
+		test_target test_pp => (
+			env => { PERL_ONLY => 1 },
+			($Module::Install::AUTHOR ? (alias => 'test') : ()),
+		);
+    }
 }
 else{
     print "Mouse configured with Pure Perl.\n";
@@ -86,30 +112,29 @@ if ($Module::Install::AUTHOR) {
             && eval { require Moose; Moose->VERSION($require_version) }) {
         print "You have Moose ", Moose->VERSION, ".\n";
         do 'tool/create-moose-compatibility-tests.pl';
-        # 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/compat/t/*/*.t } . "\n";
-
-        postamble qq{test :: test_moose\n\n}
-                . qq{test_moose :: pure_all\n}
-                . qq{\t} . $t_moose;
+        test_target test_moose => (
+            tests => ['xt/compat/t/*/*.t'],
+            alias => 'test',
+        );
     } else {
         print "You don't have Moose $require_version. skipping moose compatibility test\n";
     }
 
-    if($use_xs){
-        # repeat testing
-        # see also ExtUtils::MM_Any::test_via_harness()
-        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 :: test_pp\n\n}
-                . qq{test_pp :: pure_all\n}
-                . qq{\t} . $t_pp;
-    }
+
+    # Hack to disable Test::Exception, which might pull a perl internal bug.
+    # See also Test::Exception::LessClever.
+    open my $out, '>', 'inc/Test/Exception.pm' or die $!;
+    print $out <<'EOT';
+package Test::Exception; # wapper to T::E::LessClever
+require Test::Exception::LessClever;
+$INC{'Test/Exception.pm'} = __FILE__;
+sub import {
+    shift;
+    Test::Exception::LessClever->export_to_level(1, @_);
+}
+1;
+EOT
+    close $out or die $!;
 }
 
 clean_files q{