Added ExtUtils::AutoInstall support

diff --git a/Changes b/Changes
index c9ab879..8db817a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 This file documents the revision history for Perl extension Catalyst.
 
 5.58
+        - Added ExtUtils::AutoInstall support
         - Added -makefile to catalyst.pl to generate a new Makefile.PL.
         - Restored Catalyst::Build with a deprecation notice.
         - Improved PAR support

diff --git a/Makefile.PL b/Makefile.PL
index bd568f8..2314ce4 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,6 +6,8 @@ author('Sebastian Riedel');
 version_from('lib/Catalyst.pm');
 license('perl');
 
+include('ExtUtils::AutoInstall');
+
 requires( 'perl'               => '5.8.1' );
 requires( 'UNIVERSAL::require' => "0.10" );
 requires('Class::Accessor::Fast');
@@ -34,15 +36,30 @@ requires('Tree::Simple::Visitor::FindByPath');
 requires( 'URI' => 1.35 );
 requires('File::Copy::Recursive');
 requires('inc::Module::Install');
+requires('ExtUtils::AutoInstall');
 
-recommends( 'Catalyst::Engine::Apache' => '1.00' );
-recommends('FCGI');
-recommends('FCGI::ProcManager');
-recommends('PAR');
-recommends('CPANPLUS');
+features(
+    'Apache Support' => [
+        -default                   => 0,
+        'Catalyst::Engine::Apache' => '1.00'
+    ],
+    'FastCGI Support' => [
+        -default            => 0,
+        'FCGI'              => 0,
+        'FCGI::ProcManager' => 0
+    ],
+    'PAR Support' => [
+        -default => 0,
+        'PAR'    => 0
+    ],
+    'CPANPLUS' => [
+        -default   => 0,
+        'CPANPLUS' => 0
+    ],
+);
 
 install_script( glob('script/*.pl') );
-
+auto_install();
 &WriteAll;
 
 print( '*' x 80, "\n" );
@@ -75,6 +92,5 @@ print <<"EOF";
         perl -MCPANPLUS -e 'install Task::Catalyst'
         perl -MCPAN -e 'install Task::Catalyst'
 
-
  Have fun!
 EOF

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 933c071..d57c9f5 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -43,7 +43,7 @@ our $DETACH    = "catalyst_detach\n";
 require Module::Pluggable::Fast;
 
 # Helper script generation
-our $CATALYST_SCRIPT_GEN = 20;
+our $CATALYST_SCRIPT_GEN = 21;
 
 __PACKAGE__->mk_classdata($_)
   for qw/components arguments dispatcher engine log dispatcher_class

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 2ad1fdf..0a1e108 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -603,12 +603,14 @@ author('[% author %]');
 version_from('[% path %]');
 license('perl');
 
-requires( Catalyst => '5.57' );
+include('ExtUtils::AutoInstall');
 
-install_script( glob('script/*.pl') );
+requires( Catalyst => '5.58' );
 
 catalyst_files();
 
+install_script( glob('script/*.pl') );
+auto_install();
 &WriteAll;
 __readme__
 Run script/[% appprefix %]_server.pl to test the application.