Author: BINGOS
Date: Sat Jun 27 01:38:58 2009
New Revision: 12928
Modified:
CPANPLUS-Dist-Build/trunk/Changes
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:
Integrated patch from Craig Berry to not use perlwrapper when on VMS. Skip the env test on VMS as well.
Modified: CPANPLUS-Dist-Build/trunk/Changes
==============================================================================
--- CPANPLUS-Dist-Build/trunk/Changes (original)
+++ CPANPLUS-Dist-Build/trunk/Changes Sat Jun 27 01:38:58 2009
@@ -1,5 +1,9 @@
Revision history for Perl extension CPANPLUS::Dist::Build.
+0.35_02 Sat Jun 27 09:35:55 BST 2009
+ - Don't use the perlwrapper on VMS, (Craig Berry)
+ - Skip env test on VMS
+
0.35_01 Wed Jun 24 09:57:28 BST 2009
- Fix to _find_prereqs() for VMS when running prereq_data
Build target, reported by Craig Berry.
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 Sat Jun 27 01:38:58 2009
@@ -30,7 +30,7 @@
local $Params::Check::VERBOSE = 1;
-$VERSION = '0.35_01';
+$VERSION = '0.35_02';
=pod
@@ -311,8 +311,15 @@
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]
+ }
- unless ( scalar run( command => [$perl, $run_perl, BUILD_PL->($dir), @buildflags],
+ unless ( scalar run( command => $cmd,
buffer => \$prep_output,
verbose => $verbose )
) {
@@ -378,14 +385,13 @@
my $content;
- if ( version->new( $Module::Build::VERSION ) >= $safe_ver and ! ON_WIN32 ) {
+ if ( version->new( $Module::Build::VERSION ) >= $safe_ver and ! ON_WIN32 and ! ON_VMS ) {
my @buildflags = $dist->_buildflags_as_list( $buildflags );
# Use the new Build action 'prereq_data'
my $run_perl = $conf->get_program('perlwrapper');
- my $flag = ON_VMS ? '"prereq_data"' : 'prereq_data';
- unless ( scalar run( command => [$perl, $run_perl, BUILD->($dir), $flag, @buildflags],
+ unless ( scalar run( command => [$perl, $run_perl, BUILD->($dir), 'prereq_data', @buildflags],
buffer => \$content,
verbose => 0 )
) {
@@ -582,9 +588,15 @@
last RUN;
}
- my $captured;
+ my ($captured, $cmd);
+ if ( ON_VMS ) {
+ $cmd = [$perl, BUILD->($dir), @buildflags];
+ }
+ else {
+ $cmd = [$perl, $run_perl, BUILD->($dir), @buildflags];
+ }
- unless ( scalar run( command => [$perl, $run_perl, BUILD->($dir), @buildflags],
+ unless ( scalar run( command => $cmd,
buffer => \$captured,
verbose => $verbose )
) {
@@ -605,8 +617,12 @@
### against 0.2607 on 26/1/2005
unless( $skiptest ) {
my $test_output;
- my $flag = ON_VMS ? '"test"' : 'test';
- my $cmd = [$perl, $run_perl, BUILD->($dir), $flag, @buildflags];
+ if ( ON_VMS ) {
+ $cmd = [$perl, BUILD->($dir), "test", @buildflags];
+ }
+ else {
+ $cmd = [$perl, $run_perl, BUILD->($dir), "test", @buildflags];
+ }
unless ( scalar run( command => $cmd,
buffer => \$test_output,
verbose => $verbose )
@@ -726,9 +742,13 @@
### don't worry about loading the right version of M::B anymore
### the 'new_from_context' already added the 'right' path to
### 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, $run_perl, BUILD->($dir), $flag, @buildflags];
+ my $cmd;
+ if ( ON_VMS ) {
+ $cmd = [$perl, BUILD->($dir), "install", @buildflags];
+ }
+ else {
+ $cmd = [$perl, $run_perl, BUILD->($dir), "install", @buildflags];
+ }
my $sudo = $conf->get_program('sudo');
unshift @$cmd, $sudo if $sudo;
@@ -742,9 +762,13 @@
$fail++;
}
} else {
- my $install_output;
- my $flag = ON_VMS ? '"install"' : 'install';
- my $cmd = [$perl, $run_perl, BUILD->($dir), $flag, @buildflags];
+ my ($install_output, $cmd);
+ if ( ON_VMS ) {
+ $cmd = [$perl, BUILD->($dir), "install", @buildflags];
+ }
+ else {
+ $cmd = [$perl, $run_perl, BUILD->($dir), "install", @buildflags];
+ }
unless( scalar run( command => $cmd,
buffer => \$install_output,
verbose => $verbose )
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 Sat Jun 27 01:38:58 2009
@@ -9,7 +9,7 @@
require Exporter;
use vars qw[$VERSION @ISA @EXPORT];
- $VERSION = '0.35_01';
+ $VERSION = '0.35_02';
@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 Sat Jun 27 01:38:58 2009
@@ -197,7 +197,7 @@
### 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") if ON_WIN32;
+ skip("Known issues due to capturing with this test and MSWin32/VMS") if ON_WIN32 or ON_VMS;
my $env = ENV_CPANPLUS_IS_EXECUTING;
my $clone = $Mod->clone;
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.