X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=32f04c677483f59d78e97155c67f3e41104b05b5;hb=wip%2Finsert_select_take2;hp=1975940dc1785793eacd19638e4f452301421e9b;hpb=e01862e481716a38079f38aa688f9a5c6317c449;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 1975940..32f04c6 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -12,6 +12,7 @@ use inc::Module::Install 1.06;
 # for that)
 BEGIN {
   $Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) );
+  makemaker_args( NORECURS => 1 );
 }
 
 homepage 'http://www.dbix-class.org/';
@@ -45,6 +46,12 @@ my $runtime_requires = {
   # 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
+###
+### IMPORTANT - do not raise this dependency
+### even though many bugfixes are present in newer versions, the general DBIC
+### rule is to bend over backwards for available DBI versions (given upgrading
+### them is often *not* easy or even possible)
+###
   'DBI'                      => '1.57',
 
   # on older versions first() leaks
@@ -58,7 +65,7 @@ my $runtime_requires = {
   'Sub::Name'                => '0.04',
 
   # pure-perl (FatPack-able) libs
-  'Class::Accessor::Grouped' => '0.10009',
+  'Class::Accessor::Grouped' => '0.10010',
   'Class::C3::Componentised' => '1.0009',
   'Class::Inspector'         => '1.24',
   'Config::Any'              => '0.20',
@@ -75,16 +82,28 @@ my $runtime_requires = {
   'Scope::Guard'             => '0.03',
   'SQL::Abstract'            => '1.73',
   'Try::Tiny'                => '0.07',
+
+  # Technically this is not a core dependency - it is only required
+  # by the MySQL codepath. However this particular version is bundled
+  # since 5.10.0 and is a pure-perl module anyway - let it slide
+  'Text::Balanced'           => '2.00',
 };
 
 my $build_requires = {
   # needed for testing only, not for operation
   # we will move away from this dep eventually, perhaps to DBD::CSV or something
+###
+### IMPORTANT - do not raise this dependency
+### even though many bugfixes are present in newer versions, the general DBIC
+### rule is to bend over backwards for available DBDs (given upgrading them is
+### often *not* easy or even possible)
+###
   'DBD::SQLite'              => '1.29',
 };
 
 my $test_requires = {
   'File::Temp'               => '0.22',
+  'Test::Deep'               => '0.101',
   'Test::Exception'          => '0.31',
   'Test::Warn'               => '0.21',
   'Test::More'               => '0.94',
@@ -96,17 +115,6 @@ 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)
@@ -149,9 +157,20 @@ if ($Module::Install::AUTHOR  and ! $ENV{MAKELEVEL}) {
   # We need the MM facilities to generate the pieces for the final MM run.
   # Just instantiate a throaway object here
   my $mm_proto = ExtUtils::MakeMaker->new({
+    NORECURS => 1,
     NAME => Meta->name || die 'The Module::Install metadata must be available at this point but is not - did you rearrange the Makefile.PL...?',
   });
 
+  # Crutch for DISTBUILDING_IN_HELL
+  # Spits back a working dos2unix snippet to be used on the supplied path(s)
+  # Ironically EUMM's dos2unix is broken on win32 itself - it does
+  # not take into account the CRLF layer present on win32
+  my $crlf_fixup = sub {
+    return '' unless ($^O eq 'MSWin32' or $^O eq 'cygwin');
+    my $targets = join ', ', map { "q($_)" } @_;
+    "\t" . $mm_proto->oneliner( qq(\$ENV{PERLIO}='unix' and system( \$^X, qw( -MExtUtils::Command -e dos2unix -- ), $targets ) ) );
+  };
+
   # we are in the process of (re)writing the makefile - some things we
   # call below very well may fail
   local $ENV{DBICTEST_NO_MAKEFILE_VERIFICATION} = 1;