use lib "$FindBin::Bin/lib";
use DBIx::Class::Optional::Dependencies;
-# 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";
-}
-
# 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)
my $test_requires = {
'File::Temp' => '0.22',
- 'Test::Builder' => '0.33',
'Test::Exception' => '0.31',
- 'Test::More' => '0.92',
'Test::Warn' => '0.21',
+ 'Test::More' => '0.94',
+ # not sure if this is necessary at all, ask schwern some day
+ 'Test::Builder' => '0.94',
+
+ # 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.10000',
- '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' => '1.000',
+ 'Data::Dumper::Concise' => '2.020',
'Data::Page' => '2.00',
+ 'Hash::Merge' => '0.12',
'MRO::Compat' => '0.09',
'Module::Find' => '0.06',
+ 'namespace::clean' => '0.20',
'Path::Class' => '0.18',
'Scope::Guard' => '0.03',
- 'SQL::Abstract' => '1.71',
+ 'SQL::Abstract' => '1.72',
'Try::Tiny' => '0.04',
# XS (or XS-dependent) libs
- 'DBI' => '1.609',
- 'namespace::clean' => '0.14',
+ 'DBI' => '1.57',
'Sub::Name' => '0.04',
- 'Variable::Magic' => '0.44',
- # corelibs needing a specific bugfixed version
+ # dual-life corelibs needing a specific bugfixed version
'File::Path' => '2.07',
- # Oracle-only optionals
- 'Math::BigInt' => '1.89',
- 'Math::Base36' => '0.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 <<EOP }
+
+******************************************************************************
+******************************************************************************
+*** ***
+*** PARALLEL TESTING DETECTED ( \$ENV{HARNESS_OPTIONS} = 'j$1' ) ***
+*** ***
+*** DBIC tests will fail. It is harder to make them parallel-friendly than ***
+*** it should be (though work is underway). In the meantime you will have ***
+*** to adjust your environment and re-run the installation. Sorry! ***
+*** ***
+******************************************************************************
+******************************************************************************
+
+EOP
+
+require 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";
+}
+
# this is so we can order requires alphabetically
# copies are needed for author requires injection
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 { %$_ } (values %{DBIx::Class::Optional::Dependencies->req_group_list})
+ map { %{$reqs_for_group{$_}} } grep { !/^rdbms_/ } keys %reqs_for_group
};
# require extra modules for testing if we're in a checkout
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');
# 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;
}
};
|);
no_index package => $_ for (qw/
DBIx::Class::Storage::DBIHacks
+ DBIx::Class::Carp
+ DBIx::Class::ResultSet::Pager
/);
WriteAll();
}
# test that we really took things away (just in case, happened twice somehow)
-exit 0 unless -f 'META.yml'; # in case bizarro comes around
+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