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

diff --git a/Makefile.PL b/Makefile.PL
index 7aaeaa6..ce27a84 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,6 @@
-use inc::Module::Install 0.97;
+use inc::Module::Install 1.00;
 use strict;
 use warnings;
-use POSIX ();
 
 use 5.008001;
 
@@ -12,11 +11,15 @@ use lib "$FindBin::Bin/lib";
 use Config;
 $ENV{PERL5LIB} = join ($Config{path_sep}, @INC);
 
-use Getopt::Long qw/:config gnu_getopt bundling_override no_ignore_case pass_through/;
+use Getopt::Long ();
+
+my $getopt = Getopt::Long::Parser->new(
+  config => [qw/gnu_getopt bundling_override no_ignore_case pass_through/]
+);
 my $args = {
   skip_author_deps => undef,
 };
-GetOptions ($args, 'skip_author_deps');
+$getopt->getoptions($args, 'skip_author_deps');
 if (@ARGV) {
   warn "\nIgnoring unrecognized option(s): @ARGV\n\n";
 }
@@ -31,7 +34,7 @@ perl_version '5.008001';
 all_from 'lib/DBIx/Class.pm';
 
 my $build_requires = {
-  'DBD::SQLite'              => '1.25',
+  'DBD::SQLite'              => '1.29',
 };
 
 my $test_requires = {
@@ -44,7 +47,7 @@ my $test_requires = {
 
 my $runtime_requires = {
   'Carp::Clan'               => '6.0',
-  'Class::Accessor::Grouped' => '0.09003',
+  'Class::Accessor::Grouped' => '0.09004',
   'Class::C3::Componentised' => '1.0005',
   'Class::Inspector'         => '1.24',
   'Data::Page'               => '2.00',
@@ -54,13 +57,14 @@ my $runtime_requires = {
   'Module::Find'             => '0.06',
   'Path::Class'              => '0.18',
   'SQL::Abstract'            => '1.67',
-  'SQL::Abstract::Limit'     => '0.13',
   'Sub::Name'                => '0.04',
   'Data::Dumper::Concise'    => '1.000',
   'Scope::Guard'             => '0.03',
   '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
@@ -99,7 +103,7 @@ EOW
 ******************************************************************************
 ***                                                                        ***
 *** AUTHOR MODE: all optional test dependencies converted to hard requires ***
-***      ( to disabled re-run Makefile.PL with --skip_author_deps )        ***
+***       ( to disable re-run Makefile.PL with --skip_author_deps )        ***
 ***                                                                        ***
 ******************************************************************************
 ******************************************************************************
@@ -171,10 +175,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 $@;
+  }
 };
 
 
@@ -210,33 +216,55 @@ resources 'IRC'         => 'irc://irc.perl.org/#dbix-class';
 resources 'license'     => 'http://dev.perl.org/licenses/';
 resources 'repository'  => 'git://git.shadowcat.co.uk/dbsrgits/DBIx-Class.git';
 resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class';
+resources 'bugtracker'  => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=DBIx-Class';
 
 # Deprecated/internal modules need no exposure
 no_index directory => $_ for (qw|
   lib/DBIx/Class/Admin
-  lib/DBIx/Class/SQLAHacks
   lib/DBIx/Class/PK/Auto
   lib/DBIx/Class/CDBICompat
 |);
 no_index package => $_ for (qw/
-  DBIx::Class::SQLAHacks DBIx::Class::Storage::DBIHacks
+  DBIx::Class::Storage::DBIHacks
 /);
 
-
 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:",
+      "(most likely a broken Module::Install)\n",
+      map { "\t$_" } (keys %removed_build_requires)
+    ) . "\n\n";
+  }
 }