X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=c0af551634df3b7064422745a5cb6189303062f5;hb=adb2de7dd5a101e6742d23dc70fa8990fdadf02c;hp=9f3a2855c0ebad7f0745ca05211f63fbe3c3746b;hpb=8a9fe0866c58fc3e8d2fd9e78d4990da3fb3a5d2;p=gitmo%2FClass-MOP.git

diff --git a/Makefile.PL b/Makefile.PL
index 9f3a285..c0af551 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,19 +10,39 @@ perl_version '5.008001';
 all_from 'lib/Class/MOP.pm';
 license 'perl';
 
-my $ccflags = ' -I.';
-$ccflags .= ' -Wall' if -d '.svn' || -d '.git' || $ENV{MAINTAINER_MODE};
+my %conflicts = (
+    'Moose' => '1.04',
+);
+
+check_conflicts(%conflicts);
+
+require Config;
+my $ccflags = ( $Config::Config{ccflags} || '' ) . ' -I.';
+
+if ( -d '.git' || $ENV{MAINTAINER_MODE} ) {
+    $ccflags .= ' -Wall -Wdeclaration-after-statement';
+}
 
 requires 'Carp';
+requires 'Data::OptList';
 requires 'Devel::GlobalDestruction';
+requires 'List::MoreUtils' => '0.12';
 requires 'MRO::Compat'  => '0.05';
+requires 'Package::DeprecationManager' => '0.04';
+requires 'Package::Stash';
 requires 'Scalar::Util' => '1.18';
 requires 'Sub::Name'    => '0.04';
+requires 'Try::Tiny'    => '0.02';
 requires 'Task::Weaken';
 
 test_requires 'File::Spec';
-test_requires 'Test::More'      => '0.77';
-test_requires 'Test::Exception' => '0.21';
+test_requires 'Test::More'      => '0.88';
+test_requires 'Test::Exception' => '0.27';
+
+repository 'git://git.moose.perl.org/Class-MOP.git';
+add_metadata(x_authority => 'cpan:STEVAN');
+
+extra_tests();
 
 makemaker_args( CCFLAGS => $ccflags );
 
@@ -57,47 +77,6 @@ EOM
 
 WriteAll();
 
-# Use the cpan-smolder-stable script in the Moose svn root to figure
-# out what on CPAN will break with the latest Moose, then update this
-# before a release.
-sub check_conflicts {
-    my %conflicts = (
-        'Moose' => '0.71',
-    );
-
-    my $found = 0;
-    for my $mod ( sort keys %conflicts ) {
-        eval "require $mod";
-        next if $@;
-
-        my $installed = $mod->VERSION();
-        if ( $installed le $conflicts{$mod} ) {
-
-            print <<"EOF";
-
-***
-    This version of Class::MOP conflicts with the version of
-    $mod ($installed) you have installed.
-
-    You will need to upgrade $mod after installing
-    this version of Class::MOP.
-***
-
-EOF
-
-            $found = 1;
-        }
-    }
-
-    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;
-}
-
 package MY;
 
 use Config;