X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=819399500e24cbdd49e3b6897ff2c6eecb3894fe;hb=d59071409eb4fa2cf01736a2ee2f5607f75fed37;hp=d12d21af62e1662d1bfeb9cec9a050d9ece5564b;hpb=a4367b26b7b086d368880cd4d822eb4fb34603e7;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index d12d21a..8193995 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)
@@ -17,6 +17,7 @@ BEGIN {
 name     'DBIx-Class';
 perl_version '5.008001';
 all_from 'lib/DBIx/Class.pm';
+Meta->{values}{x_authority} = 'cpan:RIBASUSHI';
 
 tests_recursive (qw|
     t
@@ -41,6 +42,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
@@ -58,14 +62,15 @@ my $runtime_requires = {
   'Context::Preserve'        => '0.01',
   'Data::Dumper::Concise'    => '2.020',
   'Data::Page'               => '2.00',
+  'Devel::GlobalDestruction' => '0',
   'Hash::Merge'              => '0.12',
-  'Moo'                      => '0.009013',
+  'Moo'                      => '0.009100',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'namespace::clean'         => '0.20',
   'Path::Class'              => '0.18',
   'Scope::Guard'             => '0.03',
-  'SQL::Abstract'            => '1.72',
+  'SQL::Abstract'            => '1.73',
   'Try::Tiny'                => '0.04',
 
   # dual-life corelibs needing a specific bugfixed version
@@ -102,26 +107,19 @@ if (-e '.git' or -e '.svn') {
   test_requires 'bareword::filehandles' => '0.003';
 }
 
-# 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!         ***
-***                                                                        ***
-******************************************************************************
-******************************************************************************
-
-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
@@ -152,9 +150,13 @@ if ($Module::Install::AUTHOR  and ! $ENV{MAKELEVEL}) {
   # 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 {
@@ -167,18 +169,6 @@ 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