Updated for Module::Install 0.40 (autrijus still needs to fix something...)

diff --git a/Changes b/Changes
index 50842d0..95bd8a7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 This file documents the revision history for Perl extension Catalyst.
 
 5.62
+        - Updated for Module::Install 0.40
         - Fixed additional file installation for multi level app names
         - Added REDIRECT_URL support for applications running behind
           a RewriteRule in Apache. (Carl Franks)

diff --git a/Makefile.PL b/Makefile.PL
index 7ba87d8..4b5f2e0 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,101 +1,54 @@
-# 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;
 
-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' => '0.29';
+
+feature 'Apache/mod_perl Support',
+  -default                   => 0,
+  'Catalyst::Engine::Apache' => '1.02';
+
+feature 'FastCGI Support', -default => 0, 'FCGI' => 0, 'FCGI::ProcManager' => 0;
 
-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');
+feature 'PAR Support',
+  -default => 0,
+  'PAR'    => 0;
 
-features(
-    'Apache/mod_perl Support' => [
-        -default                   => 0,
-        'Catalyst::Engine::Apache' => '1.02'
-    ],
-    'FastCGI Support' => [
-        -default            => 0,
-        'FCGI'              => 0,
-        'FCGI::ProcManager' => 0
-    ],
-    'PAR Support' => [
-        -default => 0,
-        'PAR'    => 0
-    ],
-    'CPANPLUS (for easier installations)' => [
-        -default   => 0,
-        'CPANPLUS' => 0
-    ],
-);
+feature 'CPANPLUS (for easier installations)',
+  -default   => 0,
+  'CPANPLUS' => 0;
 
-install_script( glob('script/*.pl') );
-auto_install();
-&WriteAll;
+install_script glob('script/*.pl');
+auto_install;
+WriteAll;
 
 print( '*' x 80, "\n" );
 my $banner =

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index ab31ad7..0553622 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 = 23;
+our $CATALYST_SCRIPT_GEN = 24;
 
 __PACKAGE__->mk_classdata($_)
   for qw/components arguments dispatcher engine log dispatcher_class
@@ -54,7 +54,7 @@ __PACKAGE__->engine_class('Catalyst::Engine::CGI');
 __PACKAGE__->request_class('Catalyst::Request');
 __PACKAGE__->response_class('Catalyst::Response');
 
-our $VERSION = '5.61';
+our $VERSION = '5.62';
 
 sub import {
     my ( $class, @arguments ) = @_;

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index c582aa2..b148293 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -600,21 +600,16 @@ it under the same terms as Perl itself.
 __makefile__
 use inc::Module::Install;
 
-name('[% dir %]');
-abstract('Catalyst Application');
-author('[% author %]');
-version_from('[% path %]');
-license('perl');
+name '[% dir %]';
+all_from '[% path %]';
 
-include('ExtUtils::AutoInstall');
+requires Catalyst => '5.62';
 
-requires( Catalyst => '5.60' );
+catalyst_files;
 
-catalyst_files();
-
-install_script( glob('script/*.pl') );
-auto_install();
-&WriteAll;
+install_script glob('script/*.pl');
+auto_install;
+WriteAll;
 __readme__
 Run script/[% appprefix %]_server.pl to test the application.
 __changes__