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

diff --git a/Makefile.PL b/Makefile.PL
index 3b4f588..7afb796 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,4 @@
-use inc::Module::Install 0.93;
+use inc::Module::Install 0.97;
 use strict;
 use warnings;
 use POSIX ();
@@ -49,6 +49,7 @@ my $runtime_requires = {
   'Class::Inspector'         => '1.24',
   'Data::Page'               => '2.00',
   'DBI'                      => '1.609',
+  'File::Path'               => '2.07',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'Path::Class'              => '0.18',
@@ -60,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
@@ -135,9 +138,9 @@ for my $mod (sort keys %final_req) {
 }
 
 # output twice since the deplist is > 70 lines
-warn $optdep_msg;
+warn $optdep_msg if $Module::Install::AUTHOR;
 auto_install();
-warn $optdep_msg;
+warn $optdep_msg if $Module::Install::AUTHOR;
 
 # re-create various autogenerated documentation bits
 if ($Module::Install::AUTHOR) {
@@ -159,10 +162,26 @@ if ($Module::Install::AUTHOR) {
   #  PodInherit();
 }
 
+
 tests_recursive (qw|
     t
 |);
 
+# temporary(?) until I get around to fix M::I wrt xt/
+# needs Module::Install::AuthorTests
+eval {
+  recursive_author_tests (qw/xt/);
+  1;
+} || do {
+  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 $@;
+  }
+};
+
+
 install_script (qw|
     script/dbicadmin
 |);
@@ -190,11 +209,10 @@ create_distdir : manifest
 
 EOP
 
-
-
+homepage 'http://www.dbix-class.org/';
 resources 'IRC'         => 'irc://irc.perl.org/#dbix-class';
 resources 'license'     => 'http://dev.perl.org/licenses/';
-resources 'repository'  => 'http://dev.catalyst.perl.org/repos/bast/DBIx-Class/';
+resources 'repository'  => 'git://git.shadowcat.co.uk/dbsrgits/DBIx-Class.git';
 resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class';
 
 # Deprecated/internal modules need no exposure
@@ -211,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";
+  }
 }