X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=58c0c561dc694a636cce9f8ac0e69613066c793a;hb=6882de2b334aac0a278b1984e82ddaca2ddff2b4;hp=7966ed8da9895e85580981a70eb9f04b817fe6e2;hpb=f421bf764a877932ed5da9a9187d8bfda217f790;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 7966ed8..58c0c56 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,6 +1,7 @@ use inc::Module::Install 0.67; use strict; use warnings; +use POSIX (); use 5.006001; # delete this line if you want to send patches for earlier. @@ -8,52 +9,72 @@ 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.20; -requires 'SQL::Abstract::Limit' => 0.101; -requires 'Class::C3' => 0.13; -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.05002; -requires 'JSON::Any' => 1.00; -requires 'Scope::Guard' => 0.03; -requires 'Path::Class' => 0; -requires 'List::Util' => 1.19; -requires 'Sub::Name' => 0.04; +requires 'Data::Page' => 2.00; +requires 'Scalar::Util' => 0; +requires 'SQL::Abstract' => 1.51; +requires 'SQL::Abstract::Limit' => 0.13; +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); +requires 'Encode' => 0 if ($] <= 5.008000); + +# configure_requires so the sanity check below can run +configure_requires 'DBD::SQLite' => 1.21; -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 'FindBin' => 0; +test_requires 'Test::Deep' => 0; + +recommends 'SQL::Translator' => 0.09004; install_script 'script/dbicadmin'; -tests "t/*.t t/*/*.t"; +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, -# re-build README and require CDBI modules for testing if we're in a checkout + # t/52cycle.t + 'Test::Memory::Cycle' => 0, -my @force_build_requires_if_author = qw( - DBIx::ContextualFetch - Class::Trigger - Time::Piece - Clone - Test::Pod::Coverage - Test::Memory::Cycle + # 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, ); 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,17 +82,59 @@ 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} ) { + 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. # +# # +###################################################################### + +EOW + } + require DBI; - for (1 .. 10) { + for (1 .. 100) { my $dbh; $dbh = DBI->connect ('dbi:SQLite::memory:', undef, undef, { AutoCommit => 1, @@ -87,19 +150,33 @@ auto_install; exit 0; } else { - wait(); + 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) { + foreach my $module (keys %force_requires_if_author) { if ($_->[0] =~ /$module/) { $ok = 0; last; @@ -146,5 +223,3 @@ if ($Module::Install::AUTHOR) { Meta->write; } - -