X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=Makefile.PL;h=e960218313e99fb4cf8e870ee81890b74d532563;hp=11fe390d8cafb658976172e9e81e1d83b8791c48;hb=aff73a9e6d34b45a21123586c0893921df98181b;hpb=64f61124b57755ab2a2bc41f9e839efe0d8b80e0

diff --git a/Makefile.PL b/Makefile.PL
index 11fe390..e960218 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -3,9 +3,9 @@ use warnings;
 use inc::Module::Install;
 
 # for co-developpers
-use Module::Install::XSUtil 0.17;
+use Module::Install::XSUtil 0.19;
 
-system($^X, 'author/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
+system($^X, 'tool/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
     or warn "Cannot generate Mouse::Tiny: $!";
 
 name     'Mouse';
@@ -21,61 +21,60 @@ test_requires 'Test::Exception' => 0.27;
 
 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';
+if($] < 5.010) {
+    recommends 'Class::C3';
 }
 
-my $use_xs;
+require 'lib/Mouse/Spec.pm'; # for the version
 
-for (@ARGV) {
-    /^--pp$/ and $use_xs = 0;
-    /^--xs$/ and $use_xs = 1;
-}
+#if(Mouse::Spec->MouseVersion =~ /_/){ # DEVEL RELEASE
+#    require Carp::Always; Carp::Always->import();
+#    include_deps 'Carp::Always';
+#}
 
-if($] < 5.008_001){
-    $use_xs = 0;
-}
-
-if(!defined $use_xs){
-    $use_xs = cc_available();
-}
+# cc_available recognizes the '--pp' and '--xs' options
+my $use_xs = ($] >= 5.008_001 && cc_available());
 
 if($use_xs){
     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();
+    use_ppport(3.19);
     cc_src_paths('xs-src');
 }
 else{
     print "Mouse configured with Pure Perl.\n";
 }
 
+
+tests 't/*.t t/*/*.t';
+
+repository 'git://git.moose.perl.org/Mouse.git';
+
+clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
+
+
 if (author_context()) {
     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 'author/create-moose-compatibility-tests.pl';
+            do 'tool/create-moose-compatibility-tests.pl';
             recursive_author_tests('xt');
         } else {
-            print "you don't have a M::I::AuthorTests.\n";
+            print "You don't have a M::I::AuthorTests.\n";
         }
     } else {
-        print "you don't have Moose $require_version. skipping moose compatibility test\n";
+        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 $test_via_harness =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
-                               .q{ "do 'author/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
+                               .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}
@@ -84,8 +83,4 @@ if (author_context()) {
     }
 }
 
-tests 't/*.t t/*/*.t';
-
-clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
-
 WriteAll check_nmake => 0;