X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=9830868c8f45354aaf9a1ec9d3dc121d863bc017;hb=current%2Fdq;hp=95d1d5eb152254a635830ca3525ede96275072c8;hpb=32e01bb638aec70b5d0340fd42b466d9c766a038;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 95d1d5e..9830868 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -3,35 +3,41 @@ use warnings; use 5.008001; use inc::Module::Install 1.06; +BEGIN { makemaker_args( NORECURS => 1 ) } # needs to happen early for old EUMM ## ## TEMPORARY (and non-portable) ## Get the dq stuff ## -if ($Module::Install::AUTHOR) { - `rm -rf lib/DBIx/Class/Bundled`; - `mkdir lib/DBIx/Class/Bundled`; - for ( - [ 'Data-Query' => 'master' ], - [ 'SQL-Abstract' => 'dq' ], - ) { - my $tdir = '/tmp/dqlib_tmp_clone'; - - `rm -rf $tdir`; - - `GIT_SSH=maint/careless_ssh.bash git clone --quiet git://git.shadowcat.co.uk/dbsrgits/$_->[0] $tdir`; - printf "\nIncluding %s git rev %s\n", - $_->[0], - scalar `GIT_DIR=$tdir/.git git rev-parse origin/$_->[1]`, - ; - `git archive --format=tar --remote=file://$tdir origin/$_->[1] lib/ | tar --strip-components=1 -xC lib/DBIx/Class/Bundled`; - - `rm -rf $tdir`; +my $target_libdir; +BEGIN { + $target_libdir = 'lib/DBIx/Class/_TempExtlib'; + + if ($Module::Install::AUTHOR) { + + `rm -rf $target_libdir`; + `mkdir $target_libdir`; + for ( + [ 'Data-Query' => 'master' ], + [ 'SQL-Abstract' => 'dq' ], + ) { + my $tdir = "/tmp/dqlib/$_->[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`; + } } - `cpanm SQL::ReservedWords 2>&1`; } -use lib 'lib/DBIx/Class/Bundled'; +use lib $target_libdir; ## ## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad) @@ -41,7 +47,6 @@ use lib 'lib/DBIx/Class/Bundled'; # 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/'; @@ -56,6 +61,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 |); @@ -109,7 +118,7 @@ my $runtime_requires = { 'namespace::clean' => '0.24', 'Path::Class' => '0.18', 'Scope::Guard' => '0.03', - 'SQL::Abstract' => '1.73', + 'SQL::Abstract' => '1.77', 'Try::Tiny' => '0.07', # Technically this is not a core dependency - it is only required @@ -123,6 +132,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 ### @@ -132,16 +150,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 @@ -149,10 +157,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; @@ -172,6 +185,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( @@ -189,9 +248,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 @@ -221,40 +285,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();