X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=Makefile.PL;h=8ef3d6c9baf2c436910d63a593b1ed460ab5f5e4;hp=189d86808effb74c182259a8fb0024bf2797536d;hb=ca8e67d622c1a14bee4933ad64b1e465c5d63766;hpb=98f255c5b15681edff2b0933954e3a6b1e24a012

diff --git a/Makefile.PL b/Makefile.PL
index 189d868..8ef3d6c 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,96 +2,114 @@ use strict;
 use warnings;
 use inc::Module::Install;
 
-system($^X, 'author/generate-mouse-tiny.pl', 'lib/Mouse/Tiny.pm') == 0
+# for co-developpers
+use Module::Install::XSUtil 0.21;
+
+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;
 
-configure_requires 'ExtUtils::CBuilder';
-
 test_requires 'Test::More'      => 0.88;
 test_requires 'Test::Exception' => 0.27;
 # test_requires 'Test::Output'    => 0.16; # too many dependencies!
 
 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;
-
-for (@ARGV) {
-    /^--pp$/ and $use_xs = 0;
-    /^--xs$/ and $use_xs = 1;
+my %suggests = (
+    'Class::Method::Modifiers::Fast' => 0.041,
+    'MouseX::AttributeHelpers'       => 0.06,
+);
+
+while(my($mod, $least) = each %suggests){
+    if(can_use($mod)){
+        if(!eval { $mod->VERSION($least) }){
+            my $ver = $mod->VERSION;
+            warn("\n",
+                "WARNING: $mod is installed, but its version ($ver) is too old (< $least).\n",
+                "         Please update $mod after installation of Mouse.\n",
+                "\n"
+            );
+        }
+    }
 }
 
-if($] < 5.008_001){
-    $use_xs = 0;
-}
+require 'lib/Mouse/Spec.pm'; # for the version
 
-if(!defined $use_xs){
-    $use_xs = eval {
-        require ExtUtils::CBuilder;
-        ExtUtils::CBuilder->new(quiet => 1)->have_compiler();
-    };
-}
+#if(Mouse::Spec->MouseVersion =~ /_/){ # DEVEL RELEASE
+#    require Carp::Always; Carp::Always->import();
+#    include_deps 'Carp::Always';
+#}
+
+# 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";
-    ;
-
-    require Module::Install::XSUtil;
-    Module::Install::XSUtil->VERSION(0.15); # for co-developpers
 
-    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';
+author_tests 'xt';
+
+
+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';
-            recursive_author_tests('xt');
+    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";
+            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{ $(TEST_FILES)} . "\n";
+        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_dynamic :: test_pp\n\n}
                 . qq{test_pp :: pure_all\n}
-                . qq{\t} . $test_via_harness;
+                . qq{\t} . $t_pp;
     }
 }
 
-clean_files 'lib/Mouse/Tiny.pm $(O_FILES)';
 
 WriteAll check_nmake => 0;