X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=9d8bc437b82a291d5d17f52fcaac61268241e665;hb=a133bcea30632f3bdb815d5001e364675dc14028;hp=4fb004059d67c290e859997f10dea0f9f187ee76;hpb=bf9f3f91626578b969718595345b809278852891;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 4fb0040..9d8bc43 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,13 +11,18 @@ tests 't/*.t t/*/*.t';
 # > Fixed looks_like_number(undef) to return false for perl >= 5.009002
 requires 'Scalar::Util' => 1.14;
 
-test_requires 'Test::Exception' => 0.21;
-test_requires 'Test::More'      => 0.80;
+test_requires 'Test::More'      => 0.88;
+test_requires 'Test::Exception' => 0.27;
+# test_requires 'Test::Output'    => 0.16; # too many dependencies!
+
+include 'Test::Exception'; # work around 0.27_0x (its use of diehook might be wrong)
+
+recommends 'MRO::Compat' if $] < 5.010;
 
 if ($Module::Install::AUTHOR) {
     local @INC = ('lib', @INC);
-    require 'lib/Mouse.pm'; # for moose_version()
-    my $require_version = Mouse->moose_version;
+    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') {
@@ -33,8 +37,7 @@ if ($Module::Install::AUTHOR) {
     system("author/generate-mouse-tiny.pl");
 }
 
-auto_include;
-WriteAll;
+WriteAll check_nmake => 0;
 
 sub create_moose_compatibility_test {
     require File::Path;
@@ -48,15 +51,12 @@ sub create_moose_compatibility_test {
     # some test does not pass... currently skip it.
     my %SKIP_TEST = (
         '016-trigger.t'    => "trigger's argument is incompatble :(",
-        '029-new.t'        => 'Class->new(undef) incompatible',
         '010-isa-or.t'     => 'Mouse has a [BUG]',
-        '044-attribute-metaclass.t' => 'Moose::Meta::Attribute does not have a "create"',
-        '047-attribute-metaclass-role.t' => 'Moose::Meta::Attribute does not have a "create"',
-        '201-squirrel.t'      => 'skip Squirrel',
-        '202-squirrel-role.t' => 'Squirrel is ...',
+
         '600-tiny-tiny.t'     => "Moose doesn't support ::Tiny",
         '601-tiny-mouse.t'    => "Moose doesn't support ::Tiny",
         '602-mouse-tiny.t'    => "Moose doesn't support ::Tiny",
+
         '031_roles_applied_in_create.t' => 't/lib/* classes are not Moose classes/roles',
     );
 
@@ -67,7 +67,10 @@ sub create_moose_compatibility_test {
             wanted => sub {
                 return unless -f $_;
 
-                return if /failing/; # skip tests in failing/ directories
+                return if /failing/; # skip tests in failing/ directories which  are Moose specific
+
+                return if /100_with_moose/; # tests with Moose
+                return if /deprecated/;
 
                 my $basename = File::Basename::basename($_);
                 return if $basename =~ /^\./;
@@ -91,8 +94,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;
                 };