X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=Makefile.PL;h=df82cb7441a11cac4f716f263cba1f152669fb9a;hp=9a6fd205c7ff3441357a4f208539a7222c89e853;hb=63ee8b7896e02ee888eb26251fc28311721832c5;hpb=b8d22f139c770e2d3fbe0bfab34f4cbda44afb08 diff --git a/Makefile.PL b/Makefile.PL index 9a6fd20..df82cb7 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,141 +1,152 @@ -use inc::Module::Install 1.00; use strict; use warnings; use 5.008001; +use inc::Module::Install 1.06; +BEGIN { + # needs to happen early for old EUMM + makemaker_args( NORECURS => 1 ); -use FindBin; -use lib "$FindBin::Bin/lib"; -use DBIx::Class::Optional::Dependencies; - -# adjust ENV for $AUTHOR system() calls -use Config; -$ENV{PERL5LIB} = join ($Config{path_sep}, @INC); - -use 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, 'skip_author_deps'); -if (@ARGV) { - warn "\nIgnoring unrecognized option(s): @ARGV\n\n"; + local @INC = ('lib', @INC); + require DBIx::Class::Optional::Dependencies; } -# get cpanX --installdeps . to behave in a checkout (most users do not need -# the deps for a full test suite run, and if they do - there's MI::AutoInstall -# for that) ## ## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad) ## -$Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) ); +# get cpanX --installdeps . to behave in a checkout (most users do not expect +# the deps for a full test suite run, and if they do - there's MI::AutoInstall +# for that) +BEGIN { + $Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) ); +} + +name 'DBIx-Class'; +version_from 'lib/DBIx/Class.pm'; +perl_version '5.008001'; ### ### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends() -### All of them should go to DBIx::Class::Optional::Dependencies +### All of them *MUST* go to DBIx::Class::Optional::Dependencies ### +my $runtime_requires = { -name 'DBIx-Class'; -perl_version '5.008001'; -all_from 'lib/DBIx/Class.pm'; + # 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.10012', + 'Class::C3::Componentised' => '1.0009', + 'Context::Preserve' => '0.01', + 'Data::Page' => '2.00', + 'Devel::GlobalDestruction' => '0.09', + 'Hash::Merge' => '0.12', + 'Moo' => '2.002002', + 'MRO::Compat' => '0.12', + 'Module::Find' => '0.07', + 'namespace::clean' => '0.24', + 'Scope::Guard' => '0.03', + 'SQL::Abstract' => '1.81', + '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 = { - # needed for testing only, not for operation - 'DBD::SQLite' => '1.29', }; my $test_requires = { 'File::Temp' => '0.22', - 'Test::Builder' => '0.33', + 'Test::Deep' => '0.101', 'Test::Exception' => '0.31', - 'Test::More' => '0.92', 'Test::Warn' => '0.21', + 'Test::More' => '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', + + # 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') }, }; -my $runtime_requires = { - 'Carp::Clan' => '6.0', - 'Class::Accessor::Grouped' => '0.10002', - 'Class::C3::Componentised' => '1.0005', - 'Class::Inspector' => '1.24', - 'Config::Any' => '0.20', - 'Context::Preserve' => '0.01', - 'Data::Dumper::Concise' => '1.000', - 'Data::Page' => '2.00', - 'Hash::Merge' => '0.12', - 'MRO::Compat' => '0.09', - 'Module::Find' => '0.06', - 'Path::Class' => '0.18', - 'Scope::Guard' => '0.03', - 'SQL::Abstract' => '1.72', - 'Try::Tiny' => '0.04', +# 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 +# +# 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->{$_}) + } +} - # XS (or XS-dependent) libs - 'DBI' => '1.609', - 'namespace::clean' => '0.14', - 'Sub::Name' => '0.04', - 'Variable::Magic' => '0.44', +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} ) +); - # dual-life corelibs needing a specific bugfixed version - 'File::Path' => '2.07', -}; +install_script (qw| + script/dbicadmin +|); # this is so we can order requires alphabetically -# copies are needed for author requires injection +# copies are needed for potential author requires injection my $reqs = { build_requires => { %$build_requires }, requires => { %$runtime_requires }, test_requires => { %$test_requires }, }; -my %reqs_for_group = %{DBIx::Class::Optional::Dependencies->req_group_list}; - -# exclude the rdbms_* groups which are for DBIC users -my $opt_testdeps = { - map { %{$reqs_for_group{$_}} } grep { !/^rdbms_/ } keys %reqs_for_group -}; - -# require extra modules for testing if we're in a checkout -my $optdep_msg; -if ($Module::Install::AUTHOR) { - if ($args->{skip_author_deps}) { - $optdep_msg = <<'EOW'; - -****************************************************************************** -****************************************************************************** -*** *** -*** IGNORING AUTHOR MODE: no optional test dependencies will be forced. *** -*** *** -*** If you are using this checkout with the intention of submitting a DBIC *** -*** patch, you are *STRONGLY ENCOURAGED* to install all dependencies, so *** -*** that every possible unit-test will run. *** -*** *** -****************************************************************************** -****************************************************************************** - -EOW - } - else { - $optdep_msg = <<'EOW'; - -****************************************************************************** -****************************************************************************** -*** *** -*** AUTHOR MODE: all optional test dependencies converted to hard requires *** -*** ( to disable re-run Makefile.PL with --skip_author_deps ) *** -*** *** -****************************************************************************** -****************************************************************************** - -EOW - - $reqs->{test_requires} = { - %{$reqs->{test_requires}}, - %$opt_testdeps - }; - } +# only do author-includes if not part of a `make` run +if ($Module::Install::AUTHOR and ! $ENV{MAKELEVEL}) { + 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 ], } @@ -159,141 +169,77 @@ for my $mod (sort keys %final_req) { $rtype->($mod, $ver); } -# output twice since the deplist is > 70 lines -warn $optdep_msg if $Module::Install::AUTHOR; +# author-mode or not - this is where we show a list of missing deps +# IFF we are running interactively auto_install(); -warn $optdep_msg if $Module::Install::AUTHOR; - -# re-create various autogenerated documentation bits -if ($Module::Install::AUTHOR) { - - print "Regenerating README\n"; - system('pod2text lib/DBIx/Class.pm > README'); - if (-f 'MANIFEST') { - print "Removing MANIFEST\n"; - unlink 'MANIFEST'; - } - - print "Regenerating Optional/Dependencies.pod\n"; - require DBIx::Class::Optional::Dependencies; - DBIx::Class::Optional::Dependencies->_gen_pod (Meta->version); - - # FIXME Disabled due to unsolved issues, ask theorbtwo - # require Module::Install::Pod::Inherit; - # PodInherit(); +{ + # 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; -tests_recursive (qw| - t -|); -# temporary(?) until I get around to fix M::I wrt xt/ -# needs Module::Install::AuthorTests -eval { - recursive_author_tests (qw/xt/); - 1; -} || do { - if ($Module::Install::AUTHOR && ! $args->{skip_author_deps}) { - my $err = $@; - eval { require Module::Install::AuthorTests } - || die "\nYou need Module::Install::AuthorTests installed to run this Makefile.PL in author mode (or supply --skip_author_deps):\n\n$@\n"; - die $@; - } -}; - - -install_script (qw| - script/dbicadmin -|); - - -### Mangle makefile - read the comments for more info -# -postamble <<"EOP"; - -# This will add an extra dep-spec for the distdir target, -# which `make` will fold together in a first-come first-serve -# fashion. What we do here is essentially adding extra -# commands to execute once the distdir is assembled (via -# create_distdir), but before control is returned to a higher -# calling rule. -distdir : dbicadmin_pod_inject - -# The pod self-injection code is in fact a hidden option in -# dbicadmin itself -dbicadmin_pod_inject : -\tcd \$(DISTVNAME) && \$(ABSPERL) -Ilib script/dbicadmin --selfinject-pod - -# Regenerate manifest before running create_distdir. -create_distdir : manifest - -EOP - -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'; - -# Deprecated/internal modules need no exposure -no_index directory => $_ for (qw| - lib/DBIx/Class/Admin - lib/DBIx/Class/PK/Auto - lib/DBIx/Class/CDBICompat -|); -no_index package => $_ for (qw/ - DBIx::Class::Storage::DBIHacks -/); - -WriteAll(); - -# Re-write META.yml to _exclude_ all forced build-requires (we do not want to ship -# this) We are also not using M::I::AuthorRequires as this will be an extra dep, -# and deps in Makefile.PL still suck -# Also always test the result so we stop shipping borked dependency lists to CPAN +### +### Nothing user-serviceable beyond this point +### (none of this executes on regular install) +### -# FIXME test_requires is not yet part of META -my %original_build_requires = ( %$build_requires, %$test_requires ); -my @all_build_requires = @{delete Meta->{values}{build_requires}}; -my %removed_build_requires; -for (@all_build_requires) { - if ($original_build_requires{$_->[0]}) { - push @{Meta->{values}{build_requires}}, $_; - } - else { - $removed_build_requires{$_->[0]} = $_->[1] - unless $_->[0] eq 'ExtUtils::MakeMaker'; +# 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"; } -} - -# Rewrite only in author mode, the original META should not contain anything anyway -# if we executed as non-author -if ($Module::Install::AUTHOR && keys %removed_build_requires) { - print "Regenerating META with author requires excluded\n"; - Meta->write; -} -# test that we really took things away (just in case, happened twice somehow) -if (! -f 'META.yml') { - warn "No META.yml generated?! aborting...\n"; - exit 1; -} -my $meta = do { local @ARGV = 'META.yml'; local $/; <> }; - -# this is safe as there is a fatal check earlier to make sure $opt_testdeps does -# not contain any real dependencies -my @illegal_leftovers = grep - { $meta =~ /^ \s+ \Q$_\E \: \s+ /mx } - ( sort keys %$opt_testdeps ) -; - -if (@illegal_leftovers) { - die join ("\n", - "\n\nFATAL FAIL! It looks like some author dependencies made it to the META.yml:\n", - map { "\t$_" } @illegal_leftovers - ) . "\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'), + ; + } }