X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=2ecd83f7d018f123737c64597cc3c81799922b99;hb=93963f599878e7c2808c58083d214da5270a2691;hp=290045d3d26a15ac8dd563f1b159a181923a1e7c;hpb=c78f9f5b61dea550678570f3659576386e6c67f2;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 290045d..2ecd83f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use 5.008001;
-use inc::Module::Install 1.00;
+use inc::Module::Install 1.06;
 
 ##
 ## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad)
@@ -53,11 +53,13 @@ my $runtime_requires = {
   'Class::Accessor::Grouped' => '0.10002',
   'Class::C3::Componentised' => '1.0009',
   'Class::Inspector'         => '1.24',
+  'Class::Method::Modifiers' => '1.06',
   'Config::Any'              => '0.20',
   'Context::Preserve'        => '0.01',
   'Data::Dumper::Concise'    => '2.020',
   'Data::Page'               => '2.00',
   'Hash::Merge'              => '0.12',
+  'Moo'                      => '0.009013',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'namespace::clean'         => '0.20',
@@ -89,6 +91,17 @@ my $test_requires = {
   'Package::Stash'           => '0.28',
 };
 
+# make strictures.pm happy (DO NOT LIKE, TOO MUCH XS!)
+# (i.e. what if the .git/.svn is *not* because of DBIC?)
+#
+# Note - this is added as test_requires *directly*, so it gets properly
+# excluded on META.yml cleansing
+if (-e '.git' or -e '.svn') {
+  test_requires 'indirect'              => '0.25';
+  test_requires 'multidimensional'      => '0.008';
+  test_requires 'bareword::filehandles' => '0.003';
+}
+
 # Bail out on parallel testing
 if (
   ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x
@@ -128,7 +141,9 @@ if ($Module::Install::AUTHOR  and ! $ENV{MAKELEVEL}) {
   my $args = {
     skip_author_deps => undef,
   };
-  $getopt->getoptions($args, 'skip_author_deps');
+  $getopt->getoptions($args, qw/
+    skip_author_deps|skip-author-deps
+  /);
   if (@ARGV) {
     warn "\nIgnoring unrecognized option(s): @ARGV\n\n";
   }
@@ -152,6 +167,18 @@ nonauthor_stop_distdir_creation:
 \t\$(NOECHO) \$(ECHO) Creation of dists in non-author mode is not allowed
 \t\$(NOECHO) \$(FALSE)
 EOP
+
+  # if the user has this env var set and no SQLT installed, tests will fail
+  # same rationale for direct test_requires as the strictures stuff above
+  # (even though no dist will be created from this)
+  if ($ENV{DBICTEST_SQLT_DEPLOY}) {
+    local @INC = ('lib', @INC);
+    require DBIx::Class::Optional::Dependencies;
+    my $dep_req = DBIx::Class::Optional::Dependencies->req_list_for('deploy');
+    for (keys %$dep_req) {
+      test_requires ($_ => $dep_req->{$_})
+    }
+  }
 }
 
 # compose final req list, for alphabetical ordering