X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=7f935b1f53524a11b33ae8f83fae2fd62ca93e08;hb=6afe3065c86e7d2eef079450c2bac4f000f1645e;hp=9fdd6c391fc5f2c4b48b0cb17c002be65ccbfdfd;hpb=89b5b1c543659ac1e34be49e4c9eff00e0c7cc83;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index 9fdd6c3..7f935b1 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -9,13 +9,9 @@ name 'DBIx-Class'; perl_version '5.006001'; all_from 'lib/DBIx/Class.pm'; -# configure_requires so _check_sqlite() below can run -# remove once test deprecated -configure_requires 'DBD::SQLite'; - requires 'DBD::SQLite' => 1.25; requires 'Data::Page' => 2.00; -requires 'SQL::Abstract' => 1.55; +requires 'SQL::Abstract' => 1.56; requires 'SQL::Abstract::Limit' => 0.13; requires 'Class::C3::Componentised' => 1.0005; requires 'Carp::Clan' => 6.0; @@ -53,6 +49,12 @@ 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'; + + # re-build README and require extra modules for testing if we're in a checkout my %force_requires_if_author = ( @@ -65,17 +67,26 @@ my %force_requires_if_author = ( 'Class::Trigger' => 0, 'Time::Piece::MySQL' => 0, 'Clone' => 0, - 'Date::Simple' => 0, + 'Date::Simple' => 3.03, # t/52cycle.t 'Test::Memory::Cycle' => 0, + 'Devel::Cycle' => 1.10, + # t/inflate/datetime*.t + # t/72.pg + # t/36datetime.t # t/60core.t + 'DateTime::Format::SQLite' => 0, 'DateTime::Format::MySQL' => 0, - - # t/89inflate_datetime.t 'DateTime::Format::Pg' => 0, + # t/73oracle_inflate.t + 'DateTime::Format::Oracle' => 0, + + # t/96_is_deteministic_value.t + 'DateTime::Format::Strptime' => 0, + # t/72pg.t $ENV{DBICTEST_PG_DSN} ? ('Sys::SigAction'=> 0) @@ -89,22 +100,9 @@ my %force_requires_if_author = ( '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'; ****************************************************************************** ****************************************************************************** @@ -115,135 +113,31 @@ if ($Module::Install::AUTHOR) { ****************************************************************************** EOW -} -auto_install; - -# Have all prerequisites, check DBD::SQLite sanity -_check_sqlite() if (! $ENV{DBICTEST_NO_SQLITE_CHECK} ); -WriteAll(); - -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}} ]; - - 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; -} - - -# 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 { - 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 (< $force_requires_if_author{$module}); } - else { # the win32 version - - 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 + print "Regenerating README\n"; + system('pod2text lib/DBIx/Class.pm > README'); - _torture_sqlite(); + if (-f 'MANIFEST') { + print "Removing MANIFEST\n"; + unlink 'MANIFEST'; } } -sub _torture_sqlite { - require DBI; +auto_install(); - 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: $@"; +WriteAll(); - $dbh->do ('CREATE TABLE name_with_no_columns'); # a subtle syntax error - $dbh->do ('COMMIT'); # followed by commit - $dbh->disconnect; - } +# Re-write META.yml to _exclude_ all forced requires (we do not want to ship this) +if ($Module::Install::AUTHOR) { + + Meta->{values}{build_requires} = [ grep + { not exists $force_requires_if_author{$_->[0]} } + ( @{Meta->{values}{build_requires}} ) + ]; + + Meta->write; }