X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=8287c590bbee045453cf52cb2e4baab9f4a6437a;hb=6aeb950ca4ee7a97ef66f98174ed3637dd90dd66;hp=4d3cb66fb28a7be79d207be210c60adeb69af6ef;hpb=a5ebb8769b79f6d6ce7a01001d7b41b62386f425;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 4d3cb66..8287c59 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,95 +1,156 @@ -use inc::Module::Install 0.67; +use inc::Module::Install 0.93; use strict; use warnings; +use POSIX (); + +use 5.008001; + +use FindBin; +use lib "$FindBin::Bin/lib"; + +### +### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends() +### All of them should go to DBIx::Class::Optional::Dependencies +### -use 5.006001; # delete this line if you want to send patches for earlier. name 'DBIx-Class'; -perl_version '5.006001'; +perl_version '5.008001'; all_from 'lib/DBIx/Class.pm'; -requires 'Data::Page' => 2.00; -requires 'Scalar::Util' => 0; -requires 'SQL::Abstract' => 1.20; -requires 'SQL::Abstract::Limit' => 0.101; -requires 'Class::C3' => 0.13; -requires 'Class::C3::Componentised' => 0; -requires 'Storable' => 0; -requires 'Carp::Clan' => 0; -requires 'DBI' => 1.40; -requires 'Module::Find' => 0; -requires 'Class::Inspector' => 0; -requires 'Class::Accessor::Grouped' => 0.05002; -requires 'JSON::Any' => 1.00; -requires 'Scope::Guard' => 0.03; -requires 'Digest::SHA1' => 2.00; -requires 'Path::Class' => 0; -requires 'List::Util' => 1.19; - -# Perl 5.8.0 doesn't have utf8::is_utf8() -requires 'Encode' => 0 if ($] <= 5.008000); - -test_requires 'DBD::SQLite' => 1.13; -test_requires 'Test::Builder' => 0.33; -test_requires 'Test::Warn' => 0.08; -test_requires 'Test::NoWarnings' => 0.08; -test_requires 'Test::Exception' => 0; - -install_script 'script/dbicadmin'; - -tests "t/*.t t/*/*.t"; - -# re-build README and require CDBI modules for testing if we're in a checkout - -my @force_build_requires_if_author = qw( - DBIx::ContextualFetch - Class::Trigger - Time::Piece -); - +my $build_requires = { + 'DBD::SQLite' => '1.25', +}; + +my $test_requires = { + 'File::Temp' => '0.22', + 'Test::Builder' => '0.33', + 'Test::Exception' => '0', + 'Test::More' => '0.92', + 'Test::Warn' => '0.21', +}; + +my $runtime_requires = { + 'Carp::Clan' => '6.0', + 'Class::Accessor::Grouped' => '0.09002', + 'Class::C3::Componentised' => '1.0005', + 'Class::Inspector' => '1.24', + 'Data::Page' => '2.00', + 'DBI' => '1.609', + 'MRO::Compat' => '0.09', + 'Module::Find' => '0.06', + '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', +}; + +# 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 }, +}; + +# re-build README and require extra modules for testing if we're in a checkout if ($Module::Install::AUTHOR) { - foreach my $module (@force_build_requires_if_author) { - build_requires $module; + print "Regenerating README\n"; + system('pod2text lib/DBIx/Class.pm > README'); + + if (-f 'MANIFEST') { + print "Removing MANIFEST\n"; + unlink 'MANIFEST'; } - system('pod2text lib/DBIx/Class.pm > README'); + print "Regenerating Optional/Dependencies.pod\n"; + require DBIx::Class::Optional::Dependencies; + DBIx::Class::Optional::Dependencies->_gen_pod; + +# FIXME Disabled due to unsolved issues, ask theorbtwo +# require Module::Install::Pod::Inherit; +# PodInherit(); + + warn <<'EOW'; +****************************************************************************** +****************************************************************************** +*** *** +*** AUTHOR MODE: all optional test dependencies converted to hard requires *** +*** *** +****************************************************************************** +****************************************************************************** + +EOW + + $reqs->{test_requires} = { + %{$reqs->{test_requires}}, + %{DBIx::Class::Optional::Dependencies->_all_optional_requirements}, + }; } -auto_provides; +# compose final req list, for alphabetical ordering +my %final_req; +for my $rtype (keys %$reqs) { + for my $mod (keys %{$reqs->{$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); +} -auto_install; +install_script (qw| + script/dbicadmin +|); -WriteAll; +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::SQLAHacks DBIx::Class::Storage::DBIHacks +/); + + +auto_install(); + +WriteAll(); + + +# Re-write META.yml to _exclude_ all forced requires (we do not want to ship this) if ($Module::Install::AUTHOR) { - # Need to do this _after_ WriteAll else it looses track of them - Meta->{values}{build_requires} = [ grep { - my $ok = 1; - foreach my $module (@force_build_requires_if_author) { - if ($_->[0] =~ /$module/) { - $ok = 0; - last; - } - } - $ok; - } @{Meta->{values}{build_requires}} ]; - - my @scalar_keys = Module::Install::Metadata::Meta_TupleKeys(); - my $cr = Module::Install::Metadata->can("Meta_TupleKeys"); - { - no warnings 'redefine'; - *Module::Install::Metadata::Meta_TupleKeys = sub { - return $cr->(@_), 'resources'; - }; - } - Meta->{values}{resources} = [ - [ 'MailingList', 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class' ], - [ 'IRC', 'irc://irc.perl.org/#dbix-class' ], - ]; - Meta->write; -} + # 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; +}