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

diff --git a/Makefile.PL b/Makefile.PL
index eb3c764..89f64f5 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)
@@ -14,9 +14,17 @@ BEGIN {
   $Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) );
 }
 
+homepage 'http://www.dbix-class.org/';
+resources 'IRC'         => 'irc://irc.perl.org/#dbix-class';
+resources 'license'     => 'http://dev.perl.org/licenses/';
+resources 'repository'  => 'https://github.com/dbsrgits/DBIx-Class';
+resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class';
+resources 'bugtracker'  => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=DBIx-Class';
+
 name     'DBIx-Class';
 perl_version '5.008001';
 all_from 'lib/DBIx/Class.pm';
+Meta->{values}{x_authority} = 'cpan:RIBASUSHI';
 
 tests_recursive (qw|
     t
@@ -26,12 +34,10 @@ install_script (qw|
     script/dbicadmin
 |);
 
-homepage 'http://www.dbix-class.org/';
-resources 'IRC'         => 'irc://irc.perl.org/#dbix-class';
-resources 'license'     => 'http://dev.perl.org/licenses/';
-resources 'repository'  => 'git://git.shadowcat.co.uk/dbsrgits/DBIx-Class.git';
-resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class';
-resources 'bugtracker'  => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=DBIx-Class';
+makemaker_args(
+  PMLIBDIRS => [qw(lib .generated_pod)],
+  PMLIBPARENTDIRS => [qw(lib .generated_pod)],
+);
 
 ###
 ### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends()
@@ -50,24 +56,23 @@ my $runtime_requires = {
   'Sub::Name'                => '0.04',
 
   # pure-perl (FatPack-able) libs
-  'Class::Accessor::Grouped' => '0.10002',
+  'Class::Accessor::Grouped' => '0.10009',
   'Class::C3::Componentised' => '1.0009',
   'Class::Inspector'         => '1.24',
   'Config::Any'              => '0.20',
   'Context::Preserve'        => '0.01',
   'Data::Dumper::Concise'    => '2.020',
   'Data::Page'               => '2.00',
+  'Devel::GlobalDestruction' => '0.09',
   'Hash::Merge'              => '0.12',
-  'MRO::Compat'              => '0.09',
-  'Module::Find'             => '0.06',
-  'namespace::clean'         => '0.20',
+  'Moo'                      => '1.000006',
+  'MRO::Compat'              => '0.12',
+  'Module::Find'             => '0.07',
+  'namespace::clean'         => '0.24',
   'Path::Class'              => '0.18',
   'Scope::Guard'             => '0.03',
-  'SQL::Abstract'            => '1.72',
-  'Try::Tiny'                => '0.04',
-
-  # dual-life corelibs needing a specific bugfixed version
-  'File::Path'               => '2.07',
+  'SQL::Abstract'            => '1.73',
+  'Try::Tiny'                => '0.07',
 };
 
 my $build_requires = {
@@ -89,26 +94,30 @@ my $test_requires = {
   'Package::Stash'           => '0.28',
 };
 
-# Bail out on parallel testing
-if (
-  ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x
-    and
-  $1 > 1
-) { die <<EOP }
-
-******************************************************************************
-******************************************************************************
-***                                                                        ***
-***      PARALLEL TESTING DETECTED ( \$ENV{HARNESS_OPTIONS} = 'j$1' )        ***
-***                                                                        ***
-*** DBIC tests WILL FAIL. It is harder to make them parallel-friendly than ***
-*** it should be (though work is underway). In the meantime you will have  ***
-*** to adjust your environment and re-run the installation. Sorry!         ***
-***                                                                        ***
-******************************************************************************
-******************************************************************************
+# 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';
+}
 
-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)
+# 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->{$_})
+  }
+}
 
 # this is so we can order requires alphabetically
 # copies are needed for potential author requires injection
@@ -118,7 +127,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 +137,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";
   }
@@ -136,14 +148,18 @@ if ($Module::Install::AUTHOR) {
   # string-eval, not do(), because we need to provide the
   # $reqs and $*_requires lexicals to the included file
   # (some includes *do* modify $reqs above)
-  for (sort glob ( File::Spec->catfile('maint', 'Makefile.PL.inc', '*') ) ) {
-    eval scalar do { local (@ARGV, $/) = $_; <> }
-      or die ($@ || $!);
+  for my $inc (sort glob ( File::Spec->catfile('maint', 'Makefile.PL.inc', '*') ) ) {
+    my $src = do { local (@ARGV, $/) = $inc; <> } or die $!;
+    eval "use warnings; use strict; $src" or die sprintf
+      "Failed execution of %s: %s\n",
+      $inc,
+      ($@ || $! || 'Unknown error'),
+    ;
   }
 }
 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