X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=Makefile.PL;h=e44489b12aaad1fc00db0c282079f2945a576366;hp=dc613131a7fe64e09f6a976d2968ea3105b724fa;hb=4549ba4966c026a49409c7dde70f32b2512250b0;hpb=2d60be4d3c0d49f5e5cc518e16ea916989c14496 diff --git a/Makefile.PL b/Makefile.PL index dc61313..e44489b 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,226 +1,300 @@ -use inc::Module::Install 0.67; +use inc::Module::Install 1.00; 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'; +use FindBin; +use lib "$FindBin::Bin/lib"; +use DBIx::Class::Optional::Dependencies; -requires 'Data::Page' => 2.00; -requires 'Scalar::Util' => 0; -requires 'SQL::Abstract' => 1.51; -requires 'SQL::Abstract::Limit' => 0.13; -requires 'MRO::Compat' => 0; -requires 'Class::C3::Componentised' => 1.0004; -requires 'Storable' => 0; -requires 'Carp::Clan' => 0; -requires 'DBI' => 1.40; -requires 'Module::Find' => 0; -requires 'Class::Inspector' => 0; -requires 'Class::Accessor::Grouped' => 0.08003; -requires 'JSON::Any' => 1.17; -requires 'Scope::Guard' => 0.03; -requires 'Path::Class' => 0; -requires 'List::Util' => 1.19; -requires 'Sub::Name' => 0.04; -requires 'MRO::Compat' => 0.09; - -# Perl 5.8.0 doesn't have utf8::is_utf8() -requires 'Encode' => 0 if ($] <= 5.008000); - -# configure_requires so the sanity check below can run -configure_requires 'DBD::SQLite' => 1.14; - -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 'script/dbicadmin'; - -tests_recursive 't'; - -# 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' => 0, - 'Clone' => 0, - - # t/52cycle.t - 'Test::Memory::Cycle' => 0, - - # t/60core.t - 'DateTime::Format::MySQL' => 0, - - # t/93storage_replication.t - 'Moose', => 0, - 'MooseX::AttributeHelpers' => 0.12, - - # t/96_is_deteministic_value.t - 'DateTime::Format::Strptime' => 0, -); +# adjust ENV for $AUTHOR system() calls +use Config; +$ENV{PERL5LIB} = join ($Config{path_sep}, @INC); -if ($Module::Install::AUTHOR) { +use Getopt::Long (); - foreach my $module (keys %force_requires_if_author) { - requires ($module => $force_requires_if_author{$module}); - } - - system('pod2text lib/DBIx/Class.pm > README'); +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, 'skip_author_deps'); +if (@ARGV) { + warn "\nIgnoring unrecognized option(s): @ARGV\n\n"; } -auto_provides; +# get cpanX --installdeps . to behave in a checkout (most users do not need +# the deps for a full test suite run, and if they do - there's MI::AutoInstall +# for that) +## +## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad) +## +$Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) ); + +### +### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends() +### All of them should go to DBIx::Class::Optional::Dependencies +### +name 'DBIx-Class'; +perl_version '5.008001'; +all_from 'lib/DBIx/Class.pm'; + +my $build_requires = { + # needed for testing only, not for operation + 'DBD::SQLite' => '1.29', +}; + +my $test_requires = { + 'File::Temp' => '0.22', + 'Test::Builder' => '0.33', + 'Test::Exception' => '0.31', + 'Test::More' => '0.92', + 'Test::Warn' => '0.21', +}; + +my $runtime_requires = { + 'Carp::Clan' => '6.0', + 'Class::Accessor::Grouped' => '0.10002', + 'Class::C3::Componentised' => '1.0005', + 'Class::Inspector' => '1.24', + 'Config::Any' => '0.20', + 'Context::Preserve' => '0.01', + 'Data::Dumper::Concise' => '1.000', + 'Data::Page' => '2.00', + 'Hash::Merge' => '0.12', + 'MRO::Compat' => '0.09', + 'Module::Find' => '0.06', + 'Path::Class' => '0.18', + 'Scope::Guard' => '0.03', + 'SQL::Abstract' => '1.72', + 'Try::Tiny' => '0.04', + + # XS (or XS-dependent) libs + 'DBI' => '1.609', + 'namespace::clean' => '0.20', + 'Sub::Name' => '0.04', + 'Variable::Magic' => '0.44', + + # dual-life corelibs needing a specific bugfixed version + 'File::Path' => '2.07', +}; + +# 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 }, +}; + +my %reqs_for_group = %{DBIx::Class::Optional::Dependencies->req_group_list}; + +# exclude the rdbms_* groups which are for DBIC users +my $opt_testdeps = { + map { %{$reqs_for_group{$_}} } grep { !/^rdbms_/ } keys %reqs_for_group +}; + +# require extra modules for testing if we're in a checkout +my $optdep_msg; if ($Module::Install::AUTHOR) { - warn <<'EOW'; + if ($args->{skip_author_deps}) { + $optdep_msg = <<'EOW'; + +****************************************************************************** +****************************************************************************** +*** *** +*** 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. *** +*** *** +****************************************************************************** +****************************************************************************** + +EOW + } + else { + $optdep_msg = <<'EOW'; + ****************************************************************************** ****************************************************************************** *** *** *** AUTHOR MODE: all optional test dependencies converted to hard requires *** +*** ( to disable re-run Makefile.PL with --skip_author_deps ) *** *** *** ****************************************************************************** ****************************************************************************** EOW + + $reqs->{test_requires} = { + %{$reqs->{test_requires}}, + %$opt_testdeps + }; + } } -auto_install; -# Have all prerequisites, check DBD::SQLite sanity -if (! $ENV{DBICTEST_NO_SQLITE_CHECK} ) { +# compose final req list, for alphabetical ordering +my %final_req; +for my $rtype (keys %$reqs) { + for my $mod (keys %{$reqs->{$rtype}} ) { - my $pid = fork(); - if (not defined $pid) { - die "Unable to fork(): $!"; - } - elsif (! $pid) { - - # Win32 does not have real fork()s so a segfault will bring - # everything down. Warn about it. - if ($^O eq 'MSWin32') { - print <<'EOW'; - -###################################################################### -# # -# A short stress-testing of DBD::SQLite will follow. If you have a # -# buggy library this might very well be the last text you will see # -# before the installation silently terminates. If this happens it # -# would mean that you are running a buggy version of DBD::SQLite # -# known to randomly segfault on errors. Even if you have the latest # -# CPAN module version, the system sqlite3 dynamic library might have # -# been compiled against an older buggy sqlite3 dev library (oddly # -# DBD::SQLite will prefer the system library against the one bundled # -# with it). You are strongly advised to resolve this issue before # -# proceeding. # -# # -# If this happens to you (this text is the last thing you see), and # -# you just want to install this module without worrying about the # -# tests (which will almost certainly fail) - set the environment # -# variable DBICTEST_NO_SQLITE_CHECK to a true value and try again. # -# # -###################################################################### + # sanity check req duplications + if ($final_req{$mod}) { + die "$mod specified as both a '$rtype' and a '$final_req{$mod}[0]'\n"; + } -EOW - } - - require DBI; - for (1 .. 100) { - my $dbh; - $dbh = DBI->connect ('dbi:SQLite::memory:', undef, undef, { - AutoCommit => 1, - RaiseError => 0, - PrintError => 0, - }) - or die "Unable to connect to database: $@"; - $dbh->do ('CREATE TABLE name_with_no_columns'); # a subtle syntax error - $dbh->do ('COMMIT'); # followed by commit - $dbh->disconnect; - } - - exit 0; + $final_req{$mod} = [ $rtype, $reqs->{$rtype}{$mod}||0 ], } - else { - eval { - local $SIG{ALRM} = sub { die "timeout\n" }; - alarm 5; - wait(); - alarm 0; - }; - my $exception = $@; - - my $sig = $? & 127; - -# make sure process actually dies - $exception && kill POSIX::SIGKILL(), $pid; - - if ($exception || $sig == POSIX::SIGSEGV() || $sig == POSIX::SIGABRT() - || $sig == 7) { # 7 == SIGBUS, haven't seen it but just in case - warn (<($mod, $ver); +} + +# output twice since the deplist is > 70 lines +warn $optdep_msg if $Module::Install::AUTHOR; +auto_install(); +warn $optdep_msg if $Module::Install::AUTHOR; + + +# 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 (Meta->version); + + # FIXME Disabled due to unsolved issues, ask theorbtwo + # require Module::Install::Pod::Inherit; + # PodInherit(); } +tests_recursive (qw| + t +|); + +# temporary(?) until I get around to fix M::I wrt xt/ +# needs Module::Install::AuthorTests +eval { + recursive_author_tests (qw/xt/); + 1; +} || do { + if ($Module::Install::AUTHOR && ! $args->{skip_author_deps}) { + my $err = $@; + eval { require Module::Install::AuthorTests } + || die "\nYou need Module::Install::AuthorTests installed to run this Makefile.PL in author mode (or supply --skip_author_deps):\n\n$@\n"; + die $@; + } +}; + + +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 + +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'; + +# Deprecated/internal modules need no exposure +no_index directory => $_ for (qw| + lib/DBIx/Class/Admin + lib/DBIx/Class/PK/Auto + lib/DBIx/Class/CDBICompat +|); +no_index package => $_ for (qw/ + DBIx::Class::Storage::DBIHacks +/); + WriteAll(); +# Re-write META.yml to _exclude_ all forced build-requires (we do not want to ship +# this) We are also not using M::I::AuthorRequires as this will be an extra dep, +# and deps in Makefile.PL still suck +# Also always test the result so we stop shipping borked dependency lists to CPAN -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 (keys %force_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'; - }; +# FIXME test_requires is not yet part of META +my %original_build_requires = ( %$build_requires, %$test_requires ); +my @all_build_requires = @{delete Meta->{values}{build_requires}}; +my %removed_build_requires; + +for (@all_build_requires) { + if ($original_build_requires{$_->[0]}) { + push @{Meta->{values}{build_requires}}, $_; + } + else { + $removed_build_requires{$_->[0]} = $_->[1] + unless $_->[0] eq 'ExtUtils::MakeMaker'; } - Meta->{values}{resources} = [ - [ 'MailingList', 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class' ], - [ 'IRC', 'irc://irc.perl.org/#dbix-class' ], - [ 'license', 'http://dev.perl.org/licenses/' ], - [ 'repository', 'http://dev.catalyst.perl.org/svnweb/bast/browse/DBIx-Class/' ], - ]; +} + +# Rewrite only in author mode, the original META should not contain anything anyway +# if we executed as non-author +if ($Module::Install::AUTHOR && keys %removed_build_requires) { + print "Regenerating META with author requires excluded\n"; Meta->write; } +# test that we really took things away (just in case, happened twice somehow) +if (! -f 'META.yml') { + warn "No META.yml generated?! aborting...\n"; + exit 1; +} +my $meta = do { local @ARGV = 'META.yml'; local $/; <> }; + +# this is safe as there is a fatal check earlier to make sure $opt_testdeps does +# not contain any real dependencies +my @illegal_leftovers = grep + { $meta =~ /^ \s+ \Q$_\E \: \s+ /mx } + ( sort keys %$opt_testdeps ) +; + +if (@illegal_leftovers) { + die join ("\n", + "\n\nFATAL FAIL! It looks like some author dependencies made it to the META.yml:\n", + map { "\t$_" } @illegal_leftovers + ) . "\n\n"; +}