X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=3b4f588bfde9bbc72643a66450c41c66717db5f6;hb=0424d17af479679e643a7600078c310a032f46fd;hp=d8225bc17e04402ba6c60a4e6da4fcefb2b8ca30;hpb=971bc4b63114ba9994a8deeeb5bdc297112fa50b;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index d8225bc..3b4f588 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,131 +1,227 @@ -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; -name 'DBIx-Class'; -perl_version '5.006001'; -all_from 'lib/DBIx/Class.pm'; - -requires 'DBD::SQLite' => 1.25; -requires 'Data::Page' => 2.00; -requires 'SQL::Abstract' => 1.56; -requires 'SQL::Abstract::Limit' => 0.13; -requires 'Class::C3::Componentised' => 1.0005; -requires 'Carp::Clan' => 6.0; -requires 'DBI' => 1.605; -requires 'Module::Find' => 0.06; -requires 'Class::Inspector' => 1.24; -requires 'Class::Accessor::Grouped' => 0.08003; -requires 'JSON::Any' => 1.18; -requires 'Scope::Guard' => 0.03; -requires 'Path::Class' => 0.16; -requires 'Sub::Name' => 0.04; -requires 'MRO::Compat' => 0.09; - -# 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); - -test_requires 'Test::More' => 0.82; -test_requires 'Test::Builder' => 0.33; -test_requires 'Test::Warn' => 0.11; -test_requires 'Test::Exception' => 0; -test_requires 'Test::Deep' => 0; - -recommends 'SQL::Translator' => 0.09004; - -install_script (qw| - script/dbicadmin -|); - -tests_recursive (qw| - t -|); +use FindBin; +use lib "$FindBin::Bin/lib"; -resources 'IRC' => 'irc://irc.perl.org/#dbix-class'; -resources 'license' => 'http://dev.perl.org/licenses/'; -resources 'repository' => 'http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/'; -resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class'; +# adjust ENV for $AUTHOR system() calls +use Config; +$ENV{PERL5LIB} = join ($Config{path_sep}, @INC); +use Getopt::Long qw/:config gnu_getopt bundling_override no_ignore_case pass_through/; +my $args = { + skip_author_deps => undef, +}; +GetOptions ($args, 'skip_author_deps'); +if (@ARGV) { + warn "\nIgnoring unrecognized option(s): @ARGV\n\n"; +} -# re-build README and require extra modules for testing if we're in a checkout - -my %force_requires_if_author = ( - 'Test::Pod::Coverage' => 1.04, - 'SQL::Translator' => 0.09004, - - # 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, +### +### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends() +### All of them should go to DBIx::Class::Optional::Dependencies +### - # t/60core.t - 'DateTime::Format::MySQL' => 0, - - # t/89inflate_datetime.t - 'DateTime::Format::Pg' => 0, +name 'DBIx-Class'; +perl_version '5.008001'; +all_from 'lib/DBIx/Class.pm'; - # t/72pg.t - $ENV{DBICTEST_PG_DSN} - ? ('Sys::SigAction'=> 0) - : () - , +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.09003', + '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', + 'SQL::Abstract' => '1.67', + 'SQL::Abstract::Limit' => '0.13', + 'Sub::Name' => '0.04', + 'Data::Dumper::Concise' => '1.000', + 'Scope::Guard' => '0.03', + 'Context::Preserve' => '0.01', + 'Try::Tiny' => '0.04', + 'namespace::clean' => '0.14', +}; + +# 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 }, +}; + + +# require extra modules for testing if we're in a checkout +my $optdep_msg; +if ($Module::Install::AUTHOR) { + if ($args->{skip_author_deps}) { + $optdep_msg = <<'EOW'; - # t/93storage_replication.t - 'Moose', => 0.77, - 'MooseX::AttributeHelpers' => 0.12, - 'MooseX::Types', => 0.10, - 'namespace::clean' => 0.11, - 'Hash::Merge', => 0.11, +****************************************************************************** +****************************************************************************** +*** *** +*** IGNORING AUTHOR MODE: no optional test dependencies will be forced. *** +*** *** +*** If you are using this checkout with the intention of submitting a DBIC *** +*** patch, you are *STRONGLY ENCOURAGED* to install all dependencies, so *** +*** that every possible unit-test will run. *** +*** *** +****************************************************************************** +****************************************************************************** - # t/96_is_deteministic_value.t - 'DateTime::Format::Strptime' => 0, -); +EOW + } + else { + $optdep_msg = <<'EOW'; -if ($Module::Install::AUTHOR) { - warn <<'EOW'; ****************************************************************************** ****************************************************************************** *** *** *** AUTHOR MODE: all optional test dependencies converted to hard requires *** +*** ( to disabled re-run Makefile.PL with --skip_author_deps ) *** *** *** ****************************************************************************** ****************************************************************************** EOW - foreach my $module (keys %force_requires_if_author) { - build_requires ($module => $force_requires_if_author{$module}); + require DBIx::Class::Optional::Dependencies; + $reqs->{test_requires} = { + %{$reqs->{test_requires}}, + map { %$_ } (values %{DBIx::Class::Optional::Dependencies->req_group_list}), + }; + } +} + +# 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); +} + +# output twice since the deplist is > 70 lines +warn $optdep_msg; +auto_install(); +warn $optdep_msg; +# re-create various autogenerated documentation bits +if ($Module::Install::AUTHOR) { + + print "Regenerating README\n"; system('pod2text lib/DBIx/Class.pm > README'); + + if (-f 'MANIFEST') { + print "Removing MANIFEST\n"; + unlink 'MANIFEST'; + } + + 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(); } -auto_provides; +tests_recursive (qw| + t +|); + +install_script (qw| + script/dbicadmin +|); + + +### Mangle makefile - read the comments for more info +# +postamble <<"EOP"; + +# This will add an extra dep-spec for the distdir target, +# which `make` will fold together in a first-come first-serve +# fashion. What we do here is essentially adding extra +# commands to execute once the distdir is assembled (via +# create_distdir), but before control is returned to a higher +# calling rule. +distdir : dbicadmin_pod_inject + +# The pod self-injection code is in fact a hidden option in +# dbicadmin itself +dbicadmin_pod_inject : +\tcd \$(DISTVNAME) && \$(ABSPERL) -Ilib script/dbicadmin --selfinject-pod + +# Regenerate manifest before running create_distdir. +create_distdir : manifest + +EOP + + + +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/Admin + lib/DBIx/Class/SQLAHacks + lib/DBIx/Class/PK/Auto + lib/DBIx/Class/CDBICompat +|); +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) { +if ($Module::Install::AUTHOR && ! $args->{skip_author_deps} ) { + + # FIXME test_requires is not yet part of META + my %original_build_requires = ( %$build_requires, %$test_requires ); - Meta->{values}{build_requires} = [ grep - { not exists $force_requires_if_author{$_->[0]} } - ( @{Meta->{values}{build_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;