X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=dc44dee90949df4292f8894e009b29fb5f3efc00;hb=cd1228209f685767668163c2510723959951641b;hp=cac6e77b65309e1e207478778bc2389144e7a7e3;hpb=d1dc7a982d6ecb158b273cd893b6703875eac074;p=dbsrgits%2FDBIx-Class.git diff --git a/Makefile.PL b/Makefile.PL index cac6e77..dc44dee 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -6,23 +6,7 @@ use 5.008001; use FindBin; use lib "$FindBin::Bin/lib"; - -# adjust ENV for $AUTHOR system() calls -use Config; -$ENV{PERL5LIB} = join ($Config{path_sep}, @INC); - -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, -}; -$getopt->getoptions($args, 'skip_author_deps'); -if (@ARGV) { - warn "\nIgnoring unrecognized option(s): @ARGV\n\n"; -} +use DBIx::Class::Optional::Dependencies; # 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 @@ -42,39 +26,83 @@ 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', + + # this is already a dep of n::c, but just in case - used by t/55namespaces_cleaned.t + # remove and do a manual glob-collection if n::c is no longer a dep + 'Package::Stash' => '0.28', }; my $runtime_requires = { - 'Carp::Clan' => '6.0', - 'Class::Accessor::Grouped' => '0.09004', - 'Class::C3::Componentised' => '1.0005', + 'Class::Accessor::Grouped' => '0.10002', + 'Class::C3::Componentised' => '1.0009', 'Class::Inspector' => '1.24', + 'Config::Any' => '0.20', + 'Context::Preserve' => '0.01', + 'Data::Dumper::Concise' => '2.020', 'Data::Page' => '2.00', - 'DBI' => '1.609', - 'File::Path' => '2.07', + 'Hash::Merge' => '0.12', 'MRO::Compat' => '0.09', 'Module::Find' => '0.06', + 'namespace::clean' => '0.20', 'Path::Class' => '0.18', - 'SQL::Abstract' => '1.68', - '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', - 'Config::Any' => '0.20', + + # XS (or XS-dependent) libs + 'DBI' => '1.57', + 'Sub::Name' => '0.04', + + # dual-life corelibs needing a specific bugfixed version + 'File::Path' => '2.07', + + # FIXME - temporary, needs throwing out for something more efficient + 'Data::Compare' => '1.22', +}; + + +# Bail out on parallel testing +if ( + ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x + and + $1 > 1 +) { die <new( + config => [qw/gnu_getopt bundling_override no_ignore_case pass_through/] +); +my $args = { + skip_author_deps => undef, }; +$getopt->getoptions($args, 'skip_author_deps'); +if (@ARGV) { + warn "\nIgnoring unrecognized option(s): @ARGV\n\n"; +} # this is so we can order requires alphabetically # copies are needed for author requires injection @@ -84,6 +112,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; @@ -119,10 +153,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 }; } } @@ -153,9 +186,14 @@ 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) { + # adjust ENV for $AUTHOR system() calls + require Config; + $ENV{PERL5LIB} = join ($Config::Config{path_sep}, @INC); + print "Regenerating README\n"; system('pod2text lib/DBIx/Class.pm > README'); @@ -181,14 +219,20 @@ tests_recursive (qw| # temporary(?) until I get around to fix M::I wrt xt/ # needs Module::Install::AuthorTests eval { + # this should not be necessary since the autoloader is supposed + # to work, but there were reports of it failing + require Module::Install::AuthorTests; recursive_author_tests (qw/xt/); 1; } || do { if ($Module::Install::AUTHOR && ! $args->{skip_author_deps}) { my $err = $@; + + # better error message in case of missing dep 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 $@; + + die $err; } }; @@ -235,45 +279,56 @@ no_index directory => $_ for (qw| |); no_index package => $_ for (qw/ DBIx::Class::Storage::DBIHacks + DBIx::Class::Carp + DBIx::Class::ResultSet::Pager /); 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"; }