X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=Makefile.PL;h=32f04c677483f59d78e97155c67f3e41104b05b5;hp=d4d11e384677740debbfc9c36e963aaae6af0a95;hb=people%2Fabraxxa%2Fhas_relationship_loaded;hpb=8d6b1478d8fa6f7c76e313ee72a72d5eb4c24d03 diff --git a/Makefile.PL b/Makefile.PL index d4d11e3..32f04c6 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -12,11 +12,20 @@ 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/'; +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,13 +35,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 @@ -41,48 +43,67 @@ 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 +### +### 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.009014', - '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 = { # 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', @@ -94,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) @@ -144,20 +154,44 @@ 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({ + 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 <