X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=715ad7c8a836c6f16dd4d40f1ff1ce1b3a00052a;hb=b88b85e73de8ca03cfd1f7bc2ee43d6403302986;hp=1f044f6f656e0719da64f3ca765dc25728bde4ed;hpb=87e7512186510b4bbcb61c61343913aba71924d1;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 1f044f6..715ad7c 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,6 +1,7 @@ -use inc::Module::Install 0.67; +use inc::Module::Install 0.79; use strict; use warnings; +use POSIX (); use 5.006001; # delete this line if you want to send patches for earlier. @@ -8,52 +9,88 @@ name 'DBIx-Class'; perl_version '5.006001'; all_from 'lib/DBIx/Class.pm'; -requires 'Data::Page' => 2.00; -requires 'Scalar::Util' => 0; -requires 'SQL::Abstract' => 1.24; -requires 'SQL::Abstract::Limit' => 0.13; -requires 'Class::C3' => 0.20; -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.08002; -requires 'JSON::Any' => 1.17; -requires 'Scope::Guard' => 0.03; -requires 'Path::Class' => 0; -requires 'List::Util' => 1.19; -requires 'Sub::Name' => 0.04; +# configure_requires so _check_sqlite() below can run +# remove once test deprecated +configure_requires 'DBD::SQLite'; + +requires 'DBD::SQLite' => 1.23; +requires 'Data::Page' => 2.00; +requires 'Scalar::Util' => 0; +requires 'SQL::Abstract' => 1.54; +requires 'SQL::Abstract::Limit' => 0.13; +requires 'Class::C3::Componentised' => 1.0005; +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); +requires 'Encode' => 0 if ($] <= 5.008000); -test_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; -install_script 'script/dbicadmin'; +recommends 'SQL::Translator' => 0.09004; -tests_recursive 't'; +install_script (qw| + script/dbicadmin +|); -# re-build README and require CDBI modules for testing if we're in a checkout +tests_recursive (qw| + t +|); -my @force_build_requires_if_author = qw( - DBIx::ContextualFetch - Class::Trigger - Time::Piece - Clone - Test::Pod::Coverage - Test::Memory::Cycle +# 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' => 0, + + # t/52cycle.t + 'Test::Memory::Cycle' => 0, + + # t/60core.t + 'DateTime::Format::MySQL' => 0, + + # t/72pg.t + $ENV{DBICTEST_PG_DSN} + ? ('Sys::SigAction'=> 0) + : () + , + + # t/93storage_replication.t + 'Moose', => 0.77, + 'MooseX::AttributeHelpers' => 0.12, + 'MooseX::Types', => 0.10, + 'namespace::clean' => 0.11, + 'Hash::Merge', => 0.11, + + # t/96_is_deteministic_value.t + 'DateTime::Format::Strptime' => 0, ); if ($Module::Install::AUTHOR) { - foreach my $module (@force_build_requires_if_author) { - build_requires $module; + foreach my $module (keys %force_requires_if_author) { + build_requires ($module => $force_requires_if_author{$module}); } system('pod2text lib/DBIx/Class.pm > README'); @@ -61,65 +98,80 @@ if ($Module::Install::AUTHOR) { auto_provides; +if ($Module::Install::AUTHOR) { + warn <<'EOW'; +****************************************************************************** +****************************************************************************** +*** *** +*** AUTHOR MODE: all optional test dependencies converted to hard requires *** +*** *** +****************************************************************************** +****************************************************************************** + +EOW +} auto_install; # Have all prerequisites, check DBD::SQLite sanity -if (! $ENV{DBICTEST_NO_SQLITE_CHECK} ) { +_check_sqlite() if (! $ENV{DBICTEST_NO_SQLITE_CHECK} ); - my $pid = fork(); - if (not defined $pid) { - die "Unable to fork(): $!"; - } - elsif (! $pid) { +WriteAll(); - # Win32 does not have real fork()s so a segfault will bring - # everything down. Warn about it. - if ($^O eq 'MSWin32') { - print <<'EOW'; +if ($Module::Install::AUTHOR) { + # Need to do this _after_ WriteAll else it loses 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}} ]; -###################################################################### -# # -# 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. # -# # -###################################################################### + 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/' ], + ]; + Meta->write; +} -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; - } +# This is legacy code. Latest DBD::SQLite developments fixed all known bugs +# in this area. Remove before some arbitrary next version +sub _check_sqlite { + # Win32 does not have real fork()s so a segfault will bring + # everything down. Warn about it below, and don't try fork() + if ($^O ne 'MSWin32') { + + my $pid = fork(); + if (not defined $pid) { + die "Unable to fork(): $!"; + } + elsif (! $pid) { + _torture_sqlite(); exit 0; - } - else { - wait(); + } + else { + eval { + local $SIG{ALRM} = sub { die "timeout\n" }; + alarm 5; + wait(); + alarm 0; + }; + my $exception = $@; + my $sig = $? & 127; - if ($sig == 11) { + + # 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 (<{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}} ]; + _torture_sqlite(); + } +} - 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'; - }; +sub _torture_sqlite { + require DBI; + + for (1 .. 100) { + my $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; } - 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/' ], - ]; - Meta->write; }