X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=f11a5ea98fa689bca7c9e186ae595e80fcb5aa9d;hb=70c288086248e5a4008490df22a56632341f2473;hp=3a91cc742d3d875d5afe9bf1d6f0975964d4d87c;hpb=bf51641f97a504ae9796fcc45da4e409c6466ca4;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 3a91cc7..f11a5ea 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -56,14 +56,14 @@ my $test_requires = {
 };
 
 my $runtime_requires = {
-  'Carp::Clan'               => '6.0',
-  'Class::Accessor::Grouped' => '0.10000',
-  'Class::C3::Componentised' => '1.0005',
+  'Class::Accessor::Grouped' => '0.10002',
+  'Class::C3::Componentised' => '1.0009',
   'Class::Inspector'         => '1.24',
   'Config::Any'              => '0.20',
   'Context::Preserve'        => '0.01',
-  'Data::Dumper::Concise'    => '1.000',
+  'Data::Dumper::Concise'    => '2.020',
   'Data::Page'               => '2.00',
+  'Hash::Merge'              => '0.12',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'Path::Class'              => '0.18',
@@ -73,16 +73,12 @@ my $runtime_requires = {
 
   # XS (or XS-dependent) libs
   'DBI'                      => '1.609',
-  'namespace::clean'         => '0.14',
+  'namespace::clean'         => '0.20',
   'Sub::Name'                => '0.04',
   'Variable::Magic'          => '0.44',
 
-  # corelibs needing a specific bugfixed version
+  # dual-life corelibs needing a specific bugfixed version
   'File::Path'               => '2.07',
-
-  # Oracle-only optionals
-  'Math::BigInt'             => '1.89',
-  'Math::Base36'             => '0.07',
 };
 
 # this is so we can order requires alphabetically
@@ -93,8 +89,11 @@ my $reqs = {
   test_requires => { %$test_requires },
 };
 
+my %reqs_for_group = %{DBIx::Class::Optional::Dependencies->req_group_list};
+
+# exclude the rdbms_* groups which are for DBIC users
 my $opt_testdeps = {
-  map { %$_ } (values %{DBIx::Class::Optional::Dependencies->req_group_list})
+  map { %{$reqs_for_group{$_}} } grep { !/^rdbms_/ } keys %reqs_for_group
 };
 
 # require extra modules for testing if we're in a checkout
@@ -164,6 +163,7 @@ warn $optdep_msg if $Module::Install::AUTHOR;
 auto_install();
 warn $optdep_msg if $Module::Install::AUTHOR;
 
+
 # re-create various autogenerated documentation bits
 if ($Module::Install::AUTHOR) {
 
@@ -192,14 +192,20 @@ tests_recursive (qw|
 # temporary(?) until I get around to fix M::I wrt xt/
 # needs Module::Install::AuthorTests
 eval {
+  # this should not be necessary since the autoloader is supposed
+  # to work, but there were reports of it failing
+  require Module::Install::AuthorTests;
   recursive_author_tests (qw/xt/);
   1;
 } || do {
   if ($Module::Install::AUTHOR && ! $args->{skip_author_deps}) {
     my $err = $@;
+
+    # better error message in case of missing dep
     eval { require Module::Install::AuthorTests }
       || die "\nYou need Module::Install::AuthorTests installed to run this Makefile.PL in author mode (or supply --skip_author_deps):\n\n$@\n";
-    die $@;
+
+    die $err;
   }
 };
 
@@ -246,6 +252,7 @@ no_index directory => $_ for (qw|
 |);
 no_index package => $_ for (qw/
   DBIx::Class::Storage::DBIHacks
+  DBIx::Class::Carp
 /);
 
 WriteAll();
@@ -278,7 +285,10 @@ if ($Module::Install::AUTHOR && keys %removed_build_requires) {
 }
 
 # test that we really took things away (just in case, happened twice somehow)
-exit 0 unless -f 'META.yml';  # in case bizarro comes around
+if (! -f 'META.yml') {
+  warn "No META.yml generated?! aborting...\n";
+  exit 1;
+}
 my $meta = do { local @ARGV = 'META.yml'; local $/; <> };
 
 # this is safe as there is a fatal check earlier to make sure $opt_testdeps does