X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=3c18118fdd84b83142ed06cffd27c464e5297c25;hp=35cd9dfb964bc66e2d88e3ce9b4f697b475bf197;hb=5300313d220ce9c7ffbee37be2b315d332e1c549;hpb=474c164bd60fb3c9b2decb1c7b9be98f3f28deb8

diff --git a/Makefile.PL b/Makefile.PL
index 35cd9df..3c18118 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,77 +1,46 @@
-use inc::Module::Install;
+use inc::Module::Install 0.62;
 
-# ExtUtils::AutoInstall Bootstrap Code, version 7.
-BEGIN{my$p='ExtUtils::AutoInstall';my$v=0.45;$p->VERSION||0>=$v
-or+eval"use $p $v;1"or+do{my$e=$ENV{PERL_EXTUTILS_AUTOINSTALL};
-(!defined($e)||$e!~m/--(?:default|skip|testonly)/and-t STDIN or
-eval"use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v}
-);1"and exit)and print"==> $p $v required. Install it from CP".
-"AN? [Y/n] "and<STDIN>!~/^n/i and print"*** Installing $p\n"and
-do{if (eval '$>' and lc(`sudo -V`) =~ /version/){system('sudo',
-$^X,"-MCPANPLUS","-e","CPANPLUS::install $p");eval"use $p $v;1"
-||system('sudo', $^X, "-MCPAN", "-e", "CPAN::install $p")}eval{
-require CPANPLUS;CPANPLUS::install$p};eval"use $p $v;1"or eval{
-require CPAN;CPAN::install$p};eval"use $p $v;1"||die"*** Please
-manually install $p $v from cpan.org first...\n"}}}
+perl_version '5.8.1';
 
-name('Catalyst');
-abstract('Catalyst Web Framework');
-author('Sebastian Riedel');
-version_from('lib/Catalyst.pm');
-license('perl');
+name 'Catalyst';
+all_from 'lib/Catalyst.pm';
 
-requires( 'perl'               => '5.8.1' );
-requires( 'UNIVERSAL::require' => "0.10" );
-requires('Class::Accessor::Fast');
-requires('Class::Data::Inheritable');
-requires('Class::Inspector');
-requires('CGI::Cookie');
-requires('File::Modified');
-requires('HTML::Entities');
-requires( 'HTTP::Body'    => 0.5 );
-requires( 'HTTP::Headers' => 1.59 );
-requires('HTTP::Request');
-requires('HTTP::Response');
-requires('HTTP::Request::AsCGI');
-requires('LWP::UserAgent');
-requires('MIME::Types');
-requires( 'Module::Pluggable::Fast' => 0.16 );
-requires('NEXT');
-requires( 'Path::Class' => 0.09 );
-requires('Scalar::Util');
-requires('Template');
-requires('Text::SimpleTable');
-requires('Test::MockObject');
-requires('Time::HiRes');
-requires('Tree::Simple');
-requires('Tree::Simple::Visitor::FindByPath');
-requires( 'URI' => 1.35 );
-requires('File::Copy::Recursive');
-requires('Module::Install::Admin');
+requires 'perl'               => '5.8.1';
+requires 'UNIVERSAL::require' => "0.10";
+requires 'Carp';
+requires 'Class::Accessor::Fast';
+requires 'Class::Data::Inheritable';
+requires 'Class::Inspector' => '1.06';
+requires 'CGI::Cookie';
+requires 'Data::Dump';
+requires 'File::Modified';
+requires 'HTML::Entities';
+requires 'HTTP::Body'    => 0.5;
+requires 'HTTP::Headers' => 1.64;
+requires 'HTTP::Request';
+requires 'HTTP::Response';
+requires 'HTTP::Request::AsCGI' => '0.5';
+requires 'LWP::UserAgent';
+requires 'Module::Pluggable::Fast' => 0.16;
+requires 'NEXT';
+requires 'Path::Class' => 0.09;
+requires 'Scalar::Util';
+requires 'Text::SimpleTable' => 0.03;
+requires 'Test::MockObject';
+requires 'Test::NoWarnings' => 0.082;
+requires 'Time::HiRes';
+requires 'Tree::Simple' => 1.15;
+requires 'Tree::Simple::Visitor::FindByPath';
+requires 'URI' => 1.35;
 
-features(
-    'Apache/mod_perl Support' => [
-        -default                   => 0,
-        'Catalyst::Engine::Apache' => '1.00'
-    ],
-    'FastCGI Support' => [
-        -default            => 0,
-        'FCGI'              => 0,
-        'FCGI::ProcManager' => 0
-    ],
-    'PAR Support' => [
-        -default => 0,
-        'PAR'    => 0
-    ],
-    'CPANPLUS (for easier installations)' => [
-        -default   => 0,
-        'CPANPLUS' => 0
-    ],
-);
+feature 'Apache/mod_perl Support',
+  -default                   => 0,
+  'Catalyst::Engine::Apache' => '1.05';
 
-install_script( glob('script/*.pl') );
-auto_install();
-&WriteAll;
+feature 'FastCGI Support', -default => 0, 'FCGI' => 0, 'FCGI::ProcManager' => 0;
+
+install_script glob('script/*.pl');
+WriteAll;
 
 print( '*' x 80, "\n" );
 my $banner =
@@ -97,6 +66,10 @@ print <<"EOF";
     Install Task::Catalyst to get everything you need to start writing
     serious applications with Catalyst.
 
+    Note that Catalyst::Helper has been split into a separate distribution,
+    and is required for using catalyst.pl to make new distributions. It is
+    included with Task::Catalyst
+
         perl -MCPANPLUS -e 'install Task::Catalyst'
         perl -MCPAN -e 'install Task::Catalyst'