Checking in changes prior to tagging of version 0.41. Changelog diff is:

[gitmo/Mouse.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 5b8329c..b8519a4 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,14 +5,12 @@ use inc::Module::Install;
 # for co-developpers
 use Module::Install::XSUtil 0.17;
 
-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';
 all_from 'lib/Mouse.pm';
 
-tests 't/*.t t/*/*.t';
-
 # Scalar::Util < 1.14 has a bug.
 # > Fixed looks_like_number(undef) to return false for perl >= 5.009002
 requires 'Scalar::Util' => 1.14;
@@ -23,26 +21,28 @@ 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;
+if($] < 5.010) {
+    recommends 'Class::C3';
+}
 
 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(Mouse::Spec->MouseVersion =~ /_/){ # DEVEL RELEASE
+#    require Carp::Always; Carp::Always->import();
+#    include_deps 'Carp::Always';
+#}
 
 my $use_xs;
 
+if($] < 5.008_001){
+    $use_xs = 0;
+}
+
 for (@ARGV) {
     /^--pp$/ and $use_xs = 0;
     /^--xs$/ and $use_xs = 1;
 }
 
-if($] < 5.008_001){
-    $use_xs = 0;
-}
-
 if(!defined $use_xs){
     $use_xs = cc_available();
 }
@@ -59,25 +59,34 @@ 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) }) {
-        if (eval 'use Module::Install::AuthorTests; 1') {
-            do 'author/create-moose-compatibility-tests.pl';
+    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';
             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}
@@ -86,6 +95,4 @@ if (author_context()) {
     }
 }
 
-clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
-
 WriteAll check_nmake => 0;