X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=Makefile.PL;h=1b45288039697bcb5b7a98d1ac324ea32c375aaf;hp=dc44dee90949df4292f8894e009b29fb5f3efc00;hb=fcf32d045;hpb=cd1228209f685767668163c2510723959951641b diff --git a/Makefile.PL b/Makefile.PL index dc44dee..1b45288 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,164 +1,204 @@ -use inc::Module::Install 1.00; use strict; use warnings; use 5.008001; +use inc::Module::Install 1.06; -use FindBin; -use lib "$FindBin::Bin/lib"; -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 -# for that) ## ## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad) ## -$Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) ); +# get cpanX --installdeps . to behave in a checkout (most users do not expect +# the deps for a full test suite run, and if they do - there's MI::AutoInstall +# for that) +BEGIN { + $Module::Install::AUTHOR = 0 if (grep { $ENV{"PERL5_${_}_IS_RUNNING"} } (qw/CPANM CPANPLUS CPAN/) ); + makemaker_args( NORECURS => 1 ); +} -### -### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends() -### All of them should go to DBIx::Class::Optional::Dependencies -### +homepage 'http://www.dbix-class.org/'; +resources 'IRC' => 'irc://irc.perl.org/#dbix-class'; +resources 'license' => 'http://dev.perl.org/licenses/'; +resources 'repository' => 'https://github.com/dbsrgits/DBIx-Class'; +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'; name 'DBIx-Class'; perl_version '5.008001'; all_from 'lib/DBIx/Class.pm'; +Meta->{values}{x_authority} = 'cpan:RIBASUSHI'; -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.31', - 'Test::More' => '0.92', - 'Test::Warn' => '0.21', +tests_recursive (qw| + t +|); - # 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', -}; +install_script (qw| + script/dbicadmin +|); +### +### DO NOT ADD OPTIONAL DEPENDENCIES HERE, EVEN AS recommends() +### All of them *MUST* go to DBIx::Class::Optional::Dependencies +### my $runtime_requires = { - 'Class::Accessor::Grouped' => '0.10002', + # FIXME - temporary workaround for RT#83143 (Path::Class) + 'File::Spec' => '3.30', + + # FIXME - temporary, needs throwing out for something more efficient + 'Data::Compare' => '1.22', + + # DBI itself should be capable of installation and execution in pure-perl + # mode. However it has never been tested yet, so consider XS for the time + # being + 'DBI' => '1.57', + + # on older versions first() leaks + # for the time being make it a hard dep - when we get + # rid of Sub::Name will revisit this (possibility is + # to use Devel::HideXS to force the pure-perl version + # or something like that) + 'List::Util' => '1.16', + + # XS (or XS-dependent) libs + 'Sub::Name' => '0.04', + + # pure-perl (FatPack-able) libs + 'Class::Accessor::Grouped' => '0.10009', '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', + 'Devel::GlobalDestruction' => '0.09', 'Hash::Merge' => '0.12', - 'MRO::Compat' => '0.09', - 'Module::Find' => '0.06', - 'namespace::clean' => '0.20', + 'Moo' => '1.000006', + 'MRO::Compat' => '0.12', + 'Module::Find' => '0.07', + 'namespace::clean' => '0.24', 'Path::Class' => '0.18', 'Scope::Guard' => '0.03', - 'SQL::Abstract' => '1.72', - 'Try::Tiny' => '0.04', - - # XS (or XS-dependent) libs - 'DBI' => '1.57', - 'Sub::Name' => '0.04', - - # dual-life corelibs needing a specific bugfixed version - 'File::Path' => '2.07', + 'SQL::Abstract' => '1.73', + 'Try::Tiny' => '0.07', - # FIXME - temporary, needs throwing out for something more efficient - 'Data::Compare' => '1.22', + # Technically this is not a core dependency - it is only required + # by the MySQL codepath. However this particular version is bundled + # since 5.10.0 and is a pure-perl module anyway - let it slide + 'Text::Balanced' => '2.00', }; +my $build_requires = { + # needed for testing only, not for operation + # we will move away from this dep eventually, perhaps to DBD::CSV or something + 'DBD::SQLite' => '1.29', +}; -# Bail out on parallel testing -if ( - ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x - and - $1 > 1 -) { die < '0.22', + 'Test::Exception' => '0.31', + 'Test::Warn' => '0.21', + 'Test::More' => '0.94', + # not sure if this is necessary at all, ask schwern some day + 'Test::Builder' => '0.94', -****************************************************************************** -****************************************************************************** -*** *** -*** 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! *** -*** *** -****************************************************************************** -****************************************************************************** + # 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', +}; -EOP +# make strictures.pm happy (DO NOT LIKE, TOO MUCH XS!) +# (i.e. what if the .git/.svn is *not* because of DBIC?) +# +# Note - this is added as test_requires *directly*, so it gets properly +# excluded on META.yml cleansing +if (-e '.git' or -e '.svn') { + test_requires 'indirect' => '0.25'; + test_requires 'multidimensional' => '0.008'; + test_requires 'bareword::filehandles' => '0.003'; +} -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"; +# if the user has this env var set and no SQLT installed, tests will fail +# same rationale for direct test_requires as the strictures stuff above +# (even though no dist will be created from this) +# we force this req regarless of author_deps, worst case scenario it will +# be specified twice +if ($ENV{DBICTEST_SQLT_DEPLOY}) { + local @INC = ('lib', @INC); + require DBIx::Class::Optional::Dependencies; + my $dep_req = DBIx::Class::Optional::Dependencies->req_list_for('deploy'); + for (keys %$dep_req) { + test_requires ($_ => $dep_req->{$_}) + } } # this is so we can order requires alphabetically -# copies are needed for author requires injection +# copies are needed for potential author requires injection my $reqs = { build_requires => { %$build_requires }, requires => { %$runtime_requires }, 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; -if ($Module::Install::AUTHOR) { - if ($args->{skip_author_deps}) { - $optdep_msg = <<'EOW'; - -****************************************************************************** -****************************************************************************** -*** *** -*** IGNORING AUTHOR MODE: no optional test dependencies will be forced. *** -*** *** -*** If you are using this checkout with the intention of submitting a DBIC *** -*** patch, you are *STRONGLY ENCOURAGED* to install all dependencies, so *** -*** that every possible unit-test will run. *** -*** *** -****************************************************************************** -****************************************************************************** - -EOW +# only do author-includes if not part of a `make` run +if ($Module::Install::AUTHOR and ! $ENV{MAKELEVEL}) { + # get options here, make $args available to all snippets + 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, qw/ + skip_author_deps|skip-author-deps + /); + if (@ARGV) { + warn "\nIgnoring unrecognized option(s): @ARGV\n\n"; } - else { - $optdep_msg = <<'EOW'; -****************************************************************************** -****************************************************************************** -*** *** -*** AUTHOR MODE: all optional test dependencies converted to hard requires *** -*** ( to disable re-run Makefile.PL with --skip_author_deps ) *** -*** *** -****************************************************************************** -****************************************************************************** - -EOW - - $reqs->{test_requires} = { - %{$reqs->{test_requires}}, - %$opt_testdeps - }; + # We need the MM facilities to generate the pieces for the final MM run. + # Just instantiate a throaway object here + my $mm_proto = ExtUtils::MakeMaker->new({ + NORECURS => 1, + NAME => Meta->name || die 'The Module::Install metadata must be available at this point but is not - did you rearrange the Makefile.PL...?', + }); + + # Crutch for DISTBUILDING_IN_HELL + # Spits back a working dos2unix snippet to be used on the supplied path(s) + # Ironically EUMM's dos2unix is broken on win32 itself - it does + # not take into account the CRLF layer present on win32 + my $crlf_fixup = sub { + return '' unless ($^O eq 'MSWin32' or $^O eq 'cygwin'); + my $targets = join ', ', map { "q($_)" } @_; + "\t" . $mm_proto->oneliner( qq(\$ENV{PERLIO}='unix' and system( \$^X, qw( -MExtUtils::Command -e dos2unix -- ), $targets ) ) ); + }; + + # we are in the process of (re)writing the makefile - some things we + # call below very well may fail + local $ENV{DBICTEST_NO_MAKEFILE_VERIFICATION} = 1; + + require File::Spec; + # string-eval, not do(), because we need to provide the + # $mm_proto, $reqs and $*_requires lexicals to the included file + # (some includes *do* modify $reqs above) + for my $inc (sort glob ( File::Spec->catfile('maint', 'Makefile.PL.inc', '*') ) ) { + my $src = do { local (@ARGV, $/) = $inc; <> } or die $!; + eval "use warnings; use strict; $src" or die sprintf + "Failed execution of %s: %s\n", + $inc, + ($@ || $! || 'Unknown error'), + ; } } +else { + # make sure this Makefile can not be used to make a dist + # (without the author includes there are no meta cleanup, no sanity checks, etc) + postamble <($mod, $ver); } -# output twice since the deplist is > 70 lines -warn $optdep_msg if $Module::Install::AUTHOR; +# author-mode or not - this is where we show a list of missing deps +# IFF we are running interactively 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'); - - if (-f 'MANIFEST') { - print "Removing MANIFEST\n"; - unlink 'MANIFEST'; - } - - print "Regenerating Optional/Dependencies.pod\n"; - require DBIx::Class::Optional::Dependencies; - DBIx::Class::Optional::Dependencies->_gen_pod (Meta->version); - - # FIXME Disabled due to unsolved issues, ask theorbtwo - # require Module::Install::Pod::Inherit; - # PodInherit(); -} - - -tests_recursive (qw| - t -|); - -# 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 $err; - } -}; - - -install_script (qw| - script/dbicadmin -|); - - -### Mangle makefile - read the comments for more info -# -postamble <<"EOP"; - -# This will add an extra dep-spec for the distdir target, -# which `make` will fold together in a first-come first-serve -# fashion. What we do here is essentially adding extra -# commands to execute once the distdir is assembled (via -# create_distdir), but before control is returned to a higher -# calling rule. -distdir : dbicadmin_pod_inject - -# The pod self-injection code is in fact a hidden option in -# dbicadmin itself -dbicadmin_pod_inject : -\tcd \$(DISTVNAME) && \$(ABSPERL) -Ilib script/dbicadmin --selfinject-pod - -# Regenerate manifest before running create_distdir. -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' => '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/PK/Auto - lib/DBIx/Class/CDBICompat -|); -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 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; - -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, 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"; -}