X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FPAR.pm;h=f4f9e9703516359ab06875b9562289fe94575836;hb=4bb9a245a12d91d73cc07422692fe839c47b1560;hp=7c4584fed9a2d06c20b2716e3d30a19371a3c4b4;hpb=94a6e0e40e4507a79c747bd41cbf9bfecdd58914;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/PAR.pm b/lib/Catalyst/PAR.pm
index 7c4584f..f4f9e97 100644
--- a/lib/Catalyst/PAR.pm
+++ b/lib/Catalyst/PAR.pm
@@ -6,6 +6,7 @@ use FindBin;
 use IO::File;
 use File::Spec;
 use File::Find;
+require Catalyst;
 
 =head1 NAME
 
@@ -51,6 +52,8 @@ sub package {
         sub {
             my $name = $File::Find::name;
             return if $name =~ /^\W*lib/;
+            return if $name =~ /^\W*blib/;
+            return if $name =~ /^\W*_build/;
             return if $name =~ /\.par$/;
             return if $name !~ /\w+/;
             push @files, $name;
@@ -61,13 +64,15 @@ sub package {
     my $par_test = File::Spec->catfile( $FindBin::Bin, '..', 'par_test.pl' );
     unlink $par_test;
 
+    my $version  = $Catalyst::VERSION;
     my $class    = $options->{class};
     my $tmp_file = IO::File->new("> $par_test");
     print $tmp_file <<"EOF";
+die "$class on Catalyst $version\n" if \$0 !~ /par_test.pl\.\\w+\$/;
 BEGIN { \$ENV{CATALYST_ENGINE} = '$engine' };
-use FindBin;
 use lib 'lib';
-use $class;
+require $class;
+import $class;
 EOF
     $tmp_file->close;
 
@@ -75,7 +80,7 @@ EOF
     local $SIG{__WARN__} = sub { };
     open my $olderr, '>&STDERR';
     open STDERR, '>', File::Spec->devnull;
-    my %opt = ( 'x' => 1, 'n' => 0, 'o' => $par, 'a' => [@files] );
+    my %opt = ( 'x' => 1, 'n' => 0, 'o' => $par, 'a' => [@files], 'B' => 1 );
     App::Packer::PAR->new(
         frontend  => 'Module::ScanDeps',
         backend   => 'PAR::Packer',