X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=b69ec9f32f3d93dc27090aad3dc3dfe07c5578d3;hb=cba24c705d273c776d0742440a49620e01dec645;hp=2d7349e7c42bfad81f1e372e021779c2c446f00d;hpb=8057ed01e88499fd19213d1e5332034a4f360bb3;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 2d7349e..b69ec9f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,4 @@
-use inc::Module::Install 0.89;
+use inc::Module::Install 0.93;
 use strict;
 use warnings;
 use POSIX ();
@@ -8,21 +8,27 @@ use 5.008001;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 
+###
+### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends()
+### All of them should go to DBIx::Class::Optional::Dependencies
+###
+
+
 name     'DBIx-Class';
 perl_version '5.008001';
 all_from 'lib/DBIx/Class.pm';
 
 my $build_requires = {
-  'DBD::SQLite'             => '1.25',
+  'DBD::SQLite'              => '1.25',
 };
 
 my $test_requires = {
-  'File::Temp'              => '0.22',
-  'Test::Builder'           => '0.33',
-  'Test::Deep'              => '0',
-  'Test::Exception'         => '0',
-  'Test::More'              => '0.92',
-  'Test::Warn'              => '0.21',
+  'File::Temp'               => '0.22',
+  'Test::Builder'            => '0.33',
+  'Test::Deep'               => '0',
+  'Test::Exception'          => '0',
+  'Test::More'               => '0.92',
+  'Test::Warn'               => '0.21',
 };
 
 my $runtime_requires = {
@@ -38,7 +44,6 @@ my $runtime_requires = {
   'Class::Inspector'         => '1.24',
   'Data::Page'               => '2.00',
   'DBI'                      => '1.609',
-  'JSON::Any'                => '1.18',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'Path::Class'              => '0.16',
@@ -68,6 +73,10 @@ if ($Module::Install::AUTHOR) {
     unlink 'MANIFEST';
   }
 
+  print "Regenerating Optional/Dependencies.pod\n";
+  require DBIx::Class::Optional::Dependencies;
+  DBIx::Class::Optional::Dependencies->_gen_pod;
+
 # FIXME Disabled due to unsolved issues, ask theorbtwo
 #  require Module::Install::Pod::Inherit;
 #  PodInherit();
@@ -83,10 +92,9 @@ if ($Module::Install::AUTHOR) {
 
 EOW
 
-  require DBIx::Class::Optional::Dependencies;
   $reqs->{test_requires} = {
     %{$reqs->{test_requires}},
-    %{DBIx::Class::Optional::Dependencies->all_optional_requirements},
+    %{DBIx::Class::Optional::Dependencies->_all_optional_requirements},
   };
 }