Cleanup the makefile regen a bit

[dbsrgits/DBIx-Class.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 2d0098e..d5f0f1c 100644 (file)
--- 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,11 @@ use 5.008001;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 
+# adjust ENV for $AUTHOR system() calls
+use Config;
+$ENV{PERL5LIB} = join ($Config{path_sep}, @INC);
+
+
 ###
 ### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends()
 ### All of them should go to DBIx::Class::Optional::Dependencies
@@ -44,10 +49,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',
@@ -63,7 +67,7 @@ my $reqs = {
   test_requires => { %$test_requires },
 };
 
-# re-build README and require extra modules for testing if we're in a checkout
+# autogenerate docs and require extra modules for testing if we're in a checkout
 if ($Module::Install::AUTHOR) {
 
   print "Regenerating README\n";
@@ -74,6 +78,9 @@ if ($Module::Install::AUTHOR) {
     unlink 'MANIFEST';
   }
 
+  print "Regenerating dbicadmin.pod\n";
+  system('perl script/dbicadmin --pod > lib/dbicadmin.pod');
+
   print "Regenerating Optional/Dependencies.pod\n";
   require DBIx::Class::Optional::Dependencies;
   DBIx::Class::Optional::Dependencies->_gen_pod;
@@ -106,7 +113,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 ],