From: Peter Rabbitson Date: Fri, 12 Feb 2010 11:46:11 +0000 (+0000) Subject: Move optional deps out of the Makefile X-Git-Tag: v0.08119~14^2~8 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8057ed01e88499fd19213d1e5332034a4f360bb3;p=dbsrgits%2FDBIx-Class.git Move optional deps out of the Makefile --- diff --git a/Makefile.PL b/Makefile.PL index 83d25fc..2d7349e 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -5,136 +5,111 @@ use POSIX (); use 5.008001; -# ****** DO NOT ADD OPTIONAL DEPENDENCIES. EVER. --mst ****** +use FindBin; +use lib "$FindBin::Bin/lib"; 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', + 'JSON::Any' => '1.18', + '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 }, +}; -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'; - -# Dependencies (keep in alphabetical order) -requires 'Carp::Clan' => '6.0'; -requires 'Class::Accessor::Grouped' => '0.09002'; -requires 'Class::C3::Componentised' => '1.0005'; -requires 'Class::Inspector' => '1.24'; -requires 'Data::Page' => '2.00'; -requires 'DBD::SQLite' => '1.25'; -requires 'DBI' => '1.609'; -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.61'; -requires 'SQL::Abstract::Limit' => '0.13'; -requires 'Sub::Name' => '0.04'; -requires 'Data::Dumper::Concise' => '1.000'; - -my %replication_requires = ( - 'Moose', => '0.90', - 'MooseX::Types', => '0.21', - '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/06notabs.t -# 'Test::NoTabs' => '0.9', - - # when changing also adjust version in t/07eol.t -# 'Test::EOL' => '0.6', - - # 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, - ) : () - , - grep $_, @ENV{qw/DBICTEST_SYBASE_ASA_DSN DBICTEST_SYBASE_ASA_ODBC_DSN/} - ? ( - 'DateTime::Format::Strptime' => 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) # -#************************************************************************# +# re-build README and require extra modules for testing if we're in a checkout +if ($Module::Install::AUTHOR) { + + print "Regenerating README\n"; + system('pod2text lib/DBIx/Class.pm > README'); + + if (-f 'MANIFEST') { + print "Removing MANIFEST\n"; + unlink 'MANIFEST'; + } +# 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 + + require DBIx::Class::Optional::Dependencies; + $reqs->{test_requires} = { + %{$reqs->{test_requires}}, + %{DBIx::Class::Optional::Dependencies->all_optional_requirements}, + }; +} + +# 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}[1]\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); +} install_script (qw| script/dbicadmin @@ -159,46 +134,22 @@ no_index package => $_ for (qw/ DBIx::Class::SQLAHacks DBIx::Class::Storage::DBIHacks /); -# re-build README and require extra modules for testing if we're in a checkout - -if ($Module::Install::AUTHOR) { - warn <<'EOW'; -****************************************************************************** -****************************************************************************** -*** *** -*** AUTHOR MODE: all optional test dependencies converted to hard requires *** -*** *** -****************************************************************************** -****************************************************************************** - -EOW - - foreach my $module (sort keys %force_requires_if_author) { - build_requires ($module => $force_requires_if_author{$module}); - } - - print "Regenerating README\n"; - system('pod2text lib/DBIx/Class.pm > README'); - - if (-f 'MANIFEST') { - print "Removing MANIFEST\n"; - unlink 'MANIFEST'; - } - -# require Module::Install::Pod::Inherit; -# PodInherit(); -} 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 - { not exists $force_requires_if_author{$_->[0]} } - ( @{Meta->{values}{build_requires}} ) + { exists $original_build_requires{$_->[0]} } + ( @{Meta->{values}{build_requires}} ) ]; Meta->write; diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm new file mode 100644 index 0000000..2c02144 --- /dev/null +++ b/lib/DBIx/Class/Optional/Dependencies.pm @@ -0,0 +1,102 @@ +package DBIx::Class::Optional::Dependencies; + +use warnings; +use strict; + +# NO EXTERNAL DEPENDENCIES (e.g. C::A::G) +# This module is to be loaded by Makefile.PM on a pristine system + +my $reqs = { + dist => { + #'Module::Install::Pod::Inherit' => '0.01', + }, + + replicated => { + 'Moose' => '0.98', + 'MooseX::Types' => '0.21', + 'namespace::clean' => '0.11', + 'Hash::Merge' => '0.11', + }, + + admin => { + }, + + deploy => { + 'SQL::Translator' => '0.11002', + }, + + author => { + 'Test::Pod' => '1.26', + 'Test::Pod::Coverage' => '1.08', + 'Pod::Coverage' => '0.20', + #'Test::NoTabs' => '0.9', + #'Test::EOL' => '0.6', + }, + + core => { + # 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', + }, + + cdbicompat => { + 'DBIx::ContextualFetch' => '0', + 'Class::DBI::Plugin::DeepAbstractSearch' => '0', + 'Class::Trigger' => '0', + 'Time::Piece::MySQL' => '0', + 'Clone' => '0', + 'Date::Simple' => '3.03', + }, + + rdbms_pg => { + $ENV{DBICTEST_PG_DSN} + ? ( + 'Sys::SigAction' => '0', + 'DBD::Pg' => '2.009002', + 'DateTime::Format::Pg' => '0', + ) : () + }, + + rdbms_mysql => { + $ENV{DBICTEST_MYSQL_DSN} + ? ( + 'DateTime::Format::MySQL' => '0', + 'DBD::mysql' => '0', + ) : () + }, + + rdbms_oracle => { + + $ENV{DBICTEST_ORA_DSN} + ? ( + 'DateTime::Format::Oracle' => '0', + ) : () + }, + + rdbms_ase => { + $ENV{DBICTEST_SYBASE_DSN} + ? ( + 'DateTime::Format::Sybase' => 0, + ) : () + }, + + rdbms_asa => { + grep $_, @ENV{qw/DBICTEST_SYBASE_ASA_DSN DBICTEST_SYBASE_ASA_ODBC_DSN/} + ? ( + 'DateTime::Format::Strptime' => 0, + ) : () + }, +}; + +sub all_optional_requirements { + return { map { %{ $_ || {} } } (values %$reqs) }; +} + +1;