In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/e57a4e52f25776b06acd158045c40d30b3b51bd3?hp=16bf6aa6d68d98291990dcdbb6c884269bf80b18>
- Log ----------------------------------------------------------------- commit e57a4e52f25776b06acd158045c40d30b3b51bd3 Author: Mike Giroux <[email protected]> Date: Sat Mar 21 06:33:18 2009 -0400 fix typo - s/was/what/ is to be ignored M pod/perlretut.pod commit 07abd197a871d2326c85c64eef74965344795ab3 Author: Mike Giroux <[email protected]> Date: Tue Feb 10 09:36:29 2009 -0500 Correct a few file references in README files M README.cygwin M mint/README commit baddfc47200940b4403c4d51ab778cf6e1032ec1 Author: Chris 'BinGOs' Williams <[email protected]> Date: Sat Mar 21 17:13:19 2009 +0100 Update CPANPLUS::Dist::Build to 0.16 Also set BinGOs as the maintainer for CPANPLUS::Dist::Build. M Porting/Maintainers.pl M lib/CPANPLUS/Dist/Build.pm M lib/CPANPLUS/Dist/Build/Constants.pm ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 3 +- README.cygwin | 4 +- lib/CPANPLUS/Dist/Build.pm | 35 ++++++++++++++++----------------- lib/CPANPLUS/Dist/Build/Constants.pm | 2 +- mint/README | 2 +- pod/perlretut.pod | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index a56a985..d1006aa 100644 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -18,6 +18,7 @@ package Maintainers; 'arandal' => 'Allison Randal <[email protected]>', 'audreyt' => 'Audrey Tang <[email protected]>', 'avar' => 'Ævar Arnfjörð Bjarmason <[email protected]>', + 'bingos' => 'Chris Williams <[email protected]>', 'chorny' => "Alexandr Ciornii <alexchorny\100gmail.com>", 'corion' => 'Max Maischein <[email protected]>', 'craig' => 'Craig Berry <[email protected]>', @@ -270,7 +271,7 @@ package Maintainers; 'CPANPLUS::Dist::Build' => { - 'MAINTAINER' => 'kwilliams', + 'MAINTAINER' => 'bingos', 'FILES' => q[lib/CPANPLUS/Dist/Build.pm lib/CPANPLUS/Dist/Build], 'CPAN' => 1, 'UPSTREAM' => 'cpan', diff --git a/README.cygwin b/README.cygwin index 231d947..14640c6 100644 --- a/README.cygwin +++ b/README.cygwin @@ -564,11 +564,11 @@ be kept as clean as possible. pod/perl561delta.pod pod/perl570delta.pod pod/perl572delta.pod pod/perl573delta.pod pod/perl58delta.pod pod/perl581delta.pod pod/perl590delta.pod pod/perlhist.pod pod/perlmodlib.pod - pod/perltoc.pod pod.lst Porting/Glossary Porting/repository.pod + pod/perltoc.pod pod.lst Porting/Glossary pod/perlrepository.pod Porting/checkAUTHORS.pl ext/Compress-Raw-Zlib/Changes ext/Compress-Raw-Zlib/README ext/Compress-Zlib/Changes ext/Cwd/Changes ext/DB_File/Changes - ext/Encode/Changes ext/Sys/Syslog/Changes ext/Time-HiRes/Changes + ext/Encode/Changes ext/Sys-Syslog/Changes ext/Time-HiRes/Changes ext/Win32API-File/Changes lib/CGI/Changes lib/ExtUtils/CBuilder/Changes lib/ExtUtils/Changes lib/ExtUtils/NOTES lib/ExtUtils/PATCHING lib/ExtUtils/README lib/Module/Build/Changes lib/Net/Ping/Changes diff --git a/lib/CPANPLUS/Dist/Build.pm b/lib/CPANPLUS/Dist/Build.pm index 550041b..57b908a 100644 --- a/lib/CPANPLUS/Dist/Build.pm +++ b/lib/CPANPLUS/Dist/Build.pm @@ -31,7 +31,7 @@ use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext'; local $Params::Check::VERBOSE = 1; -$VERSION = '0.14'; +$VERSION = '0.16'; =pod @@ -267,7 +267,7 @@ sub prepare { local @INC = CPANPLUS::inc->original_inc; ### this will generate warnings under anything lower than M::B 0.2606 - my %buildflags = $dist->_buildflags_as_hash( $buildflags ); + my @buildflags = $dist->_buildflags_as_list( $buildflags ); $dist->status->_buildflags( $buildflags ); my $fail; @@ -312,7 +312,7 @@ sub prepare { my $env = 'ENV_CPANPLUS_IS_EXECUTING'; local $ENV{$env} = BUILD_PL->( $dir ); - unless ( scalar run( command => [$perl, BUILD_PL->($dir), $buildflags], + unless ( scalar run( command => [$perl, BUILD_PL->($dir), @buildflags], buffer => \$prep_output, verbose => $verbose ) ) { @@ -379,9 +379,11 @@ sub _find_prereqs { my $content; if ( version->new( $Module::Build::VERSION ) >= $safe_ver and ! ON_WIN32 ) { + my @buildflags = $dist->_buildflags_as_list( $buildflags ); + # Use the new Build action 'prereq_data' - unless ( scalar run( command => [$perl, BUILD->($dir), 'prereq_data', $buildflags], + unless ( scalar run( command => [$perl, BUILD->($dir), 'prereq_data', @buildflags], buffer => \$content, verbose => 0 ) ) { @@ -540,7 +542,7 @@ sub create { if $self->best_path_to_module_build; ### this will generate warnings under anything lower than M::B 0.2606 - my %buildflags = $dist->_buildflags_as_hash( $buildflags ); + my @buildflags = $dist->_buildflags_as_list( $buildflags ); $dist->status->_buildflags( $buildflags ); my $fail; my $prereq_fail; my $test_fail; @@ -573,7 +575,7 @@ sub create { my $captured; - unless ( scalar run( command => [$perl, BUILD->($dir), $buildflags], + unless ( scalar run( command => [$perl, BUILD->($dir), @buildflags], buffer => \$captured, verbose => $verbose ) ) { @@ -595,7 +597,7 @@ sub create { unless( $skiptest ) { my $test_output; my $flag = ON_VMS ? '"test"' : 'test'; - my $cmd = [$perl, BUILD->($dir), $flag, $buildflags]; + my $cmd = [$perl, BUILD->($dir), $flag, @buildflags]; unless ( scalar run( command => $cmd, buffer => \$test_output, verbose => $verbose ) @@ -704,7 +706,8 @@ sub install { } my $fail; - my $buildflags = $dist->status->_buildflags; + my @buildflags = $dist->_buildflags_as_list( $dist->status->_buildflags ); + ### hmm, how is this going to deal with sudo? ### for now, check effective uid, if it's not root, ### shell out, otherwise use the method @@ -715,7 +718,7 @@ sub install { ### 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, BUILD->($dir), $flag, $buildflags]; + my $cmd = [$perl, BUILD->($dir), $flag, @buildflags]; my $sudo = $conf->get_program('sudo'); unshift @$cmd, $sudo if $sudo; @@ -729,11 +732,9 @@ sub install { $fail++; } } else { - my %buildflags = $dist->_buildflags_as_hash($buildflags); - my $install_output; my $flag = ON_VMS ? '"install"' : 'install'; - my $cmd = [$perl, BUILD->($dir), $flag, $buildflags]; + my $cmd = [$perl, BUILD->($dir), $flag, @buildflags]; unless( scalar run( command => $cmd, buffer => \$install_output, verbose => $verbose ) @@ -754,15 +755,13 @@ sub install { return $dist->status->installed( $fail ? 0 : 1 ); } -### returns the string 'foo=bar zot=quux' as (foo => bar, zot => quux) -sub _buildflags_as_hash { +### returns the string 'foo=bar --zot quux' +### as the list 'foo=bar', '--zot', 'qux' +sub _buildflags_as_list { my $self = shift; my $flags = shift or return; - my @argv = Module::Build->split_like_shell($flags); - my ($argv) = Module::Build->read_args(@argv); - - return %$argv; + return Module::Build->split_like_shell($flags); } =head1 AUTHOR diff --git a/lib/CPANPLUS/Dist/Build/Constants.pm b/lib/CPANPLUS/Dist/Build/Constants.pm index 52db6b7..4b9ac18 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.14'; + $VERSION = '0.16'; @ISA = qw[Exporter]; @EXPORT = qw[ BUILD_DIR BUILD ]; } diff --git a/mint/README b/mint/README index 85e8a75..258130d 100644 --- a/mint/README +++ b/mint/README @@ -10,5 +10,5 @@ when compiling Perl. The file system.c is an enhanced version of the system() function in the MiNTLib. It is strongly recommended that you insert this -version into your libc before you compile Perl (see README.MiNT +version into your libc before you compile Perl (see README.mint in the toplevel directory for details). diff --git a/pod/perlretut.pod b/pod/perlretut.pod index 0a2d563..a43bea1 100644 --- a/pod/perlretut.pod +++ b/pod/perlretut.pod @@ -2422,7 +2422,7 @@ palindrome in between. /(?: (\w) (?...Here be a palindrome...) \{-1} | \w? )/x -Adding C<\W*> at either end to eliminate was is to be ignored, we already +Adding C<\W*> at either end to eliminate what is to be ignored, we already have the full pattern: my $pp = qr/^(\W* (?: (\w) (?1) \g{-1} | \w? ) \W*)$/ix; -- Perl5 Master Repository
