X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=7afb79600b05e8eb318c4c0ed25c98136ac831b9;hb=7c4ade2a750b5299842e8f55f5bdcd1488168867;hp=7aaeaa6d08d9bb755be38f7a231e63d6b7046d22;hpb=c1fdb4609f77e41f9d0a8ff436adb6b97d26724e;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 7aaeaa6..7afb796 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -61,6 +61,8 @@ my $runtime_requires = {
   'Context::Preserve'        => '0.01',
   'Try::Tiny'                => '0.04',
   'namespace::clean'         => '0.14',
+  'Math::BigInt'             => '1.89',
+  'Math::Base36'             => '0.07',
 };
 
 # this is so we can order requires alphabetically
@@ -171,10 +173,12 @@ eval {
   recursive_author_tests (qw/xt/);
   1;
 } || do {
-  my $err = $@;
-  eval { require Module::Install::AuthorTests }
-    || die "\nYou need Module::Install::AuthorTests installed to run this Makefile.PL:\n\n$@\n";
-  die $@;
+  unless ($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";
+    die $@;
+  }
 };
 
 
@@ -225,18 +229,39 @@ 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} ) {
 
   # 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;
 
-  print "Regenerating META with author requires excluded\n";
-  Meta->{values}{build_requires} = [ grep
-    { exists $original_build_requires{$_->[0]} }
-   ( @{Meta->{values}{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';
+    }
+  }
 
+  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:\n",
+      map { "\t$_" } (keys %removed_build_requires)
+    ) . "\n\n";
+  }
 }