X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=183ce2fcbd348a3f4311c14fb283135e2867fbf8;hb=fcddc3bf434c762e3e213db375edbbda1a77c5b5;hp=1bf824ce199e6ea9c7fa17b952084512eabe4f0b;hpb=e57eb11dc33f2b07a4c1965fe74c439f91033366;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 1bf824c..183ce2f 100644
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -651,7 +651,7 @@ plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD};
 
 all_pod_coverage_ok();
 __cgi__
-[% startperl %] -w
+[% startperl %]
 
 BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
 
@@ -689,7 +689,7 @@ it under the same terms as Perl itself.
 
 =cut
 __fastcgi__
-[% startperl %] -w
+[% startperl %]
 
 BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
 
@@ -758,7 +758,7 @@ it under the same terms as Perl itself.
 
 =cut
 __server__
-[% startperl %] -w
+[% startperl %]
 
 BEGIN { 
     $ENV{CATALYST_ENGINE} ||= 'HTTP';
@@ -776,6 +776,7 @@ my $fork          = 0;
 my $help          = 0;
 my $host          = undef;
 my $port          = 3000;
+my $keepalive     = 0;
 my $restart       = 0;
 my $restart_delay = 1;
 my $restart_regex = '\.yml$|\.yaml$|\.pm$';
@@ -788,6 +789,7 @@ GetOptions(
     'help|?'            => \$help,
     'host=s'            => \$host,
     'port=s'            => \$port,
+    'keepalive|k'       => \$keepalive,
     'restart|r'         => \$restart,
     'restartdelay|rd=s' => \$restart_delay,
     'restartregex|rr=s' => \$restart_regex
@@ -805,9 +807,10 @@ if ( $debug ) {
 require [% name %];
 
 [% name %]->run( $port, $host, {
-    argv   => \@argv,
-    'fork' => $fork,
-    restart => $restart,
+    argv          => \@argv,
+    'fork'        => $fork,
+    keepalive     => $keepalive,
+    restart       => $restart,
     restart_delay => $restart_delay,
     restart_regex => qr/$restart_regex/
 } );
@@ -829,6 +832,7 @@ require [% name %];
    -? -help           display this help and exits
       -host           host (defaults to all)
    -p -port           port (defaults to 3000)
+   -k -keepalive      enable keep-alive connections
    -r -restart        restart when files got modified
                       (defaults to false)
    -rd -restartdelay  delay between file checks
@@ -857,7 +861,7 @@ it under the same terms as Perl itself.
 
 =cut
 __test__
-[% startperl %] -w
+[% startperl %]
 
 use strict;
 use Getopt::Long;
@@ -912,7 +916,7 @@ it under the same terms as Perl itself.
 
 =cut
 __create__
-[% startperl %] -w
+[% startperl %]
 
 use strict;
 use Getopt::Long;
@@ -985,32 +989,38 @@ it under the same terms as Perl itself.
 
 =cut
 __package__
-[% startperl %] -w
+[% startperl %]
 
 use strict;
 use Getopt::Long;
 use Pod::Usage;
 use Catalyst::PAR;
 
-my $core = 0;
-my $engine = 'CGI';
-my $help = 0;
-my $par = '[% appprefix %].par';
+my $core      = 0;
+my $classes   = '';
+my $engine    = 'CGI';
+my $help      = 0;
+my $multiarch = 0;
+my $par       = '[% appprefix %].par';
 
 GetOptions(
-    'core'     => \$core,
-    'engine=s' => \$engine,
-    'help|?'   => \$help,
-    'par=s'    => \$par
+    'classes=s' => \$classes,
+    'core'      => \$core,
+    'engine=s'  => \$engine,
+    'help|?'    => \$help,
+    'multiarch' => \$multiarch,
+    'par=s'     => \$par
 );
 
 pod2usage(1) if $help;
 
 Catalyst::PAR->new->package( {
-    core   => $core,
-    engine => $engine,
-    par    => $par,
-    class  => '[% name %]'
+    classes   => $classes,
+    core      => $core,
+    engine    => $engine,
+    par       => $par,
+    multiarch => $multiarch,
+    class     => '[% name %]'
 } );
 
 1;
@@ -1024,14 +1034,18 @@ Catalyst::PAR->new->package( {
 [% appprefix %]_package.pl
 
  Options:
-   -core     also include modules bundled with Perl (defaults to false)
-   -engine   engine to use for dependency detection (defaults to CGI)
-   -help     display this help and exits
-   -par      name for the par archive (defaults to [% appprefix %].par)
+   -classes      comma separated list of additional classes to
+                 include in package
+   -core         also include modules bundled with Perl (defaults to false)
+   -engine       engine to use for dependency detection (defaults to CGI)
+   -help         display this help and exits
+   -multiarch    enable multiarch support (defaults to false)
+   -par          name for the par archive (defaults to [% appprefix %].par)
 
  Examples:
-   [% appprefix %]_package.pl [% appprefix %].par FastCGI
-   [% appprefix %]_package.pl foo_linux_i386_apache2.par Apache2
+   [% appprefix %]_package.pl -engine FastCGI
+   [% appprefix %]_package.pl -par foo_linux_i386_apache2.par -engine Apache2
+   [% appprefix %]_package.pl -classes Test::More,Foo::Bar -par foo.par
 
  See also:
    perldoc Catalyst::Manual