X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=8f296f1e287786b5e2cf94b3ba60564df21aff8b;hb=namespace-cleanup;hp=db297ef60fc0a06cba03ea1d173305597eb8b8d6;hpb=239fa6bcab5973d85739273213c1a36e3e5dc7f9;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/Makefile.PL b/Makefile.PL
index db297ef..8f296f1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,19 +2,20 @@ use warnings;
 use strict;
 
 use 5.008001;
+use lib '.';
 use inc::Module::Install 1.00;
 
 use Getopt::Long();
 
 my $getopt = Getopt::Long::Parser->new(
-  config => [qw/gnu_getopt bundling_override no_ignore_case pass_through/]
+    config => [qw/gnu_getopt bundling_override no_ignore_case pass_through/]
 );
 my $args = {
-  skip_author_deps => undef,
+    skip_author_deps => undef,
 };
 $getopt->getoptions($args, 'skip_author_deps');
 if (@ARGV) {
-  warn "\nIgnoring unrecognized option(s): @ARGV\n\n";
+    warn "\nIgnoring unrecognized option(s): @ARGV\n\n";
 }
 
 use FindBin;
@@ -49,13 +50,13 @@ requires 'Hash::Merge'                 => '0.12';
 requires 'Lingua::EN::Inflect::Number' => '1.1';
 requires 'Lingua::EN::Tagger'          => '0.23';
 requires 'Lingua::EN::Inflect::Phrase' => '0.15';
-requires 'List::MoreUtils'             => '0.32';
+requires 'List::Util'                  => '1.33';
 requires 'MRO::Compat'                 => '0.09';
 requires 'namespace::clean'            => '0.23';
 requires 'Scope::Guard'                => '0.20';
 requires 'String::ToIdentifier::EN'    => '0.05';
 requires 'String::CamelCase'           => '0.02';
-requires 'Sub::Name'                   => 0;
+requires 'Sub::Util'                   => '1.40';
 requires 'Try::Tiny'                   => 0;
 
 # core, but specific versions not available on older perls
@@ -84,19 +85,42 @@ See also the "Changes" file for the last few revisions.
 EOF
 
 if ($Module::Install::AUTHOR && ! $args->{skip_author_deps}) {
-    eval { require Module::Install::ReadmeFromPod }
-      or die "\nYou need Module::Install::ReadmeFromPod installed to run this Makefile.PL in author mode:\n\n$@\n";
+    my @missing_plugins;
+    for my $plugin (qw(ReadmeFromPod AuthorTests)) {
+        eval "require Module::Install::$plugin" and next;
+        push @missing_plugins, "Module::Install::$plugin";
+        chomp(my $err = $@);
+        $missing_plugins[-1] .= " ($err)"
+            unless $err =~ m{^Can't locate Module/Install/$plugin.pm in \@INC};
+    }
+    die "\nYou need to install the following modules to run this Makefile.PL in author mode:\n\n", join("\n", @missing_plugins), "\n\n"
+        if @missing_plugins;
 
     warn "\n*** AUTHOR MODE: some optional dependencies converted to hard requires.\n\n";
 
     require DBIx::Class::Schema::Loader::Optional::Dependencies;
 
-    test_requires map %$_, values %{ DBIx::Class::Schema::Loader::Optional::Dependencies->req_group_list };
+    test_requires %{DBIx::Class::Schema::Loader::Optional::Dependencies
+        ->modreq_list_for([
+            grep { !/rdbms/ }
+            keys %{ DBIx::Class::Schema::Loader::Optional::Dependencies
+                ->req_group_list
+            }
+        ])};
 
-    DBIx::Class::Schema::Loader::Optional::Dependencies->_gen_pod;
+    DBIx::Class::Schema::Loader::Optional::Dependencies->_gen_pod(undef, 'lib');
 
+    author_tests( 'xt' );
     readme_from( 'lib/DBIx/Class/Schema/Loader.pm' );
     realclean_files( qw[README MANIFEST lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pod] );
+    postamble <<EOP;
+create_distdir: author_stop_distdir_creation
+author_stop_distdir_creation:
+\t\$(NOECHO) \$(ECHO) Creation of dist with author mode deps not allowed
+\t\$(NOECHO) \$(ECHO) Please re-run Makefile.PL with --skip_author_deps
+\t\$(NOECHO) \$(FALSE)
+EOP
+
 }
 
 tests_recursive;