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

diff --git a/Makefile.PL b/Makefile.PL
index ce27a84..e44489b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,6 +6,7 @@ use 5.008001;
 
 use FindBin;
 use lib "$FindBin::Bin/lib";
+use DBIx::Class::Optional::Dependencies;
 
 # adjust ENV for $AUTHOR system() calls
 use Config;
@@ -24,6 +25,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
@@ -34,37 +43,43 @@ perl_version '5.008001';
 all_from 'lib/DBIx/Class.pm';
 
 my $build_requires = {
+  # needed for testing only, not for operation
   'DBD::SQLite'              => '1.29',
 };
 
 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.10002',
   'Class::C3::Componentised' => '1.0005',
   'Class::Inspector'         => '1.24',
+  'Config::Any'              => '0.20',
+  'Context::Preserve'        => '0.01',
+  'Data::Dumper::Concise'    => '1.000',
   'Data::Page'               => '2.00',
-  'DBI'                      => '1.609',
-  'File::Path'               => '2.07',
+  'Hash::Merge'              => '0.12',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'Path::Class'              => '0.18',
-  'SQL::Abstract'            => '1.67',
-  'Sub::Name'                => '0.04',
-  'Data::Dumper::Concise'    => '1.000',
   'Scope::Guard'             => '0.03',
-  'Context::Preserve'        => '0.01',
+  'SQL::Abstract'            => '1.72',
   'Try::Tiny'                => '0.04',
-  'namespace::clean'         => '0.14',
-  'Math::BigInt'             => '1.89',
-  'Math::Base36'             => '0.07',
+
+  # XS (or XS-dependent) libs
+  'DBI'                      => '1.609',
+  'namespace::clean'         => '0.20',
+  'Sub::Name'                => '0.04',
+  'Variable::Magic'          => '0.44',
+
+  # dual-life corelibs needing a specific bugfixed version
+  'File::Path'               => '2.07',
 };
 
 # this is so we can order requires alphabetically
@@ -75,6 +90,12 @@ 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 { %{$reqs_for_group{$_}} } grep { !/^rdbms_/ } keys %reqs_for_group
+};
 
 # require extra modules for testing if we're in a checkout
 my $optdep_msg;
@@ -110,10 +131,9 @@ EOW
 
 EOW
 
-    require DBIx::Class::Optional::Dependencies;
     $reqs->{test_requires} = {
       %{$reqs->{test_requires}},
-      map { %$_ } (values %{DBIx::Class::Optional::Dependencies->req_group_list}),
+      %$opt_testdeps
     };
   }
 }
@@ -144,6 +164,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) {
 
@@ -157,7 +178,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 +196,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";
@@ -230,41 +251,50 @@ no_index package => $_ for (qw/
 
 WriteAll();
 
-# Re-write META.yml to _exclude_ all forced requires (we do not want to ship this)
-# We are also not using M::I::AuthorRequires as this will be an extra dep, and
-# deps in Makefile.PL suck (no autoinstall)
-if ($Module::Install::AUTHOR && ! $args->{skip_author_deps} ) {
+# Re-write META.yml to _exclude_ all forced build-requires (we do not want to ship
+# this) We are also not using M::I::AuthorRequires as this will be an extra dep,
+# and deps in Makefile.PL still suck
+# Also always test the result so we stop shipping borked dependency lists to CPAN
 
-  # FIXME test_requires is not yet part of META
-  my %original_build_requires = ( %$build_requires, %$test_requires );
-  my @all_build_requires = @{delete Meta->{values}{build_requires}};
-  my %removed_build_requires;
+# FIXME test_requires is not yet part of META
+my %original_build_requires = ( %$build_requires, %$test_requires );
+my @all_build_requires = @{delete Meta->{values}{build_requires}};
+my %removed_build_requires;
 
-  for (@all_build_requires) {
-    if ($original_build_requires{$_->[0]}) {
-      push @{Meta->{values}{build_requires}}, $_;
-    }
-    else {
-      $removed_build_requires{$_->[0]} = $_->[1]
-        unless $_->[0] eq 'ExtUtils::MakeMaker';
-    }
+for (@all_build_requires) {
+  if ($original_build_requires{$_->[0]}) {
+    push @{Meta->{values}{build_requires}}, $_;
+  }
+  else {
+    $removed_build_requires{$_->[0]} = $_->[1]
+      unless $_->[0] eq 'ExtUtils::MakeMaker';
   }
+}
 
+# Rewrite only in author mode, the original META should not contain anything anyway
+# if we executed as non-author
+if ($Module::Install::AUTHOR && keys %removed_build_requires) {
   print "Regenerating META with author requires excluded\n";
   Meta->write;
+}
 
-  # test that we really took things away (just in case)
-  my $meta = do { local @ARGV = 'META.yml'; local $/; <> };
-  for (keys %removed_build_requires) {
-    delete $removed_build_requires{$_}
-      unless $meta =~ /^ \s+ $_: \s+ $removed_build_requires{$_} \s* $/mx
-  }
-
-  if (keys %removed_build_requires) {
-    die join ("\n",
-      "\n\nFATAL FAIL! It looks like some author dependencies made it to the META.yml:",
-      "(most likely a broken Module::Install)\n",
-      map { "\t$_" } (keys %removed_build_requires)
-    ) . "\n\n";
-  }
+# test that we really took things away (just in case, happened twice somehow)
+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
+# not contain any real dependencies
+my @illegal_leftovers = grep
+  { $meta =~ /^ \s+ \Q$_\E \: \s+ /mx }
+  ( sort keys %$opt_testdeps )
+;
+
+if (@illegal_leftovers) {
+  die join ("\n",
+    "\n\nFATAL FAIL! It looks like some author dependencies made it to the META.yml:\n",
+    map { "\t$_" } @illegal_leftovers
+  ) . "\n\n";
 }