X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=450919026a4039a6f69be34d781db4efccc83173;hb=4f1e99364c5b4c37006cbf10fc2cb810b21517d5;hp=fad5ce5b33de1f3ab10d11dd05a5a1ba0a2d3359;hpb=30da837490e110a19eeab063d7a94440502a07b1;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index fad5ce5..4509190 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,6 +8,12 @@ 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';
@@ -38,10 +44,9 @@ 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',
+  'Path::Class'              => '0.18',
   'Scope::Guard'             => '0.03',
   'SQL::Abstract'            => '1.61',
   'SQL::Abstract::Limit'     => '0.13',
@@ -62,12 +67,16 @@ if ($Module::Install::AUTHOR) {
 
   print "Regenerating README\n";
   system('pod2text lib/DBIx/Class.pm > README');
-
+  system('perl -Ilib ./script/dbicadmin --pod > lib/dbicadmin.pod');
   if (-f 'MANIFEST') {
     print "Removing MANIFEST\n";
     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},
   };
 }
 
@@ -97,7 +105,7 @@ for my $rtype (keys %$reqs) {
 
     # sanity check req duplications
     if ($final_req{$mod}) {
-      die "$mod specified as both a $rtype and a $final_req{$mod}[1]\n";
+      die "$mod specified as both a '$rtype' and a '$final_req{$mod}[0]'\n";
     }
 
     $final_req{$mod} = [ $rtype, $reqs->{$rtype}{$mod}||0 ],