X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=ae6ba95cc651ea38f35c5a357951ca92e2c93a11;hb=024c32c4b2451aeb3fbce45aeab6a3ed0ea2c1ed;hp=44635824eba619e4d5d07564f40b402be8583433;hpb=406a97c2aab476c7a52f7c623a95f275eeb376f3;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/Makefile.PL b/Makefile.PL
index 4463582..ae6ba95 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,14 +7,14 @@ 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;
@@ -84,8 +84,16 @@ 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";
 
@@ -101,8 +109,17 @@ if ($Module::Install::AUTHOR && ! $args->{skip_author_deps}) {
 
     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;