X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=a88f64e3f06974c86945501da7905a122be4fe1b;hb=d4a39575216302461a304c8c5211109ffb9d39f0;hp=eb3c764215205bd2dad045e7821b1a9c561a9dd0;hpb=fc4b044843ee82f7dc468670a24114bb641a115b;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index eb3c764..a88f64e 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)
@@ -41,6 +41,9 @@ my $runtime_requires = {
   # FIXME - temporary, needs throwing out for something more efficient
   'Data::Compare'            => '1.22',
 
+  # Moo does not yet depend on this higher version
+  'strictures'               => '1.003001',
+
   # DBI itself should be capable of installation and execution in pure-perl
   # mode. However it has never been tested yet, so consider XS for the time
   # being
@@ -53,11 +56,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.009014',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'namespace::clean'         => '0.20',
@@ -89,6 +94,31 @@ 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';
+}
+
+# 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)
+# we force this req regarless of author_deps, worst case scenario it will
+# be specified twice
+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->{$_})
+  }
+}
+
 # Bail out on parallel testing
 if (
   ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x
@@ -118,7 +148,8 @@ my $reqs = {
   test_requires => { %$test_requires },
 };
 
-if ($Module::Install::AUTHOR) {
+# only do author-includes if not part of a `make` run
+if ($Module::Install::AUTHOR  and ! $ENV{MAKELEVEL}) {
   # get options here, make $args available to all snippets
   require Getopt::Long;
   my $getopt = Getopt::Long::Parser->new(
@@ -127,7 +158,9 @@ if ($Module::Install::AUTHOR) {
   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";
   }
@@ -143,7 +176,7 @@ if ($Module::Install::AUTHOR) {
 }
 else {
   # make sure this Makefile can not be used to make a dist
-  # (without the author includes there are no sanity checks)
+  # (without the author includes there are no meta cleanup, no sanity checks, etc)
   postamble <<EOP;
 .PHONY: nonauthor_stop_distdir_creation
 create_distdir: nonauthor_stop_distdir_creation