X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=Makefile.PL;h=492368ef27e5219c17f36f093f67d45987f553d2;hp=2ecd83f7d018f123737c64597cc3c81799922b99;hb=f2d11f4aef9b6c116351f0ee327a46551fcd190f;hpb=6c96d73f97cc31543e7066cc7512bd3273c8b657 diff --git a/Makefile.PL b/Makefile.PL index 2ecd83f..492368e 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -3,6 +3,7 @@ use warnings; use 5.008001; use inc::Module::Install 1.06; +BEGIN { makemaker_args( NORECURS => 1 ) } # needs to happen early for old EUMM ## ## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad) @@ -14,9 +15,21 @@ 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'; + +# nothing determined at runtime, except for possibly SQLT dep, see +# comment further down +dynamic_config 0; tests_recursive (qw| t @@ -26,13 +39,6 @@ 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 @@ -44,85 +50,93 @@ 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 + # 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.10010', 'Class::C3::Componentised' => '1.0009', 'Class::Inspector' => '1.24', - 'Class::Method::Modifiers' => '1.06', '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', - 'Moo' => '0.009013', - 'MRO::Compat' => '0.09', - 'Module::Find' => '0.06', - 'namespace::clean' => '0.20', + 'Moo' => '1.002', + '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.77', + '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 = { - # needed for testing only, not for operation - # we will move away from this dep eventually, perhaps to DBD::CSV or something - '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', - # not sure if this is necessary at all, ask schwern some day - 'Test::Builder' => '0.94', + + # 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', # this is already a dep of n::c, but just in case - used by t/55namespaces_cleaned.t # remove and do a manual glob-collection if n::c is no longer a dep '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?) -# +# if the user has this env var set and no SQLT installed, tests will fail # 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'; +# excluded on META.yml cleansing (even though no dist can be created from this) +# we force this req regarless of author_deps, worst case scenario it will +# be specified twice +# +# also note that we *do* set dynamic_config => 0, as this is the only thing +# that we determine dynamically, and in all fairness if someone sets the +# envvar *and* is not running a full Makefile/make/maketest cycle - they get +# to keep the pieces +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->{$_}) + } } -# Bail out on parallel testing -if ( - ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x - and - $1 > 1 -) { die <new( - config => [qw/gnu_getopt bundling_override no_ignore_case pass_through/] - ); - my $args = { - skip_author_deps => undef, - }; - $getopt->getoptions($args, qw/ - skip_author_deps|skip-author-deps - /); - if (@ARGV) { - warn "\nIgnoring unrecognized option(s): @ARGV\n\n"; - } - - require File::Spec; - # 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 ($@ || $!); - } + invoke_author_mode() } 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 <req_list_for('deploy'); - for (keys %$dep_req) { - test_requires ($_ => $dep_req->{$_}) - } - } } # compose final req list, for alphabetical ordering @@ -187,9 +166,8 @@ for my $rtype (keys %$reqs) { for my $mod (keys %{$reqs->{$rtype}} ) { # sanity check req duplications - if ($final_req{$mod}) { - die "$mod specified as both a '$rtype' and a '$final_req{$mod}[0]'\n"; - } + die "$mod specified as both a '$rtype' and a '$final_req{$mod}[0]'\n" + if $final_req{$mod}; $final_req{$mod} = [ $rtype, $reqs->{$rtype}{$mod}||0 ], } @@ -207,3 +185,65 @@ for my $mod (sort keys %final_req) { auto_install(); WriteAll(); + +exit 0; + +# needs to be here to keep 5.8 string eval happy +# (the include of Makefile.PL.inc loop) +my $mm_proto; + +sub invoke_author_mode { + # get options here, make $args available to all snippets + require Getopt::Long; + my $getopt = Getopt::Long::Parser->new( + config => [qw/gnu_getopt bundling_override no_ignore_case pass_through/] + ); + my $args = { + skip_author_deps => undef, + }; + $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 + # + # Also EUMM and MI disagree on what is the format of Meta->name, just + # punt here until a new M::I is shipped (if at all) + my $name = Meta->name || die 'The Module::Install metadata must be available at this point but is not - did you rearrange the Makefile.PL...?'; + $name =~ s/\-/::/g; + $mm_proto = ExtUtils::MakeMaker->new({ + NORECURS => 1, + NAME => $name, + }); + + # 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 + # $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 $!; + eval "use warnings; use strict; $src" or die sprintf + "Failed execution of %s: %s\n", + $inc, + ($@ || $! || 'Unknown error'), + ; + } +}