Fixed: No Helper in Catalyst.pm

diff --git a/Changes b/Changes
index a0d799e..38624dd 100644 (file)
--- a/Changes
+++ b/Changes
@@ -4,6 +4,8 @@ This file documents the revision history for Perl extension Catalyst.
         - Fixed Test example (Torsten Seeman)
         - Added Plugins chapter to manual
         - applied doc patch from Robert Boone <robert@rlb3.com>
+        - Refactored so we don't need to include helper from
+        Catalyst.pm
 
 5.02  Mon Apr 18 10:00:00 2005
         - fixed manifest

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 6dc0f13..ac8b853 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -4,8 +4,8 @@ use strict;
 use base 'Catalyst::Base';
 use UNIVERSAL::require;
 use Catalyst::Log;
-use Catalyst::Helper;
 use Text::ASCIITable;
+our $CATALYST_SCRIPT_GEN = 2;
 
 __PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
 
@@ -172,7 +172,7 @@ sub import {
           . "application and copying over the new scripts." )
       if ( $ENV{CATALYST_SCRIPT_GEN}
         && (
-            $ENV{CATALYST_SCRIPT_GEN} < $Catalyst::Helper::CATALYST_SCRIPT_GEN )
+            $ENV{CATALYST_SCRIPT_GEN} < $CATALYST_SCRIPT_GEN )
       );
 
     # Process options

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 1504757..ccf766f 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -8,7 +8,7 @@ use File::Path;
 use IO::File;
 use FindBin;
 use Template;
-our $CATALYST_SCRIPT_GEN = 2;
+use Catalyst;
 
 my %cache;
 
@@ -61,7 +61,7 @@ sub mk_app {
     $self->{dir}  = $name;
     $self->{dir} =~ s/\:\:/-/g;
     $self->{startperl} = $Config{startperl};
-    $self->{scriptgen}=$CATALYST_SCRIPT_GEN;
+    $self->{scriptgen}=$Catalyst::CATALYST_SCRIPT_GEN;
     $self->{author}=$self->{author} = $ENV{'AUTHOR'} ||
                     @{[getpwuid($<)]}[6];
     $self->_mk_dirs;