X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=8a7218eaf41141532dca18b0a40f731d1601402c;hp=867326bd1b186b7ee885575169894a4bdc8ac63d;hb=ea0e58d9d85d93bf94c3ffa6b4d7b71b200bbdf1;hpb=022d1311a5927d7020a36ea25462f2f00e8bb01f

diff --git a/Makefile.PL b/Makefile.PL
index 867326b..8a7218e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,105 +1,49 @@
-# 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";
-          }
-      }
-}
+use inc::Module::Install 0.62;
 
-use inc::Module::Install;
+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 'Carp';
+requires 'Class::Accessor::Fast';
+requires 'Class::Data::Inheritable';
+requires 'Class::Inspector' => '1.06';
+requires 'CGI::Simple::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 'Time::HiRes';
+requires 'Tree::Simple' => '1.15';
+requires 'Tree::Simple::Visitor::FindByPath';
+requires 'URI' => '1.35';
+requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
 
-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 =
-  (qw/andyg chansen draven fordmason mst naughton sri jester/)[ int( rand(8) ) ]
+  (qw/andyg chansen draven fordmason mst naughton sri jester
+      nothingmuch LTJake/)[ int( rand(10) ) ]
   . " is the greatest and gabb is "
   . ( (localtime)[2] > 12 ? "drunk" : "hung over" )
   . " again!";
@@ -121,6 +65,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'