X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=35e30ad2099e487f55e2c52296a9d3dcddb453b9;hb=ddc0a6c89d212433eb5716b2aa963f63b1f348d1;hp=0af4f151737273463776181365d6b76f9bd3254a;hpb=26ab719a4d6ee414537c815677b9884b64417539;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 0af4f15..35e30ad 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,8 @@
 use inc::Module::Install 0.67;
+use strict;
+use warnings;
+
+use 5.006001; # delete this line if you want to send patches for earlier.
 
 name     'DBIx-Class';
 perl_version '5.006001';
@@ -18,27 +22,39 @@ requires 'Class::Inspector'          => 0;
 requires 'Class::Accessor::Grouped'  => 0.05002;
 requires 'JSON::Any'                 => 1.00; 
 requires 'Scope::Guard'              => 0.03;
-requires 'Digest::SHA1'              => 2.00;
 requires 'Path::Class'               => 0;
 requires 'List::Util'                => 1.19;
+requires 'Sub::Name'                 => 0.04;
 
 # Perl 5.8.0 doesn't have utf8::is_utf8()
 requires 'Encode'                    => 0 if ($] <= 5.008000);  
 
-build_requires 'DBD::SQLite'         => 1.13;
-build_requires 'Test::Builder'       => 0.33;
-build_requires 'Test::Warn'          => 0.08;
-build_requires 'Test::NoWarnings'    => 0.08;
+test_requires 'DBD::SQLite'         => 1.13;
+test_requires 'Test::Builder'       => 0.33;
+test_requires 'Test::Warn'          => 0.08;
+test_requires 'Test::NoWarnings'    => 0.08;
+test_requires 'Test::Exception'     => 0;
 
 install_script 'script/dbicadmin';
 
 tests "t/*.t t/*/*.t";
 
 # re-build README and require CDBI modules for testing if we're in a checkout
-if( -e 'inc/.author' ) {
-  build_requires 'DBIx::ContextualFetch';
-  build_requires 'Class::Trigger';
-  build_requires 'Time::Piece';
+
+my @force_build_requires_if_author = qw(
+  DBIx::ContextualFetch
+  Class::Trigger
+  Time::Piece
+  Clone
+  Test::Pod::Coverage
+  Test::Memory::Cycle
+);
+
+if ($Module::Install::AUTHOR) {
+
+  foreach my $module (@force_build_requires_if_author) {
+    build_requires $module;
+  }
 
   system('pod2text lib/DBIx/Class.pm > README');
 }
@@ -53,16 +69,23 @@ WriteAll;
 if ($Module::Install::AUTHOR) {
   # Need to do this _after_ WriteAll else it looses track of them
   Meta->{values}{build_requires} = [ grep {
-    $_->[0] !~ /
-      DBIx::ContextualFetch |
-      Class::Trigger |
-      Time::Piece
-    /x;
+    my $ok = 1;
+    foreach my $module (@force_build_requires_if_author) {
+      if ($_->[0] =~ /$module/) {
+        $ok = 0;
+        last;
+      }
+    }
+    $ok;
   } @{Meta->{values}{build_requires}} ];
 
   my @scalar_keys = Module::Install::Metadata::Meta_TupleKeys();
-  sub Module::Install::Metadata::Meta_TupleKeys {
-    return @scalar_keys, 'resources';
+  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' ],