Front page | perl.perl5.changes |
Postings from June 2009
[perl.git] branch blead, updated. GitLive-blead-1456-gef25d9a
From:
H.Merijn Brand
Date:
June 27, 2009 02:23
Subject:
[perl.git] branch blead, updated. GitLive-blead-1456-gef25d9a
Message ID:
E1MKU8H-0005Ys-5Z@camel.booking.com
In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/ef25d9aae6684282fb69d83559db0722adfa8203?hp=3bce0506564aac8d4ed477fca801708e58b220ff>
- Log -----------------------------------------------------------------
commit ef25d9aae6684282fb69d83559db0722adfa8203
Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Date: Sat Jun 27 10:16:29 2009 +0100
Update CPANPLUS::Dist::Build to CPAN version 0.35_02
Hi,
Attached is a patch to update the CPANPLUS::Dist::Build in core to
CPAN version 0.35_02
Highlights from the Changelog:
===================================================================
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
===================================================================
Many thanks,
--
Chris Williams
aka BinGOs
PGP ID 0x4658671F
http://www.gumbynet.org.uk
==========================
From dec0de66c239bf268f4b8a045a29d8432df06498 Mon Sep 17 00:00:00 2001
From: Chris Williams <chris@bingosnet.co.uk>
Date: Sat, 27 Jun 2009 09:47:29 +0100
Subject: [PATCH 4/4] Update CPANPLUS::Dist::Build to CPAN version 0.35_02
Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl>
-----------------------------------------------------------------------
Summary of changes:
Porting/Maintainers.pl | 2 +-
lib/CPANPLUS/Dist/Build.pm | 54 ++++++++++++++------
lib/CPANPLUS/Dist/Build/Constants.pm | 2 +-
lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t | 2 +-
4 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 5236ecc..ca9a89c 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -476,7 +476,7 @@ package Maintainers;
'CPANPLUS::Dist::Build' =>
{
'MAINTAINER' => 'bingos',
- 'DISTRIBUTION' => 'BINGOS/CPANPLUS-Dist-Build-0.35_01.tar.gz',
+ 'DISTRIBUTION' => 'BINGOS/CPANPLUS-Dist-Build-0.35_02.tar.gz',
'FILES' => q[lib/CPANPLUS/Dist/Build.pm
lib/CPANPLUS/Dist/Build
],
diff --git a/lib/CPANPLUS/Dist/Build.pm b/lib/CPANPLUS/Dist/Build.pm
index b020c72..84efc66 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_01';
+$VERSION = '0.35_02';
=pod
@@ -311,8 +311,15 @@ 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]
+ }
- 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 @@ sub _find_prereqs {
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 @@ sub create {
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 @@ sub create {
### 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 @@ sub install {
### 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 @@ sub install {
$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 )
diff --git a/lib/CPANPLUS/Dist/Build/Constants.pm b/lib/CPANPLUS/Dist/Build/Constants.pm
index d69c700..675151a 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_01';
+ $VERSION = '0.35_02';
@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 b7686ef..bc40808 100644
--- a/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t
+++ b/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t
@@ -197,7 +197,7 @@ 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") 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;
--
Perl5 Master Repository
-
[perl.git] branch blead, updated. GitLive-blead-1456-gef25d9a
by H.Merijn Brand