diff options
| author | Chris Williams <chris@bingosnet.co.uk> | 2009-06-30 23:15:18 +0100 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2009-06-30 22:51:18 -0500 |
| commit | 36392a5f57ced56add402125103d4aaf4e746c07 (patch) | |
| tree | 11b58ec4174a27d7460af1ad4fc0cff6ef1f8bf7 /lib/CPANPLUS | |
| parent | 2221b6e72e26beda5ef0bcc757f00f60785ae96e (diff) | |
| download | perl-36392a5f57ced56add402125103d4aaf4e746c07.tar.gz | |
Update CPANPLUS::Dist::Build to CPAN version 0.35_03
Diffstat (limited to 'lib/CPANPLUS')
| -rw-r--r-- | lib/CPANPLUS/Dist/Build.pm | 12 | ||||
| -rw-r--r-- | lib/CPANPLUS/Dist/Build/Constants.pm | 2 | ||||
| -rw-r--r-- | lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/lib/CPANPLUS/Dist/Build.pm b/lib/CPANPLUS/Dist/Build.pm index 84efc66ecc..1396401aba 100644 --- a/lib/CPANPLUS/Dist/Build.pm +++ b/lib/CPANPLUS/Dist/Build.pm @@ -30,7 +30,7 @@ use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext'; local $Params::Check::VERBOSE = 1; -$VERSION = '0.35_02'; +$VERSION = '0.35_03'; =pod @@ -311,13 +311,7 @@ sub prepare { 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 @@ sub _find_prereqs { 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' diff --git a/lib/CPANPLUS/Dist/Build/Constants.pm b/lib/CPANPLUS/Dist/Build/Constants.pm index 675151aee0..e9864a02f5 100644 --- a/lib/CPANPLUS/Dist/Build/Constants.pm +++ b/lib/CPANPLUS/Dist/Build/Constants.pm @@ -9,7 +9,7 @@ BEGIN { require Exporter; use vars qw[$VERSION @ISA @EXPORT]; - $VERSION = '0.35_02'; + $VERSION = '0.35_03'; @ISA = qw[Exporter]; @EXPORT = qw[ BUILD_DIR BUILD ]; } diff --git a/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t b/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t index bc40808651..23f939831c 100644 --- a/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t +++ b/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t @@ -197,8 +197,9 @@ while( my($path,$need_cc) = each %Map ) { ### 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' ); |