X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=5212dcd531ed5549b6f36228cdaa8a296e1f6636;hb=a93441f2e2e22127602b7c24e05237ffc10ab786;hp=81622347228251a617490b017d1173895157b0a3;hpb=a0c96f2461b2a46b242b8432deb0ad88880f73cd;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 8162234..5212dcd 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -47,6 +47,13 @@ my $runtime_requires = { # being 'DBI' => '1.57', + # on older versions first() leaks + # for the time being make it a hard dep - when we get + # rid of Sub::Name will revisit this (possibility is + # to use Devel::HideXS to force the pure-perl version + # or something like that) + 'List::Util' => '1.16', + # XS (or XS-dependent) libs 'Sub::Name' => '0.04', @@ -68,6 +75,11 @@ 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 = { @@ -139,9 +151,29 @@ if ($Module::Install::AUTHOR and ! $ENV{MAKELEVEL}) { warn "\nIgnoring unrecognized option(s): @ARGV\n\n"; } + # 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({ + 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; + require File::Spec; # string-eval, not do(), because we need to provide the - # $reqs and $*_requires lexicals to the included file + # $mm_proto, $reqs and $*_requires lexicals to the included file # (some includes *do* modify $reqs above) for my $inc (sort glob ( File::Spec->catfile('maint', 'Makefile.PL.inc', '*') ) ) { my $src = do { local (@ARGV, $/) = $inc; <> } or die $!;