X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=db8d47a0c6f443965a1dcff07cb5b8a57016e74a;hb=2ae1457eead0263b687bd59cd3630b893618e551;hp=31a07a98d5c2090c2d9743b5686b029ea83d8c4c;hpb=0161e7d41446b14acaec6d01754c1ae802ec6f6a;p=gitmo%2FMoose.git

diff --git a/Makefile.PL b/Makefile.PL
index 31a07a9..db8d47a 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,33 +1,43 @@
 use strict;
 use warnings;
-use inc::Module::Install;
+use inc::Module::Install 0.91;
+use Module::Install::ExtraTests;
+use Module::Install::AuthorRequires;
+use 5.008001;
 
 check_conflicts();
 
 name 'Moose';
+perl_version '5.008001';
 all_from 'lib/Moose.pm';
 license 'perl';
 
-# Scalar::Util 1.18 doesn't work on Windows
-my $win32 = !! ( $^O eq 'Win32' or $^O eq 'cygwin' );
-
-# prereqs
-requires 'perl'             => '5.008';
-requires 'Scalar::Util' => $win32 ? '1.17' : '1.18';
 requires 'Carp';
-requires 'Class::MOP'       => '0.65';
-requires 'List::MoreUtils';
-requires 'Sub::Exporter'    => '0.972';
-
-# only used by oose.pm, not Moose.pm :P
-requires 'Filter::Simple' => '0'; 
-
-# things the tests need
-build_requires 'Test::More'      => '0.62';
-build_requires 'Test::Exception' => '0.21';
-build_requires 'Test::LongString';
+requires 'Class::MOP'       => '0.98';
+requires 'Data::OptList'    => '0';
+requires 'List::MoreUtils'  => '0.12';
+requires 'Scalar::Util'     => '1.19';
+requires 'Sub::Exporter'    => '0.980';
+requires 'Sub::Name'        => '0';
+requires 'Task::Weaken'     => '0';
+requires 'Try::Tiny'        => '0.02';
+
+test_requires 'Test::More'      => '0.88';
+test_requires 'Test::Exception' => '0.27';
+
+author_requires 'Test::Inline';
+author_requires 'File::Find::Rule';
+author_requires 'Module::Info';
+author_requires 'Test::Spelling';
+author_requires 'Test::Pod::Coverage';
+author_requires 'Test::NoTabs';
+
+if ( $Module::Install::AUTHOR || $ENV{IS_MAINTAINER} ) {
+    system( $^X, 'author/extract-inline-tests' );
+}
 
-tests_recursive;
+extra_tests();
+tests_recursive();
 
 WriteAll();
 
@@ -36,9 +46,21 @@ WriteAll();
 # before a release.
 sub check_conflicts {
     my %conflicts = (
-        'MooseX::Singleton'        => '0.11',
-        'MooseX::Params::Validate' => '0.05',
-        'Fey::ORM'                 => '0.10',
+        'Fey::ORM'                      => '0.23',
+        'Catalyst'                      => '5.80017',
+        'MooseX::Aliases'               => '0.07',
+        'MooseX::AttributeHelpers'      => '0.22',
+        'MooseX::Attribute::Prototype'  => '0.10',
+        'MooseX::ClassAttribute'        => '0.09',
+        'MooseX::MethodAttributes'      => '0.18',
+        'MooseX::NonMoose'              => '0.05',
+        'MooseX::Params::Validate'      => '0.05',
+        'MooseX::Role::Cmd'             => '0.06',
+        'MooseX::Role::WithOverloading' => '0.04',
+        'MooseX::Singleton'             => '0.19',
+        'MooseX::StrictConstructor'     => '0.07',
+        'MooseX::Types'                 => '0.19',
+        'namespace::autoclean'          => '0.08',
     );
 
     my $found = 0;
@@ -65,9 +87,11 @@ EOF
         }
     }
 
+    return unless $found;
+
     # More or less copied from Module::Build
     return if  $ENV{PERL_MM_USE_DEFAULT};
     return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
 
-    sleep 4 if $found;
+    sleep 4;
 }