X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=2ecd83f7d018f123737c64597cc3c81799922b99;hb=93963f599878e7c2808c58083d214da5270a2691;hp=244c3322955d0c732641edf32b9c16a0f214af5f;hpb=0d4740b34575fedb937a31d0189187f126f663f0;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 244c332..2ecd83f 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,96 +1,184 @@ -use inc::Module::Install 0.89; use strict; use warnings; -use POSIX (); use 5.008001; - -use FindBin; -use lib "$FindBin::Bin/lib"; +use inc::Module::Install 1.06; + +## +## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad) +## +# 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'; perl_version '5.008001'; all_from 'lib/DBIx/Class.pm'; -my $build_requires = { - 'DBD::SQLite' => '1.25', -}; +tests_recursive (qw| + t +|); -my $test_requires = { - 'File::Temp' => '0.22', - 'Test::Builder' => '0.33', - 'Test::Deep' => '0', - 'Test::Exception' => '0', - 'Test::More' => '0.92', - 'Test::Warn' => '0.21', -}; +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 = { - # Core - 'List::Util' => '0', - 'Scalar::Util' => '0', - 'Storable' => '0', - - # Dependencies - 'Carp::Clan' => '6.0', - 'Class::Accessor::Grouped' => '0.09002', - 'Class::C3::Componentised' => '1.0005', + # FIXME - temporary, needs throwing out for something more efficient + 'Data::Compare' => '1.22', + + # 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 + 'DBI' => '1.57', + + # XS (or XS-dependent) libs + 'Sub::Name' => '0.04', + + # pure-perl (FatPack-able) libs + 'Class::Accessor::Grouped' => '0.10002', + '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', - 'DBI' => '1.609', - 'JSON::Any' => '1.18', + 'Hash::Merge' => '0.12', + 'Moo' => '0.009013', 'MRO::Compat' => '0.09', 'Module::Find' => '0.06', - 'Path::Class' => '0.16', + 'namespace::clean' => '0.20', + 'Path::Class' => '0.18', 'Scope::Guard' => '0.03', - 'SQL::Abstract' => '1.61', - 'SQL::Abstract::Limit' => '0.13', - 'Sub::Name' => '0.04', - 'Data::Dumper::Concise' => '1.000', -}; + 'SQL::Abstract' => '1.72', + 'Try::Tiny' => '0.04', -# this is so we can order requires alphabetically -# copies are needed for author requires injection -my $reqs = { - build_requires => { %$build_requires }, - requires => { %$runtime_requires }, - test_requires => { %$test_requires }, + # dual-life corelibs needing a specific bugfixed version + 'File::Path' => '2.07', }; -# re-build README and require extra modules for testing if we're in a checkout -if ($Module::Install::AUTHOR) { +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', +}; - print "Regenerating README\n"; - system('pod2text lib/DBIx/Class.pm > README'); +my $test_requires = { + 'File::Temp' => '0.22', + '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', - if (-f 'MANIFEST') { - print "Removing MANIFEST\n"; - unlink 'MANIFEST'; - } + # 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', +}; - print "Regenerating Optional/Dependencies.pod\n"; - require DBIx::Class::Optional::Dependencies; - DBIx::Class::Optional::Dependencies->_gen_pod; +# 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'; +} -# FIXME Disabled due to unsolved issues, ask theorbtwo -# require Module::Install::Pod::Inherit; -# PodInherit(); +# Bail out on parallel testing +if ( + ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x + and + $1 > 1 +) { die < { %$build_requires }, + requires => { %$runtime_requires }, + test_requires => { %$test_requires }, +}; - $reqs->{test_requires} = { - %{$reqs->{test_requires}}, - %{DBIx::Class::Optional::Dependencies->_all_optional_requirements}, +# 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 (sort glob ( File::Spec->catfile('maint', 'Makefile.PL.inc', '*') ) ) { + eval scalar do { local (@ARGV, $/) = $_; <> } + or die ($@ || $!); + } +} +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 <req_list_for('deploy'); + for (keys %$dep_req) { + test_requires ($_ => $dep_req->{$_}) + } + } } # compose final req list, for alphabetical ordering @@ -100,7 +188,7 @@ for my $rtype (keys %$reqs) { # sanity check req duplications if ($final_req{$mod}) { - die "$mod specified as both a $rtype and a $final_req{$mod}[1]\n"; + die "$mod specified as both a '$rtype' and a '$final_req{$mod}[0]'\n"; } $final_req{$mod} = [ $rtype, $reqs->{$rtype}{$mod}||0 ], @@ -114,46 +202,8 @@ for my $mod (sort keys %final_req) { $rtype->($mod, $ver); } -install_script (qw| - script/dbicadmin -|); - -tests_recursive (qw| - t -|); - -resources 'IRC' => 'irc://irc.perl.org/#dbix-class'; -resources 'license' => 'http://dev.perl.org/licenses/'; -resources 'repository' => 'http://dev.catalyst.perl.org/repos/bast/DBIx-Class/'; -resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class'; - -# Deprecated/internal modules need no exposure -no_index directory => $_ for (qw| - lib/DBIx/Class/SQLAHacks - lib/DBIx/Class/PK/Auto -|); -no_index package => $_ for (qw/ - DBIx::Class::Storage::DBI::AmbiguousGlob - DBIx::Class::SQLAHacks DBIx::Class::Storage::DBIHacks -/); - - +# author-mode or not - this is where we show a list of missing deps +# IFF we are running interactively auto_install(); WriteAll(); - - -# Re-write META.yml to _exclude_ all forced requires (we do not want to ship this) -if ($Module::Install::AUTHOR) { - - # FIXME test_requires is not yet part of META - my %original_build_requires = ( %$build_requires, %$test_requires ); - - print "Regenerating META with author requires excluded\n"; - Meta->{values}{build_requires} = [ grep - { exists $original_build_requires{$_->[0]} } - ( @{Meta->{values}{build_requires}} ) - ]; - - Meta->write; -}