X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=531c3a764a44a8c5ac9e20d7541867774cde64fb;hb=ed04f0765deb438a059ac948881747d846292bda;hp=ce27a842db4db26b782c416a91c911ed4c04c448;hpb=d5dedbd62928f65a9071b4d9b6d56c6b663a073b;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index ce27a84..531c3a7 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -24,6 +24,14 @@ if (@ARGV) {
   warn "\nIgnoring unrecognized option(s): @ARGV\n\n";
 }
 
+# get cpanX --installdeps . to behave in a checkout (most users do not need
+# the deps for a full test suite run, and if they do - there's MI::AutoInstall
+# for that)
+##
+## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad)
+##
+$Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) );
+
 ###
 ### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends()
 ### All of them should go to DBIx::Class::Optional::Dependencies
@@ -40,14 +48,14 @@ my $build_requires = {
 my $test_requires = {
   'File::Temp'               => '0.22',
   'Test::Builder'            => '0.33',
-  'Test::Exception'          => '0',
+  'Test::Exception'          => '0.31',
   'Test::More'               => '0.92',
   'Test::Warn'               => '0.21',
 };
 
 my $runtime_requires = {
   'Carp::Clan'               => '6.0',
-  'Class::Accessor::Grouped' => '0.09004',
+  'Class::Accessor::Grouped' => '0.09008',
   'Class::C3::Componentised' => '1.0005',
   'Class::Inspector'         => '1.24',
   'Data::Page'               => '2.00',
@@ -56,8 +64,9 @@ my $runtime_requires = {
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'Path::Class'              => '0.18',
-  'SQL::Abstract'            => '1.67',
+  'SQL::Abstract'            => '1.68',
   'Sub::Name'                => '0.04',
+  'Variable::Magic'          => '0.44',
   'Data::Dumper::Concise'    => '1.000',
   'Scope::Guard'             => '0.03',
   'Context::Preserve'        => '0.01',
@@ -65,6 +74,7 @@ my $runtime_requires = {
   'namespace::clean'         => '0.14',
   'Math::BigInt'             => '1.89',
   'Math::Base36'             => '0.07',
+  'Config::Any'              => '0.20',
 };
 
 # this is so we can order requires alphabetically
@@ -157,7 +167,7 @@ if ($Module::Install::AUTHOR) {
 
   print "Regenerating Optional/Dependencies.pod\n";
   require DBIx::Class::Optional::Dependencies;
-  DBIx::Class::Optional::Dependencies->_gen_pod;
+  DBIx::Class::Optional::Dependencies->_gen_pod (Meta->version);
 
   # FIXME Disabled due to unsolved issues, ask theorbtwo
   #  require Module::Install::Pod::Inherit;
@@ -175,7 +185,7 @@ eval {
   recursive_author_tests (qw/xt/);
   1;
 } || do {
-  unless ($args->{skip_author_deps}) {
+  if ($Module::Install::AUTHOR && ! $args->{skip_author_deps}) {
     my $err = $@;
     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";