X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=d8225bc17e04402ba6c60a4e6da4fcefb2b8ca30;hb=971bc4b63114ba9994a8deeeb5bdc297112fa50b;hp=f8ccc292176171fe16f0b8053e4c8a7dfbfb3f0f;hpb=1aaf7f15fee24a5715292ecfb8889a2a7eaf4042;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index f8ccc29..d8225bc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,41 +1,115 @@
-use inc::Module::Install 0.67;
+use inc::Module::Install 0.89;
+use strict;
+use warnings;
+use POSIX ();
+
+use 5.006001; # delete this line if you want to send patches for earlier.
 
 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 'DBD::SQLite'              => 1.25;
+requires 'Data::Page'               => 2.00;
+requires 'SQL::Abstract'            => 1.56;
+requires 'SQL::Abstract::Limit'     => 0.13;
+requires 'Class::C3::Componentised' => 1.0005;
+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.18;
+requires 'Scope::Guard'             => 0.03;
+requires 'Path::Class'              => 0.16;
+requires 'Sub::Name'                => 0.04;
+requires 'MRO::Compat'              => 0.09;
+
+# Core
+requires 'List::Util'               => 0;
+requires 'Scalar::Util'             => 0;
+requires 'Storable'                 => 0;
 
 # 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;
-
-install_script 'script/dbicadmin';
-
-tests "t/*.t t/*/*.t";
+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;
+test_requires 'Test::Deep'          => 0;
+
+recommends 'SQL::Translator'        => 0.09004;
+
+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';
+
+
+# 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::MySQL'        => 0,
+  'Clone'                     => 0,
+  'Date::Simple'              => 3.03,
+
+  # t/52cycle.t
+  'Test::Memory::Cycle'       => 0,
+
+  # 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.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,
+);
 
-# 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';
+if ($Module::Install::AUTHOR) {
+  warn <<'EOW';
+******************************************************************************
+******************************************************************************
+***                                                                        ***
+*** AUTHOR MODE: all optional test dependencies converted to hard requires ***
+***                                                                        ***
+******************************************************************************
+******************************************************************************
+
+EOW
+
+  foreach my $module (keys %force_requires_if_author) {
+    build_requires ($module => $force_requires_if_author{$module});
+  }
 
   system('pod2text lib/DBIx/Class.pm > README');
 }
@@ -44,29 +118,15 @@ auto_provides;
 
 auto_install;
 
-WriteAll;
-
+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 looses track of them
-  Meta->{values}{build_requires} = [ grep {
-    $_->[0] !~ /
-      DBIx::ContextualFetch |
-      Class::Trigger |
-      Time::Piece
-    /x;
-  } @{Meta->{values}{build_requires}} ];
-
-  my @scalar_keys = Module::Install::Metadata::Meta_TupleKeys();
-  sub Module::Install::Metadata::Meta_TupleKeys {
-    return @scalar_keys, 'resources';
-  }
-  Meta->{values}{resources} = [ 
-    [ 'MailingList', 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class' ],
-    [ 'IRC', 'irc://irc.perl.org/#dbix-class' ],
+
+  Meta->{values}{build_requires} = [ grep 
+    { not exists $force_requires_if_author{$_->[0]} }
+    ( @{Meta->{values}{build_requires}} )
   ];
+
   Meta->write;
 }
-
-
-