X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=17871b8c007eb37287fbb9d8e9794247585393d3;hb=c6e0ee83e0c8e607d62871633570fe1e94079e63;hp=3b349a72953138c5e7940991538b0a95138c8785;hpb=f9dc732bf73b8913b9e37bf9963a57e61e3eb29f;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 3b349a7..17871b8 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,4 +1,4 @@ -use inc::Module::Install 0.67; +use inc::Module::Install 0.89; use strict; use warnings; use POSIX (); @@ -9,31 +9,31 @@ name 'DBIx-Class'; perl_version '5.006001'; all_from 'lib/DBIx/Class.pm'; -requires 'DBD::SQLite' => 1.23; +requires 'DBD::SQLite' => 1.25; requires 'Data::Page' => 2.00; -requires 'Scalar::Util' => 0; -requires 'SQL::Abstract' => 1.51; +requires 'SQL::Abstract' => 1.56; 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 '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.17; +requires 'JSON::Any' => 1.18; requires 'Scope::Guard' => 0.03; -requires 'Path::Class' => 0; -requires 'List::Util' => 1.19; +requires 'Path::Class' => 0.16; 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); +# Core +requires 'List::Util' => 0; +requires 'Scalar::Util' => 0; +requires 'Storable' => 0; -# configure_requires so the sanity check below can run -configure_requires 'DBD::SQLite'; +# 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; @@ -41,9 +41,19 @@ test_requires 'Test::Deep' => 0; recommends 'SQL::Translator' => 0.09004; -install_script 'script/dbicadmin'; +install_script (qw| + script/dbicadmin +|); + +tests_recursive (qw| + t +|); + +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'; -tests_recursive 't'; # re-build README and require extra modules for testing if we're in a checkout @@ -55,35 +65,38 @@ my %force_requires_if_author = ( 'DBIx::ContextualFetch' => 0, 'Class::DBI::Plugin::DeepAbstractSearch' => 0, 'Class::Trigger' => 0, - 'Time::Piece' => 0, + 'Time::Piece::MySQL' => 0, 'Clone' => 0, + 'Date::Simple' => 3.03, # t/52cycle.t 'Test::Memory::Cycle' => 0, + 'Devel::Cycle' => 1.10, # t/60core.t 'DateTime::Format::MySQL' => 0, + + # t/89inflate_datetime.t + 'DateTime::Format::Pg' => 0, + + # t/72pg.t + $ENV{DBICTEST_PG_DSN} + ? ('Sys::SigAction'=> 0) + : () + , # t/93storage_replication.t - 'Moose', => 0, - 'MooseX::AttributeHelpers' => 0.12, + '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 (keys %force_requires_if_author) { - build_requires ($module => $force_requires_if_author{$module}); - } - - system('pod2text lib/DBIx/Class.pm > README'); -} - -auto_provides; - -if ($Module::Install::AUTHOR) { warn <<'EOW'; ****************************************************************************** ****************************************************************************** @@ -94,133 +107,27 @@ if ($Module::Install::AUTHOR) { ****************************************************************************** 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(): $!"; + foreach my $module (keys %force_requires_if_author) { + build_requires ($module => $force_requires_if_author{$module}); } - 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 .. 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; - } - 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 (< README'); } +auto_provides; -WriteAll(); +auto_install; +WriteAll(); +# Re-write META.yml to _exclude_ all forced requires (we do not want to ship this) 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}} ]; - - 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'; - }; - } - 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->{values}{build_requires} = [ grep + { not exists $force_requires_if_author{$_->[0]} } + ( @{Meta->{values}{build_requires}} ) ]; + Meta->write; } -