In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/dd6bf65d526315d26a9017c3838682c49e7ada68?hp=ba4fcaa4b97acba7facbac04b52bcb1e1d9e59c7>
- Log ----------------------------------------------------------------- commit dd6bf65d526315d26a9017c3838682c49e7ada68 Author: Craig A. Berry <[email protected]> Date: Mon Jul 6 10:32:26 2009 +0100 bump perldelta version number in vms/descrip_mms.template M vms/descrip_mms.template commit 04ec6eea7be262419152c3e6b1de79b822659c65 Author: Chris 'BinGOs' Williams <[email protected]> Date: Sat Jul 4 15:06:19 2009 +0100 Update CPANPLUS::Dist::Build to CPAN version 0.36 Hi, Attached is a patch to update CPANPLUS::Dist::Build in core to CPAN version 0.36. Highlights from the Change Log: ============================================================== 0.36 Sat Jul 4 14:51:42 BST 2009 - Make install() honour the buildflags directive, absence spotted by Matt Trout ============================================================== Many thanks, -- Chris Williams aka BinGOs PGP ID 0x4658671F http://www.gumbynet.org.uk ========================== From 43b0b0b2f93858517fa5d21566bcd807d4bf434a Mon Sep 17 00:00:00 2001 From: Chris Williams <[email protected]> Date: Sat, 4 Jul 2009 15:02:09 +0100 Subject: [PATCH] Update CPANPLUS::Dist::Build to CPAN version 0.36 Signed-off-by: H.Merijn Brand <[email protected]> (cherry picked from commit 0183efc54252e0b83726d100b2e8a3e5e04a3b35) M Porting/Maintainers.pl M lib/CPANPLUS/Dist/Build.pm M lib/CPANPLUS/Dist/Build/Constants.pm commit 7a51b0407f6e00cf49a5c84b295fb43dfa30a070 Author: Chris Williams <[email protected]> Date: Tue Jun 30 23:15:18 2009 +0100 Update CPANPLUS::Dist::Build to CPAN version 0.35_03 (cherry picked from commit 36392a5f57ced56add402125103d4aaf4e746c07) M Porting/Maintainers.pl M lib/CPANPLUS/Dist/Build.pm M lib/CPANPLUS/Dist/Build/Constants.pm M lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t commit 9d47db84517a8bab58651e6f9a6dd0686a212a07 Author: Chris 'BinGOs' Williams <[email protected]> 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 <[email protected]> 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 <[email protected]> (cherry picked from commit ef25d9aae6684282fb69d83559db0722adfa8203) M Porting/Maintainers.pl M lib/CPANPLUS/Dist/Build.pm M lib/CPANPLUS/Dist/Build/Constants.pm M lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t commit 9e757821f4b9475305ce3e568db1943f95dd70d4 Author: Vincent Pit <[email protected]> Date: Wed Jun 24 11:40:12 2009 +0200 Update Maintainers.pl accordingly (cherry picked from commit 8bca5c8a8bf440bd153c3cead9b89ad997975d66) M Porting/Maintainers.pl commit ce1dd0dfcf13783677a866bfc40fbaeec6c934f3 Author: Chris Williams <[email protected]> Date: Wed Jun 24 10:26:40 2009 +0100 Update CPANPLUS::Dist::Build to CPAN version 0.35_01 (cherry picked from commit 627cd18c09e213761e829fa1e62a6d43a2e9be81) M lib/CPANPLUS/Dist/Build.pm M lib/CPANPLUS/Dist/Build/Constants.pm commit b1e1afd5b71cd2629d97bf72b578780882c7b967 Author: Chris Williams <[email protected]> Date: Sat Jun 13 11:00:19 2009 +0100 Update CPANPLUS::Dist::Build to CPAN version 0.34 (cherry picked from commit 26ad458aeb6c3166efd1c5144eb908c7a3242226) M Porting/Maintainers.pl M lib/CPANPLUS/Dist/Build.pm M lib/CPANPLUS/Dist/Build/Constants.pm M lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- lib/CPANPLUS/Dist/Build.pm | 53 ++++++++++++++------ lib/CPANPLUS/Dist/Build/Constants.pm | 2 +- lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t | 3 +- .../modules/02packages.details.txt.gz.packed | 28 +++++----- vms/descrip_mms.template | 2 +- 6 files changed, 56 insertions(+), 34 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 35a52b8..aa6ae14 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -484,7 +484,7 @@ package Maintainers; 'CPANPLUS::Dist::Build' => { 'MAINTAINER' => 'bingos', - 'DISTRIBUTION' => 'BINGOS/CPANPLUS-Dist-Build-0.32.tar.gz', + 'DISTRIBUTION' => 'BINGOS/CPANPLUS-Dist-Build-0.36.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 5a834f0..d2d001b 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.32'; +$VERSION = '0.36'; =pod @@ -311,8 +311,9 @@ sub prepare { my $env = ENV_CPANPLUS_IS_EXECUTING; local $ENV{$env} = BUILD_PL->( $dir ); my $run_perl = $conf->get_program('perlwrapper'); + my $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,7 +379,7 @@ 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 IPC::Cmd->can_capture_buffer ) { my @buildflags = $dist->_buildflags_as_list( $buildflags ); # Use the new Build action 'prereq_data' @@ -581,9 +582,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 ) ) { @@ -604,8 +611,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 ) @@ -677,13 +688,15 @@ sub install { my %hash = @_; - my $verbose; my $perl; my $force; + my $verbose; my $perl; my $force; my $buildflags; { local $Params::Check::ALLOW_UNKNOWN = 1; my $tmpl = { verbose => { default => $conf->get_conf('verbose'), store => \$verbose }, force => { default => $conf->get_conf('force'), store => \$force }, + buildflags => { default => $conf->get_conf('buildflags'), + store => \$buildflags }, perl => { default => $^X, store => \$perl }, }; @@ -714,7 +727,7 @@ sub install { } my $fail; - my @buildflags = $dist->_buildflags_as_list( $dist->status->_buildflags ); + my @buildflags = $dist->_buildflags_as_list( $buildflags ); my $run_perl = $conf->get_program('perlwrapper'); ### hmm, how is this going to deal with sudo? @@ -725,9 +738,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; @@ -741,9 +758,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 ) @@ -792,7 +813,7 @@ terms as Perl itself. =cut -1; +qq[Putting the Module::Build into CPANPLUS]; # Local variables: diff --git a/lib/CPANPLUS/Dist/Build/Constants.pm b/lib/CPANPLUS/Dist/Build/Constants.pm index 9ed2b07..7f45d6b 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.32'; + $VERSION = '0.36'; @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..23f9398 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") if ON_WIN32; 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' ); diff --git a/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed b/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed index bb27fa5..cbcfcf6 100644 --- a/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed +++ b/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed @@ -4,23 +4,23 @@ is included in the Perl distribution. To unpack this file use the following command: - uupacktool.pl -u lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz + uupacktool.pl -u 02packages.details.txt.gz.packed 02packages.details.txt.gz To recreate it use the following command: - uupacktool.pl -p lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed + uupacktool.pl -p 02packages.details.txt.gz 02packages.details.txt.gz.packed -Created at Mon May 18 16:36:58 2009 +Created at Sat Jun 13 10:56:20 2009 ######################################################################### __UU__ -M'XL("-3:`DH``S`R<&%C:V%G97,N9&5T86EL<RYT>'0`G=-!;]...@%`?p<_PI -MWF&'30J8.K(J<5J<)E6W)(V66>UMHH8F:#98\%PO^_2#9%W;:-G6(4N6X,^/ -M!X*9KA6'Q\:R5E1?Q49Y*A4*77N*WS`I/\V?,K!%;'F:]GU/6^5J6MDFG:S& -MR[2QLJN53T\H%\I73K>HK0G:ZA`!(QKEX=YV1H(V(+53%...@s=[4w2xm<ZG -M6J;)Q-9=8_S/4MIGP!`>E/,!'H9NW"97!I612I*9=1S&'=I&H))PK[#:@K,= -M:J/\\...@!1(6W6-,BAB>32Y<1H#08I=7*VII?;8BSCY[0-D=,2R=W"w...@[&1 -...@e//UIE].:],+H18<_)//!D$O:$<?H9.\_S9"X\DK*5L1`.-TH.8<3@@S"0 -M,98!RWD6OG.X7'Q.DIFUG!?"<3XM.;]=PU%CE)W%_[2\7:<A3$*6Q$Z*PM'- -m]v?...@3l"C^"5A>'Q-/0!S["Q$W<9j8...@.%]w=_]#')_...@b7,[P3/@I -...@xq,GOI$DO3]6Q;]E+*;ZOG#*6?V&C7T1X%JMY&0[B(ES*4$^G:SD8Q%4& -9Q=7R\GJ=/D9(3)!]X$45/P`_H+;"]0,````` +M'XL("*MG,TH"`S`R<&%C:V%G97,N9&5T86EL<RYT>'0`G=-1;],P$`?PY^93 +MW`,/(#6.EZH"^8FF:Z=!VU64:'M#7GQK+1([LB\KW:?'7AG;*CH&ITB1G+]_ +M/D?V5-<HX*%XWLKJNURC9PI)ZMHS^D%)^67VF($-42NR;+O=LA9=S2K;9./E +M:)$U5G4U^NR(<HJ^<KHE;4W0EOL(&-...@aqo;&07:@-(.*[)N!V_N3=G1QCJ? +M:94E8UMWC?&_6FF?`'VX1><#W`_#M$G.#:%1J-*I=0)&'=E&$BJX0:HVX&Q' +MVJ#O[Q</$(*R5=>@(1G;8\FETQ2(M-C%U9I::4];&2>_O86<#7C^#JYW,#+* +MH?3LLT6CUQ^ET8T,>t...@4_'84\4IY]\2&;24UJV*G8AX!)5'P8</DD#.><Y +M\*'(P_,>SN9?DV1JK1"%=$),2B&N5G!0G/&3^)Z45ZLLA-.03>,@(^G8^NX) +M,"]>`N;%JX#%Q2'Q",1O?R'B)HX3D_(?""%6W?7_$'"D7D$4X62&.R*.40?$ +M/I[^21IO%;Q4^7,I7JXAXWSXC0]^$^%.+&=E^!&GX42&?CI=JUXOKM(KSA=G +5%ZOL(9+&1'H?>-;%3[#Q)H#R`P`` diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index 6f1b037..6d5637e 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -434,7 +434,7 @@ pod = $(pod0) $(pod1) $(pod2) $(pod3) $(pod4) $(pod5) $(pod6) $(pod7) $(pod8) $( # Would be useful to automate the generation of this rule from pod/buildtoc # Plus its corresponding delete in the clean target. -[.pod]perldelta.pod : [.pod]perl5100delta.pod +[.pod]perldelta.pod : [.pod]perl5101delta.pod Copy/NoConfirm/Log $(MMS$SOURCE) $(MMS$TARGET) [.pod]perlapi.pod : embed.fnc autodoc.pl $(MINIPERL_EXE) -- Perl5 Master Repository
