X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=58c0c561dc694a636cce9f8ac0e69613066c793a;hb=6882de2b334aac0a278b1984e82ddaca2ddff2b4;hp=38a89db3b6e7734b38a9d8ef1d1ddb33a54d8ed9;hpb=f466f65bc9bc276da0ae840d661c4bab11495837;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 38a89db..58c0c56 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,54 +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.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;
-requires 'namespace::clean'          => 0.09;
+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 'DBD::SQLite'         => 1.14;
+# configure_requires so the sanity check below can run
+configure_requires 'DBD::SQLite'    => 1.21;
 
 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 CDBI modules for testing if we're in a checkout
+# 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,
 
-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');
@@ -64,6 +82,18 @@ 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
@@ -126,8 +156,15 @@ EOW
           wait();
           alarm 0;
       };
+      my $exception = $@;
+
       my $sig = $? & 127;
-      if ($@ || $sig == POSIX::SIGSEGV) {
+
+# 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 (<<EOE);
 
 ############################### WARNING #################################
@@ -157,10 +194,10 @@ WriteAll();
 
 
 if ($Module::Install::AUTHOR) {
-  # Need to do this _after_ WriteAll else it looses track of them
+  # Need to do this _after_ WriteAll else it loses track of them
   Meta->{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;
@@ -185,3 +222,4 @@ if ($Module::Install::AUTHOR) {
   ];
   Meta->write;
 }
+