[svn:CPANPLUS-Dist-Build] r12800 - in CPANPLUS-Dist-Build/trunk: . lib/CPANPLUS/Dist

Author: BINGOS
Date: Mon Jun  1 14:56:43 2009
New Revision: 12800

Modified:
   CPANPLUS-Dist-Build/trunk/Changes
   CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm

Log:
Added 'perlwrapper' to all perl calls. Spotted by Matt Trout

Modified: CPANPLUS-Dist-Build/trunk/Changes
==============================================================================
--- CPANPLUS-Dist-Build/trunk/Changes	(original)
+++ CPANPLUS-Dist-Build/trunk/Changes	Mon Jun  1 14:56:43 2009
@@ -2,6 +2,9 @@
 
 0.32
   - Removed generation of .output files
+  - Fixed the setting of PERL5_CPANPLUS_IS_EXECUTING env var in 
+    prepare. Spotted by Matt Trout
+  - Added 'perlwrapper' to all perl calls. Spotted by Matt Trout.
 
 0.30 Mon May 18 16:23:14 BST 2009
   - [RT #46176] Skip XS tests when perl compiled without dynamic

Modified: CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm
==============================================================================
--- CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm	(original)
+++ CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm	Mon Jun  1 14:56:43 2009
@@ -310,8 +310,9 @@
 
         my $env = ENV_CPANPLUS_IS_EXECUTING;
         local $ENV{$env} = BUILD_PL->( $dir );
+        my $run_perl    = $conf->get_program('perlwrapper');
 
-        unless ( scalar run(    command => [$perl, BUILD_PL->($dir), @buildflags],
+        unless ( scalar run(    command => [$perl, $run_perl, BUILD_PL->($dir), @buildflags],
                                 buffer  => \$prep_output,
                                 verbose => $verbose ) 
         ) {
@@ -381,8 +382,9 @@
         my @buildflags = $dist->_buildflags_as_list( $buildflags );
 
         # Use the new Build action 'prereq_data'
-        
-        unless ( scalar run(    command => [$perl, BUILD->($dir), 'prereq_data', @buildflags],
+        my $run_perl    = $conf->get_program('perlwrapper');
+
+        unless ( scalar run(    command => [$perl, $run_perl, BUILD->($dir), 'prereq_data', @buildflags],
                                 buffer  => \$content,
                                 verbose => 0 ) 
         ) {
@@ -552,6 +554,8 @@
     my $fail; my $prereq_fail; my $test_fail;
     RUN: {
 
+        my $run_perl    = $conf->get_program('perlwrapper');
+
         ### this will set the directory back to the start
         ### dir, so we must chdir /again/
         my $ok = $dist->_resolve_prereqs(
@@ -579,7 +583,7 @@
 
         my $captured;
 
-        unless ( scalar run(    command => [$perl, BUILD->($dir), @buildflags],
+        unless ( scalar run(    command => [$perl, $run_perl, BUILD->($dir), @buildflags],
                                 buffer  => \$captured,
                                 verbose => $verbose ) 
         ) {
@@ -601,7 +605,7 @@
         unless( $skiptest ) {
             my $test_output;
             my $flag    = ON_VMS ? '"test"' : 'test';
-            my $cmd     = [$perl, BUILD->($dir), $flag, @buildflags];
+            my $cmd     = [$perl, $run_perl, BUILD->($dir), $flag, @buildflags];
             unless ( scalar run(    command => $cmd,
                                     buffer  => \$test_output,
                                     verbose => $verbose ) 
@@ -711,6 +715,7 @@
 
     my $fail;
     my @buildflags = $dist->_buildflags_as_list( $dist->status->_buildflags );
+    my $run_perl    = $conf->get_program('perlwrapper');
 
     ### hmm, how is this going to deal with sudo?
     ### for now, check effective uid, if it's not root,
@@ -722,7 +727,7 @@
         ### M::B at the top of the build.pl
         ### On VMS, flags need to be quoted
         my $flag    = ON_VMS ? '"install"' : 'install';
-        my $cmd     = [$perl, BUILD->($dir), $flag, @buildflags];
+        my $cmd     = [$perl, $run_perl, BUILD->($dir), $flag, @buildflags];
         my $sudo    = $conf->get_program('sudo');
         unshift @$cmd, $sudo if $sudo;
 
@@ -738,7 +743,7 @@
     } else {
         my $install_output;
         my $flag    = ON_VMS ? '"install"' : 'install';
-        my $cmd     = [$perl, BUILD->($dir), $flag, @buildflags];
+        my $cmd     = [$perl, $run_perl, BUILD->($dir), $flag, @buildflags];
         unless( scalar run( command => $cmd,
                             buffer  => \$install_output,
                             verbose => $verbose )