X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=Makefile.PL;h=412aa520bd5f0613b8e29718485e93c0f42be5e7;hp=9747fc4a82af666615f07c3b908afa68dc6132c4;hb=eef9b4844e1e297bb1480583c21add02d2e8232e;hpb=8b4d80641f3fda13ee00e6615183265b121e53b1 diff --git a/Makefile.PL b/Makefile.PL index 9747fc4..412aa52 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -3,6 +3,13 @@ use warnings; use 5.008001; use inc::Module::Install 1.06; +BEGIN { + # needs to happen early for old EUMM + makemaker_args( NORECURS => 1 ); + + local @INC = ('lib', @INC); + require DBIx::Class::Optional::Dependencies; +} ## ## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad) @@ -14,113 +21,115 @@ BEGIN { $Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) ); } -name 'DBIx-Class'; +name 'DBIx-Class'; +version_from 'lib/DBIx/Class.pm'; perl_version '5.008001'; -all_from 'lib/DBIx/Class.pm'; -Meta->{values}{x_authority} = 'cpan:RIBASUSHI'; - -tests_recursive (qw| - t -|); - -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, 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', # XS (or XS-dependent) libs 'Sub::Name' => '0.04', # pure-perl (FatPack-able) libs - 'Class::Accessor::Grouped' => '0.10005', + 'Class::Accessor::Grouped' => '0.10012', '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', + 'Devel::GlobalDestruction' => '0.09', 'Hash::Merge' => '0.12', - 'Moo' => '0.009100', - 'MRO::Compat' => '0.09', - 'Module::Find' => '0.06', - 'namespace::clean' => '0.20', - 'Path::Class' => '0.18', + 'Moo' => '2.000', + 'MRO::Compat' => '0.12', + 'Module::Find' => '0.07', + 'namespace::clean' => '0.24', 'Scope::Guard' => '0.03', - 'SQL::Abstract' => '1.73', - 'Try::Tiny' => '0.04', + 'SQL::Abstract' => '1.81', + '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', + + # This has a bug in the caller() override, ideally we need go get rid + # of it entirely, but that's for another maint + # + # FIXME - this does protect tests, but does *NOT* protect the rest of + # DBIC itself from a faulty caller() override. Something more substantial + # needs to be done in the guts of DBIC::Carp + # + 'Sub::Uplevel' => '0.19', # 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?) -# -# 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'; -} + # needed for testing only, not for operation + # we will move away from this dep eventually, perhaps to DBD::CSV or something + %{ DBIx::Class::Optional::Dependencies->req_list_for('test_rdbms_sqlite') }, +}; -# 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 +# if the user has some of these env vars set and the deps are not available, +# tests will fail +# Note - these are added as test_requires *directly*, so they get properly +# excluded on META.yml cleansing (even though no dist can be created from this) +# we force these reqs regarless of --with-optdeps, worst case scenario they 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->{$_}) +# +# also note that we *do* set dynamic_config => 0, as these are the only things +# that we determine dynamically, and in all fairness if someone sets these +# envvars *and* is not running a full Makefile/make/maketest cycle - they get +# to keep the pieces +if ( my @optdeps = ( + $ENV{DBICTEST_SQLT_DEPLOY} ? 'deploy' : (), + $ENV{DBICTEST_VIA_REPLICATED} ? 'replicated' : (), +)) { + my $extra_deps = DBIx::Class::Optional::Dependencies->req_list_for(\@optdeps); + for (keys %$extra_deps) { + test_requires ($_ => $extra_deps->{$_}) } } +tests_recursive ('t'); +tests_recursive ('xt') if ( + $Module::Install::AUTHOR + or + $ENV{DBICTEST_RUN_ALL_TESTS} + or + ( $ENV{TRAVIS}||'' ) eq 'true' + or + ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL5_CPANM_IS_RUNNING} and ! $ENV{RELEASE_TESTING} ) +); + +install_script (qw| + script/dbicadmin +|); + # this is so we can order requires alphabetically # copies are needed for potential author requires injection my $reqs = { @@ -131,39 +140,12 @@ my $reqs = { # 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( - 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 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'), - ; - } + 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 <{$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 ], } @@ -196,4 +177,73 @@ for my $mod (sort keys %final_req) { # IFF we are running interactively auto_install(); -WriteAll(); +{ + # M::I understands unicode in meta but does not write with the right + # layers - fhtagn!!! + local $SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /Wide character in print/ }; + WriteAll(); +} + +exit 0; + + +### +### Nothing user-serviceable beyond this point +### (none of this executes on regular install) +### + + +# 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 = { + with_optdeps => undef, + }; + $getopt->getoptions($args, qw/ + with_optdeps|with-optdeps + /); + 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 ) ) ); + }; + + # 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 ( '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'), + ; + } +}