[svn:CPANPLUS-Dist-Build] r12977 - in CPANPLUS-Dist-Build/trunk: lib/CPANPLUS/Dist lib/CPANPLUS/Dist/Build t

Author: BINGOS
Date: Tue Jun 30 14:52:49 2009
New Revision: 12977

Modified:
   CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm
   CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build/Constants.pm
   CPANPLUS-Dist-Build/trunk/t/02_CPANPLUS-Dist-Build.t

Log:
Rolled in last changes for the core.

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	Tue Jun 30 14:52:49 2009
@@ -30,7 +30,7 @@
 
 local $Params::Check::VERBOSE = 1;
 
-$VERSION = '0.35_02';
+$VERSION = '0.35_03';
 
 =pod
 
@@ -311,13 +311,7 @@
         my $env = ENV_CPANPLUS_IS_EXECUTING;
         local $ENV{$env} = BUILD_PL->( $dir );
         my $run_perl    = $conf->get_program('perlwrapper');
-        my $cmd;
-        if ( ON_VMS ) {
-            $cmd = [$perl, BUILD_PL->($dir), @buildflags]
-        }
-        else {
-            $cmd = [$perl, $run_perl, BUILD_PL->($dir), @buildflags]
-        }
+        my $cmd = [$perl, $run_perl, BUILD_PL->($dir), @buildflags]
 
         unless ( scalar run(    command => $cmd,
                                 buffer  => \$prep_output,
@@ -385,7 +379,7 @@
 
     my $content;
 
-    if ( version->new( $Module::Build::VERSION ) >= $safe_ver and ! ON_WIN32 and ! ON_VMS ) {
+    if ( version->new( $Module::Build::VERSION ) >= $safe_ver and IPC::Cmd->can_capture_buffer ) {
         my @buildflags = $dist->_buildflags_as_list( $buildflags );
 
         # Use the new Build action 'prereq_data'

Modified: CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build/Constants.pm
==============================================================================
--- CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build/Constants.pm	(original)
+++ CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build/Constants.pm	Tue Jun 30 14:52:49 2009
@@ -9,7 +9,7 @@
     require Exporter;
     use vars    qw[$VERSION @ISA @EXPORT];
   
-    $VERSION    = '0.35_02';
+    $VERSION    = '0.35_03';
     @ISA        = qw[Exporter];
     @EXPORT     = qw[ BUILD_DIR BUILD ];
 }

Modified: CPANPLUS-Dist-Build/trunk/t/02_CPANPLUS-Dist-Build.t
==============================================================================
--- CPANPLUS-Dist-Build/trunk/t/02_CPANPLUS-Dist-Build.t	(original)
+++ CPANPLUS-Dist-Build/trunk/t/02_CPANPLUS-Dist-Build.t	Tue Jun 30 14:52:49 2009
@@ -197,8 +197,9 @@
 
 ### test ENV setting while running Build.PL code
 SKIP: {   ### use print() not die() -- we're redirecting STDERR in tests!
-    skip("Known issues due to capturing with this test and MSWin32/VMS") if ON_WIN32 or ON_VMS;
     my $env     = ENV_CPANPLUS_IS_EXECUTING;
+    skip("Can't test ENV{$env} -- no buffers available")
+      unless IPC::Cmd->can_capture_buffer;
     my $clone   = $Mod->clone;
     
     ok( $clone,                 'Testing ENV settings $dist->prepare' );