X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=b69ec9f32f3d93dc27090aad3dc3dfe07c5578d3;hb=6a5b809ee59551d3362f03af7762e11456420c8e;hp=67ffeee400efeca5e459bad87bf892d25ce6a7ab;hpb=95787afeb4ecec13279ab2fb26a407c0f971b7df;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 67ffeee..b69ec9f 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,155 +1,86 @@ -use inc::Module::Install 0.89; +use inc::Module::Install 0.93; use strict; use warnings; use POSIX (); -use 5.006001; # delete this line if you want to send patches for earlier. +use 5.008001; -# ****** DO NOT ADD OPTIONAL DEPENDENCIES. EVER. --mst ****** +use FindBin; +use lib "$FindBin::Bin/lib"; -name 'DBIx-Class'; -perl_version '5.006001'; -all_from 'lib/DBIx/Class.pm'; +### +### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends() +### All of them should go to DBIx::Class::Optional::Dependencies +### -test_requires 'Test::Builder' => '0.33'; -test_requires 'Test::Deep' => '0'; -test_requires 'Test::Exception' => '0'; -test_requires 'Test::More' => '0.92'; -test_requires 'Test::Warn' => '0.21'; - -test_requires 'File::Temp' => '0.22'; - - -# Core -requires 'List::Util' => '0'; -requires 'Scalar::Util' => '0'; -requires 'Storable' => '0'; - -# Perl 5.8.0 doesn't have utf8::is_utf8() -requires 'Encode' => '0' if ($] <= 5.008000); - -# Dependencies (keep in alphabetical order) -requires 'Carp::Clan' => '6.0'; -requires 'Class::Accessor::Grouped' => '0.09000'; -requires 'Class::C3::Componentised' => '1.0005'; -requires 'Class::Inspector' => '1.24'; -requires 'Data::Page' => '2.00'; -requires 'DBD::SQLite' => '1.25'; -requires 'DBI' => '1.605'; -requires 'JSON::Any' => '1.18'; -requires 'MRO::Compat' => '0.09'; -requires 'Module::Find' => '0.06'; -requires 'Path::Class' => '0.16'; -requires 'Scope::Guard' => '0.03'; -requires 'SQL::Abstract' => '1.60'; -requires 'SQL::Abstract::Limit' => '0.13'; -requires 'Sub::Name' => '0.04'; -requires 'Data::Dumper::Concise' => '1.000'; - -my %replication_requires = ( - 'Moose', => '0.87', - 'MooseX::AttributeHelpers' => '0.21', - 'MooseX::Types', => '0.16', - 'namespace::clean' => '0.11', - 'Hash::Merge', => '0.11', -); - -#************************************************************************# -# Make *ABSOLUTELY SURE* that nothing on this list is a real require, # -# since every module listed in %force_requires_if_author is deleted # -# from the final META.yml (thus will never make it as a CPAN dependency) # -#************************************************************************# -my %force_requires_if_author = ( - %replication_requires, - - # when changing also adjust $DBIx::Class::Storage::DBI::minimum_sqlt_version - 'SQL::Translator' => '0.11002', - -# 'Module::Install::Pod::Inherit' => '0.01', - - # when changing also adjust version in t/02pod.t - 'Test::Pod' => '1.26', - - # when changing also adjust version in t/03podcoverage.t - 'Test::Pod::Coverage' => '1.08', - 'Pod::Coverage' => '0.20', - - # CDBI-compat related - 'DBIx::ContextualFetch' => '0', - 'Class::DBI::Plugin::DeepAbstractSearch' => '0', - 'Class::Trigger' => '0', - 'Time::Piece::MySQL' => '0', - 'Clone' => '0', - 'Date::Simple' => '3.03', - - # t/52cycle.t - 'Test::Memory::Cycle' => '0', - 'Devel::Cycle' => '1.10', - - # t/36datetime.t - # t/60core.t - 'DateTime::Format::SQLite' => '0', - - # t/96_is_deteministic_value.t - 'DateTime::Format::Strptime'=> '0', - - # database-dependent reqs - # - $ENV{DBICTEST_PG_DSN} - ? ( - 'Sys::SigAction' => '0', - 'DBD::Pg' => '2.009002', - 'DateTime::Format::Pg' => '0', - ) : () - , - - $ENV{DBICTEST_MYSQL_DSN} - ? ( - 'DateTime::Format::MySQL' => '0', - ) : () - , - - $ENV{DBICTEST_ORA_DSN} - ? ( - 'DateTime::Format::Oracle' => '0', - ) : () - , - - $ENV{DBICTEST_SYBASE_DSN} - ? ( - 'DateTime::Format::Sybase' => 0, - ) : () - , -); -#************************************************************************# -# Make ABSOLUTELY SURE that nothing on the list above is a real require, # -# since every module listed in %force_requires_if_author is deleted # -# from the final META.yml (thus will never make it as a CPAN dependency) # -#************************************************************************# +name 'DBIx-Class'; +perl_version '5.008001'; +all_from 'lib/DBIx/Class.pm'; +my $build_requires = { + 'DBD::SQLite' => '1.25', +}; + +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', +}; + +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', + 'Class::Inspector' => '1.24', + 'Data::Page' => '2.00', + 'DBI' => '1.609', + 'MRO::Compat' => '0.09', + 'Module::Find' => '0.06', + 'Path::Class' => '0.16', + '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 }, +}; -install_script (qw| - script/dbicadmin -|); +# re-build README and require extra modules for testing if we're in a checkout +if ($Module::Install::AUTHOR) { -tests_recursive (qw| - t -|); + print "Regenerating README\n"; + system('pod2text lib/DBIx/Class.pm > README'); -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'; + if (-f 'MANIFEST') { + print "Removing MANIFEST\n"; + unlink 'MANIFEST'; + } -no_index 'DBIx::Class::SQLAHacks'; -no_index 'DBIx::Class::SQLAHacks::MSSQL'; -no_index 'DBIx::Class::Storage::DBI::AmbiguousGlob'; -no_index 'DBIx::Class::Storage::DBIHacks'; + print "Regenerating Optional/Dependencies.pod\n"; + require DBIx::Class::Optional::Dependencies; + DBIx::Class::Optional::Dependencies->_gen_pod; -# re-build README and require extra modules for testing if we're in a checkout +# FIXME Disabled due to unsolved issues, ask theorbtwo +# require Module::Install::Pod::Inherit; +# PodInherit(); -if ($Module::Install::AUTHOR) { warn <<'EOW'; ****************************************************************************** ****************************************************************************** @@ -161,32 +92,72 @@ if ($Module::Install::AUTHOR) { EOW - foreach my $module (sort keys %force_requires_if_author) { - build_requires ($module => $force_requires_if_author{$module}); - } + $reqs->{test_requires} = { + %{$reqs->{test_requires}}, + %{DBIx::Class::Optional::Dependencies->_all_optional_requirements}, + }; +} - print "Regenerating README\n"; - system('pod2text lib/DBIx/Class.pm > README'); +# compose final req list, for alphabetical ordering +my %final_req; +for my $rtype (keys %$reqs) { + for my $mod (keys %{$reqs->{$rtype}} ) { - if (-f 'MANIFEST') { - print "Removing MANIFEST\n"; - unlink 'MANIFEST'; + # sanity check req duplications + if ($final_req{$mod}) { + die "$mod specified as both a $rtype and a $final_req{$mod}[1]\n"; + } + + $final_req{$mod} = [ $rtype, $reqs->{$rtype}{$mod}||0 ], } +} -# require Module::Install::Pod::Inherit; -# PodInherit(); +# actual require +for my $mod (sort keys %final_req) { + my ($rtype, $ver) = @{$final_req{$mod}}; + no strict 'refs'; + $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 +/); + + auto_install(); WriteAll(); + # Re-write META.yml to _exclude_ all forced requires (we do not want to ship this) if ($Module::Install::AUTHOR) { - Meta->{values}{build_requires} = [ grep - { not exists $force_requires_if_author{$_->[0]} } - ( @{Meta->{values}{build_requires}} ) + # 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;