X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=6b45f5e1266af61d1de92b9a34a951effde6afdd;hb=823419c540f9e77090f31f11e04b14477c0372c4;hp=82c74c9b74600764e87a90a0d2dbf8e22c88340b;hpb=6741954a4b02fdb1fbc39b1132d74685fcc28f2e;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 82c74c9..6b45f5e 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,15 +8,12 @@ BEGIN{
 
 use strict;
 use warnings;
-use inc::Module::Install 0.99;
+use inc::Module::Install 1.00;
 
 # for co-developpers
-use Module::Install::XSUtil 0.24;
+use Module::Install::XSUtil 0.30;
 use Module::Install::AuthorTests;
 
-system($^X, 'tool/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
-    or warn "Cannot generate Mouse::Tiny: $!";
-
 name     'Mouse';
 all_from 'lib/Mouse.pm';
 
@@ -25,13 +22,13 @@ all_from 'lib/Mouse.pm';
 requires 'Scalar::Util' => 1.14;
 
 test_requires 'Test::More'      => 0.88;
+test_requires 'Test::Exception' => 0.29;
 
 my %suggests = (
     'Any::Moose'                     => 0.10,
-    'Data::Util'                     => 0.55,
+
     'MouseX::AttributeHelpers'       => 0.06,
 );
-
 while(my($mod, $least) = each %suggests){
     my $status = system $^X, '-e', <<"CHECK";
 if(eval q{ use $mod (); 1 }) {
@@ -58,43 +55,44 @@ CHECK
 my $use_xs = ($] >= 5.008_001 && want_xs());
 
 if($use_xs){
-    print "Mouse configured with XS.\n",
-          "NOTE: You can try --pp option to configure Mouse with Pure Perl.\n";
+    print "Mouse configured with XS.\n";
 
-    cc_warnings();
     use_ppport(3.19);
+    use_xshelper();
+    cc_warnings();
     cc_src_paths('xs-src');
 }
 else{
     print "Mouse configured with Pure Perl.\n";
 }
 
-
 tests 't/*.t t/*/*.t';
 author_tests 'xt';
 
 repository 'git://git.moose.perl.org/Mouse.git';
 
+system($^X, 'tool/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
+    or warn "Cannot generate Mouse::Tiny: $!";
+makemaker_args PL_FILES => {
+    'tool/generate-mouse-tiny.pl' => 'lib/Mouse/Tiny.pm',
+};
+
 if ($Module::Install::AUTHOR) {
     require 'lib/Mouse/Spec.pm'; # for the version
     my $require_version = Mouse::Spec->MooseVersion;
 
     if (eval { require Moose; Moose->VERSION($require_version) }) {
         print "You have Moose ", Moose->VERSION, ".\n";
-        if (eval { require Module::Install::AuthorTests }) {
-            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/compatibility/t/*/*.t } . "\n";
-
-            postamble qq{test_dynamic :: test_moose\n\n}
-                    . qq{test_moose :: pure_all\n}
-                    . qq{\t} . $t_moose;
-        } else {
-            print "You don't have a M::I::AuthorTests.\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;
     } else {
         print "You don't have Moose $require_version. skipping moose compatibility test\n";
     }
@@ -106,7 +104,7 @@ if ($Module::Install::AUTHOR) {
                    .q{ "do 'tool/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
                    .q{ $(TEST_FILES)} . "\n";
 
-        postamble qq{test_dynamic :: test_pp\n\n}
+        postamble qq{test :: test_pp\n\n}
                 . qq{test_pp :: pure_all\n}
                 . qq{\t} . $t_pp;
     }