X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=ccb2a19dc3297893780936d8f2c30ca878f8d8dc;hp=15c1a8115900309de46437781979cac35182a69e;hb=f264b24aa346faa7193464cc626e3d9b953fcb18;hpb=107d0ba08c92ab0876af2ef4d6e952b82e58bf2c diff --git a/Makefile.PL b/Makefile.PL index 15c1a81..ccb2a19 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,28 +1,42 @@ -use inc::Module::Install 0.64; +use strict; +use warnings; +use inc::Module::Install 0.87; +{ # Ensure that these get used - yes, M::I loads them for us, but if you're + # in author mode and don't have them installed, then the error is tres + # cryptic. + no warnings 'redefine'; + use Module::Install::AuthorRequires; + use Module::Install::CheckConflicts; + use Module::Install::AuthorTests; +} -perl_version '5.008001'; +perl_version '5.008004'; name 'Catalyst-Runtime'; all_from 'lib/Catalyst/Runtime.pm'; +requires 'List::MoreUtils'; +requires 'namespace::autoclean' => '0.09'; requires 'namespace::clean'; -requires 'Scope::Upper' => '0.06'; -requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00800'; -requires 'Moose' => '0.70'; +requires 'namespace::autoclean'; +requires 'B::Hooks::EndOfScope' => '0.08'; +requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903'; +requires 'Class::MOP' => '0.83'; +requires 'Moose' => '0.90'; +requires 'MooseX::MethodAttributes::Inheritable' => '0.17'; +requires 'MooseX::Role::WithOverloading' => '0.03'; requires 'Carp'; -requires 'Class::C3::Adopt::NEXT' => '0.05'; -requires 'Class::MOP'; +requires 'Class::C3::Adopt::NEXT' => '0.07'; requires 'CGI::Simple::Cookie'; requires 'Data::Dump'; -requires 'File::Modified'; requires 'HTML::Entities'; requires 'HTTP::Body' => '1.04'; # makes uploadtmp work requires 'HTTP::Headers' => '1.64'; -requires 'HTTP::Request'; -requires 'HTTP::Response'; -requires 'HTTP::Request::AsCGI' => '0.5'; +requires 'HTTP::Request' => '5.814'; +requires 'HTTP::Response' => '5.813'; +requires 'HTTP::Request::AsCGI' => '0.8'; requires 'LWP::UserAgent'; -requires 'Module::Pluggable' => '3.01'; +requires 'Module::Pluggable' => '3.9'; requires 'Path::Class' => '0.09'; requires 'Scalar::Util'; requires 'Sub::Exporter'; @@ -31,78 +45,54 @@ requires 'Time::HiRes'; requires 'Tree::Simple' => '1.15'; requires 'Tree::Simple::Visitor::FindByPath'; requires 'URI' => '1.35'; +requires 'Task::Weaken'; requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness requires 'MRO::Compat'; +requires 'MooseX::Getopt' => '0.25'; +requires 'MooseX::Types'; +requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace test_requires 'Class::Data::Inheritable'; -test_requires 'Test::MockObject'; +test_requires 'Test::Exception'; +test_requires 'Test::More' => '0.88'; -if ( ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS}) - || (!exists $ENV{AGGREGATE_TESTS} && !can_use('Test::Aggregate', '0.34_01'))) { +# aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available +if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.35_05')) { + author_requires('Test::Aggregate', '0.35_05'); + author_requires('Test::Simple', '0.88'); +} +else { tests join q{ }, grep { $_ ne 't/aggregate.t' } map { glob } qw[t/*.t t/aggregate/*.t]; } -else { - test_requires('Test::Aggregate', '0.34_01'); -} -my @force_build_requires_if_author = qw( - Test::NoTabs - Test::Pod - Test::Pod::Coverage +author_requires 'CatalystX::LeakChecker', '0.03'; # Skipped if this isn't installed +author_requires 'File::Copy::Recursive'; # For http server test + +author_tests 't/author'; +author_requires(map {; $_ => 0 } qw( + Test::NoTabs + Test::Pod + Test::Pod::Coverage Pod::Coverage -); +)); if ($Module::Install::AUTHOR) { - - foreach my $module (@force_build_requires_if_author) { - build_requires $module; - } - - - if ($^O eq 'darwin') { - my $osx_ver = `/usr/bin/sw_vers -productVersion`; - chomp $osx_ver; - - # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE - # On 10.5 (Leopard) it wants COPYFILE_DISABLE - my $attr = $osx_ver eq '10.5' ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE'; - - makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}. - qq{ echo "You must set the ENV variable $attr to true,"; }. - ' echo "to avoid getting resource forks in your dist."; exit 255; fi' }); - } + darwin_check_no_resource_forks(); } +resources( + 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst', + 'IRC' => 'irc://irc.perl.org/#catalyst', + 'license', => 'http://dev.perl.org/licenses/', + 'homepage', => 'http://dev.catalyst.perl.org/', + 'repository', => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/', +); + install_script glob('script/*.pl'); auto_install; WriteAll; -if ($Module::Install::AUTHOR) { - - # Strip out the author only build_requires from META.yml - # Need to do this _after_ WriteAll else it looses track of them - Meta->{values}{build_requires} = [ grep { - my $ok = 1; - foreach my $module (@force_build_requires_if_author) { - if ($_->[0] =~ /$module/) { - $ok = 0; - last; - } - } - $ok; - } @{Meta->{values}{build_requires}} ]; - - Meta->{values}{resources} = [ - [ 'MailingList', 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst' ], - [ 'IRC', 'irc://irc.perl.org/#catalyst' ], - [ 'license', 'http://dev.perl.org/licenses/' ], - [ 'homepage', 'http://dev.catalyst.perl.org/'], - [ 'repository', 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/' ], - ]; - - Meta->write; -} print <<"EOF"; Important: @@ -115,57 +105,60 @@ print <<"EOF"; perl -MCPANPLUS -e 'install Catalyst::Devel' # or perl -MCPAN -e 'install Catalyst::Devel' - To get some commonly used plugins, as well as the TT view and DBIC + To get some commonly used plugins, as well as the TT view and DBIC model, install Task::Catalyst in the same way. Have fun! EOF -check_conflicts(); - -# Nicked straight from Moose! -sub check_conflicts { - # NOTE - This is the version number of the _incompatible_ code, - # not the version number of the fixed version. - my %conflicts = ( - 'Catalyst::Plugin::SmartURI' => '0.029', - 'CatalystX::CRUD' => '0.37', - 'Catalyst::Action::RenderView' => '0.07', - 'Catalyst::Plugin::DebugCookie' => '0.999002', - 'Catalyst::Plugin::Authentication' => '0.100091', - 'CatalystX::Imports' => '0.03', - 'Catalyst::Plugin::HashedCookies' => '1.03', - ); - - my $found = 0; - for my $mod ( sort keys %conflicts ) { - eval "require($mod)"; - next if $@; - - my $installed = $mod->VERSION(); - if ( $installed le $conflicts{$mod} ) { - - print <<"EOF"; +# NOTE - This is the version number of the _incompatible_ code, +# not the version number of the fixed version. +my %conflicts = ( + 'Catalyst::Plugin::SubRequest' => '0.14', + 'Catalyst::Model::Akismet' => '0.02', + 'Catalyst::Component::ACCEPT_CONTEXT' => '0.06', + 'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop + # should have been a core fix. + 'Catalyst::Plugin::Unicode::Encoding' => '0.2', + 'Catalyst::Authentication::Credential::HTTP' => '1.009', + 'Catalyst::Plugin::Session::Store::File' => '0.16', + 'Catalyst::Plugin::Session' => '0.21', + 'Catalyst::Plugin::Session::State::Cookie' => '0.10', + 'Catalyst::Plugin::Session::Store::FastMmap' => '0.09', + 'Catalyst::Controller::AllowDisable' => '0.03', + 'Reaction' => '0.001999', + 'Catalyst::Plugin::Upload::Image::Magick' => '0.03', + 'Catalyst::Plugin::ConfigLoader' => '0.22', # Older versions work but + # throw Data::Visitor warns + 'Catalyst::Devel' => '1.19', + 'Catalyst::Plugin::SmartURI' => '0.032', + 'CatalystX::CRUD' => '0.37', + 'Catalyst::Action::RenderView' => '0.07', + 'Catalyst::Plugin::DebugCookie' => '0.999002', + 'Catalyst::Plugin::Authentication' => '0.100091', + 'CatalystX::Imports' => '0.03', + 'Catalyst::Plugin::HashedCookies' => '1.03', + 'Catalyst::Action::REST' => '0.67', + 'CatalystX::CRUD' => '0.42', + 'CatalystX::CRUD::Model::RDBO' => '0.20', + 'Catalyst::View::Mason' => '0.17', +); +check_conflicts(%conflicts); -*** - This version of Catalyst conflicts with the version of - $mod ($installed) you have installed. +# End of script, helper functions below. - You will need to upgrade $mod after installing - this version of Catalyst. -*** +sub darwin_check_no_resource_forks { + if ($^O eq 'darwin') { + my $osx_ver = `/usr/bin/sw_vers -productVersion`; + chomp $osx_ver; -EOF + # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE + # On 10.5 (Leopard) it wants COPYFILE_DISABLE + die("Oh, you got Ceiling Cat, snazzy. Please read the man page for tar or Google to find out if Apple renamed COPYFILE_DISABLE (it was COPY_EXTENDED_ATTRIBUTES_DISABLE originally) again and fix this Makefile.PL please?\n") if $osx_ver =~ /^10.7/; + my $attr = $osx_ver =~ /^10.(5|6)/ ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE'; - $found = 1; - } + makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}. + qq{ echo "You must set the ENV variable $attr to 'true',"; }. + ' echo "to avoid getting resource forks in your dist."; exit 255; fi' }); } - - return unless $found; - - # More or less copied from Module::Build - return if $ENV{PERL_MM_USE_DEFAULT}; - return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT)); - - sleep 4; }