X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=58960a9f8a26db147b5eb3e701aad5e832943683;hb=590e40d8d76ceb0ee30bbd2ea9e679701bb1280a;hp=8b5058efa3c1262a15db717c027708c75fd2d9c0;hpb=f7f4955d842ab67c1f9f4301ef74756fbec8d45f;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 8b5058e..58960a9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,20 +9,38 @@ 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 {
+    unshift @INC, 'inc';
+
+	# 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::More' => 0.88;
 
 # to keep zero-dependencies
 include 'Test::Exception::LessClever';
@@ -32,6 +50,7 @@ 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";
@@ -65,6 +84,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";
@@ -74,6 +99,8 @@ tests 't/*.t t/*/*.t';
 author_tests 'xt';
 
 repository 'git://git.moose.perl.org/Mouse.git';
+# or web interface:
+# http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo/Mouse.git;a=summary
 
 system($^X, 'tool/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
     or warn "Cannot generate Mouse::Tiny: $!";
@@ -89,30 +116,14 @@ 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), 'inc', '$(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), 'inc', '$(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.
@@ -132,6 +143,7 @@ EOT
 
 clean_files q{
     lib/Mouse/Tiny.pm $(O_FILES) test-mydeps-*.log
+    xshelper.h
     *.out
     cover_db xs-src/*.gc{v,no,da}
 };