X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=e2de85ee16d9b333822c5be857d2f7f392e87b34;hb=topic%2Fregex-quote;hp=32f04c677483f59d78e97155c67f3e41104b05b5;hpb=5342cd1ab95f8cf49a6b5bd87d9d7f8f133c53cc;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 32f04c6..e2de85e 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) @@ -12,11 +13,45 @@ 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 ); +} + +## +## TEMPORARY (and non-portable) +## Get trial SQLA +## +BEGIN { + my $target_libdir = 'lib/DBIx/Class/_TempExtlib'; + + if ( ($Module::Install::AUTHOR or $ENV{TRAVIS}) and ! $ENV{MAKELEVEL} ) { + + `rm -rf $target_libdir`; + `mkdir $target_libdir`; + for ( + [ 'SQL-Abstract' => 'master' ], + ) { + my $tdir = "/tmp/dbictemplib/$_->[0]/"; + + `rm -rf $tdir`; + + `GIT_SSH=maint/careless_ssh.bash git clone --bare --quiet --branch=$_->[1] --depth=1 git://git.shadowcat.co.uk/dbsrgits/$_->[0] $tdir`; + printf "\nIncluding %s git rev %s\n", + $_->[0], + scalar `GIT_DIR=$tdir git rev-parse $_->[1]`, + ; + `git archive --format=tar --remote=file://$tdir $_->[1] lib/ | tar --strip-components=1 -xC $target_libdir`; + + #`rm -rf $tdir`; + } + + unshift @INC, $target_libdir; + + no_index directory => $target_libdir; + } } homepage 'http://www.dbix-class.org/'; -resources 'IRC' => 'irc://irc.perl.org/#dbix-class'; +resources 'x_IRC' => 'irc://irc.perl.org/#dbix-class'; +resources 'x_WebIRC' => 'https://chat.mibbit.com/#dbix-class@irc.perl.org'; 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'; @@ -27,6 +62,10 @@ 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 |); @@ -74,13 +113,13 @@ my $runtime_requires = { 'Data::Page' => '2.00', 'Devel::GlobalDestruction' => '0.09', 'Hash::Merge' => '0.12', - 'Moo' => '1.000006', + 'Moo' => '1.004005', 'MRO::Compat' => '0.12', 'Module::Find' => '0.07', 'namespace::clean' => '0.24', 'Path::Class' => '0.18', 'Scope::Guard' => '0.03', - 'SQL::Abstract' => '1.73', + 'SQL::Abstract' => '1.78', 'Try::Tiny' => '0.07', # Technically this is not a core dependency - it is only required @@ -90,6 +129,15 @@ my $runtime_requires = { }; my $build_requires = { +}; + +my $test_requires = { + 'File::Temp' => '0.22', + 'Test::Deep' => '0.101', + 'Test::Exception' => '0.31', + 'Test::Warn' => '0.21', + 'Test::More' => '0.94', + # needed for testing only, not for operation # we will move away from this dep eventually, perhaps to DBD::CSV or something ### @@ -99,16 +147,6 @@ my $build_requires = { ### 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', - # not sure if this is necessary at all, ask schwern some day - 'Test::Builder' => '0.94', # 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 @@ -116,10 +154,15 @@ my $test_requires = { }; # 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) +# Note - this is added as test_requires *directly*, so it gets properly +# 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; @@ -139,6 +182,52 @@ my $reqs = { # 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 + 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 ], + } +} + +# actual require +for my $mod (sort keys %final_req) { + my ($rtype, $ver) = @{$final_req{$mod}}; + no strict 'refs'; + $rtype->($mod, $ver); +} + +# author-mode or not - this is where we show a list of missing deps +# IFF we are running interactively +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( @@ -156,9 +245,14 @@ if ($Module::Install::AUTHOR and ! $ENV{MAKELEVEL}) { # 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({ + # + # 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 => Meta->name || die 'The Module::Install metadata must be available at this point but is not - did you rearrange the Makefile.PL...?', + NAME => $name, }); # Crutch for DISTBUILDING_IN_HELL @@ -188,40 +282,3 @@ if ($Module::Install::AUTHOR and ! $ENV{MAKELEVEL}) { ; } } -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"; - } - - $final_req{$mod} = [ $rtype, $reqs->{$rtype}{$mod}||0 ], - } -} - -# actual require -for my $mod (sort keys %final_req) { - my ($rtype, $ver) = @{$final_req{$mod}}; - no strict 'refs'; - $rtype->($mod, $ver); -} - -# author-mode or not - this is where we show a list of missing deps -# IFF we are running interactively -auto_install(); - -WriteAll();