use dist-checkconflicts

[gitmo/Class-MOP.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 6cc4507..f61a293 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,6 +1,8 @@
 use strict;
 use warnings;
 use inc::Module::Install;
+use Module::Install::AuthorRequires;
+use Module::Install::ExtraTests;
 use 5.008001;
 
 check_conflicts();
@@ -10,19 +12,47 @@ 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};
+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 'MRO::Compat'  => '0.05';
-requires 'Scalar::Util' => '1.18';
-requires 'Sub::Name'    => '0.04';
+requires 'Dist::CheckConflicts';
+requires 'Eval::Closure';
+requires 'List::MoreUtils'             => '0.12';
+requires 'MRO::Compat'                 => '0.05';
+requires 'Package::DeprecationManager' => '0.10';
+requires 'Package::Stash'              => '0.15';
+requires 'Package::Stash::XS'          => '0.17';
+requires 'Scalar::Util'                => '1.18';
+requires 'Sub::Name'                   => '0.05';
+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::Fatal'    => '0.001';
+test_requires 'Test::Requires' => '0.05';
+
+author_requires 'Algorithm::C3';
+author_requires 'Module::Info';
+author_requires 'Test::LeakTrace';
+author_requires 'Test::NoTabs';
+author_requires 'Test::Output';
+author_requires 'Test::Spelling';
+
+configure_requires 'Dist::CheckConflicts';
+configure_requires 'Package::Stash::Conflicts';
+
+repository 'git://git.moose.perl.org/Class-MOP.git';
+add_metadata(x_authority => 'cpan:STEVAN');
+
+extra_tests();
 
 makemaker_args( CCFLAGS => $ccflags );
 
@@ -57,43 +87,31 @@ 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.72',
-    );
-
-    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";
-
+    if (eval { require 'lib/Class/MOP/Conflicts.pm'; 1; }) {
+        if (eval { Class::MOP::Conflicts->check_conflicts; 1 }) {
+            return;
+        }
+        else {
+            my $err = $@;
+            $err =~ s/^/    /mg;
+            warn "***\n$err***\n";
+        }
+    }
+    else {
+        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.
+    Your toolchain doesn't support configure_requires, so Dist::CheckConflicts
+    hasn't been installed yet. You should check for conflicting modules
+    manually using the 'cmop-conflicts' script that is installed with
+    this distribution once the installation finishes.
 ***
-
 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 ) );
+    return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
 
     sleep 4;
 }