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=11621751852de01a002617cfc8cfdaa42f1f6e82;hb=f264b24aa346faa7193464cc626e3d9b953fcb18;hpb=a85294b6627a8b1b9006f478f125be7e203247fa diff --git a/Makefile.PL b/Makefile.PL index 1162175..ccb2a19 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,30 +1,42 @@ +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 'namespace::autoclean'; +requires 'List::MoreUtils'; +requires 'namespace::autoclean' => '0.09'; requires 'namespace::clean'; +requires 'namespace::autoclean'; requires 'B::Hooks::EndOfScope' => '0.08'; -requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801'; +requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903'; requires 'Class::MOP' => '0.83'; -requires 'Moose' => '0.78'; -requires 'MooseX::MethodAttributes::Inheritable' => '0.12'; +requires 'Moose' => '0.90'; +requires 'MooseX::MethodAttributes::Inheritable' => '0.17'; +requires 'MooseX::Role::WithOverloading' => '0.03'; requires 'Carp'; 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' => '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'; @@ -36,12 +48,13 @@ 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 -recommends 'B::Hooks::OP::Check::StashChange'; - test_requires 'Class::Data::Inheritable'; test_requires 'Test::Exception'; +test_requires 'Test::More' => '0.88'; # 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')) { @@ -53,34 +66,33 @@ else { grep { $_ ne 't/aggregate.t' } map { glob } qw[t/*.t t/aggregate/*.t]; } +author_requires 'CatalystX::LeakChecker', '0.03'; # Skipped if this isn't installed +author_requires 'File::Copy::Recursive'; # For http server test -author_requires($_) for qw( +author_tests 't/author'; +author_requires(map {; $_ => 0 } qw( Test::NoTabs Test::Pod Test::Pod::Coverage Pod::Coverage -); +)); if ($Module::Install::AUTHOR) { 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) { - 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: @@ -93,7 +105,7 @@ 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! @@ -102,6 +114,8 @@ 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. @@ -116,7 +130,7 @@ my %conflicts = ( 'Catalyst::Plugin::Upload::Image::Magick' => '0.03', 'Catalyst::Plugin::ConfigLoader' => '0.22', # Older versions work but # throw Data::Visitor warns - 'Catalyst::Devel' => '0.09', + 'Catalyst::Devel' => '1.19', 'Catalyst::Plugin::SmartURI' => '0.032', 'CatalystX::CRUD' => '0.37', 'Catalyst::Action::RenderView' => '0.07', @@ -127,6 +141,7 @@ my %conflicts = ( 'Catalyst::Action::REST' => '0.67', 'CatalystX::CRUD' => '0.42', 'CatalystX::CRUD::Model::RDBO' => '0.20', + 'Catalyst::View::Mason' => '0.17', ); check_conflicts(%conflicts); @@ -139,50 +154,11 @@ sub darwin_check_no_resource_forks { # 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'; + 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'; makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}. - qq{ echo "You must set the ENV variable $attr to true,"; }. + qq{ echo "You must set the ENV variable $attr to 'true',"; }. ' echo "to avoid getting resource forks in your dist."; exit 255; fi' }); - } -} - -sub check_conflicts { - my %conflicts = @_; - - my %conflicts_found; - for my $mod ( sort keys %conflicts ) { - eval "require($mod)"; - next if $@; - - my $installed = $mod->VERSION(); - $conflicts_found{$mod} = $installed if ( $installed le $conflicts{$mod} ); } - - return unless scalar keys %conflicts_found; - - print <<"EOF"; - - WARNING: - - This version of Catalyst conflicts with the versions of - some components you have installed. - - You will need to upgrade these modules after installing - this version of Catalyst. - - List of the conflicting components and their installed versions: - -EOF - - foreach my $mod (keys %conflicts_found) { - print sprintf(" %s => %s\n", $mod, $conflicts_found{$mod}); - } - print "\n"; - - # More or less copied from Module::Build, via Moose - return if $ENV{PERL_MM_USE_DEFAULT}; - return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT)); - - sleep 4; }