X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=8344d3a2d5460868849a6a22fafdb818bf6c77fd;hb=eb88905f17a3087b826253807b2e4bc839a977d8;hp=244942074373bf6ab6a6debeec69c584f9a8a67f;hpb=7b133c927969b2e9233a51c6be5caed54c88915e;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 2449420..8344d3a 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,6 @@
 use strict;
 use warnings;
 use inc::Module::Install;
-use 5.008;
 
 name     'Mouse';
 all_from 'lib/Mouse.pm';
@@ -12,11 +11,16 @@ tests 't/*.t t/*/*.t';
 # > Fixed looks_like_number(undef) to return false for perl >= 5.009002
 requires 'Scalar::Util' => 1.14;
 
-build_requires 'Test::Exception' => 0.21;
-build_requires 'Test::More' => 0.80;
+test_requires 'Test::More'      => 0.88;
+test_requires 'Test::Exception' => 0.27;
+test_requires 'Test::Output'    => 0.16;
 
 if ($Module::Install::AUTHOR) {
-    if (eval "package foo; use Moose; 1;") {
+    local @INC = ('lib', @INC);
+    require 'lib/Mouse/Spec.pm';
+    my $require_version = Mouse::Spec->MooseVersion;
+
+    if (eval{ require Moose; Moose->VERSION($require_version) }) {
         if (eval 'use Module::Install::AuthorTests; 1') {
             create_moose_compatibility_test();
             recursive_author_tests('xt');
@@ -24,13 +28,12 @@ if ($Module::Install::AUTHOR) {
             print "you don't have a M::I::AuthorTests.\n";
         }
     } else {
-        print "you don't have a moose. skipping moose compatibility test\n";
+        print "you don't have Moose $require_version. skipping moose compatibility test\n";
     }
     system("author/generate-mouse-tiny.pl");
 }
 
-auto_include;
-WriteAll;
+WriteAll check_nmake => 0;
 
 sub create_moose_compatibility_test {
     require File::Path;
@@ -87,8 +90,8 @@ sub create_moose_compatibility_test {
                         close $rfh;
                         $s;
                     };
-                    $src =~ s/Mouse::is_class_loaded/Class::MOP::is_class_loaded/g;
-                    $src =~ s/Mouse::load_class/Class::MOP::load_class/g;
+                    $src =~ s/Mouse::(?:Util::)?is_class_loaded/Class::MOP::is_class_loaded/g;
+                    $src =~ s/Mouse::(?:Util::)?load_class/Class::MOP::load_class/g;
                     $src =~ s/Mouse/Moose/g;
                     $src;
                 };