X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=Makefile.PL;h=1b45288039697bcb5b7a98d1ac324ea32c375aaf;hp=c6057cd114c2b8b28e20d39d1de0c76dd5408bf2;hb=fcf32d045;hpb=0e016219a6cd54d7356eec8109d93af6ab05c2e9 diff --git a/Makefile.PL b/Makefile.PL index c6057cd..1b45288 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) @@ -12,11 +12,20 @@ use inc::Module::Install 1.00; # 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/'; +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,18 +35,14 @@ 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'; - ### ### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends() ### All of them *MUST* go to DBIx::Class::Optional::Dependencies ### my $runtime_requires = { + # FIXME - temporary workaround for RT#83143 (Path::Class) + 'File::Spec' => '3.30', + # FIXME - temporary, needs throwing out for something more efficient 'Data::Compare' => '1.22', @@ -46,28 +51,39 @@ 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', # 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', + 'SQL::Abstract' => '1.73', + 'Try::Tiny' => '0.07', - # dual-life corelibs needing a specific bugfixed version - 'File::Path' => '2.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 = { @@ -89,26 +105,30 @@ my $test_requires = { 'Package::Stash' => '0.28', }; -# Bail out on parallel testing -if ( - ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x - and - $1 > 1 -) { die < '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 +138,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,25 +148,51 @@ 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"; } + # 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; + 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 (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 meta cleanup, no sanity checks, etc) postamble <