From e6bd4dde312159cd87f0d24e96f473538c89d0d8 Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Fri, 11 Nov 2011 20:21:41 +0000 Subject: Update CPANPLUS to CPAN version 0.9112 [DELTA] Changes for 0.9112 Fri Nov 11 11:10:59 2011 ================================================ * The 'perlwrapper' is no longer required. --- cpan/CPANPLUS/lib/CPANPLUS.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Config.pm | 11 ++++++++++- cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm | 16 ++-------------- cpan/CPANPLUS/lib/CPANPLUS/Internals.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | 1 + cpan/CPANPLUS/lib/CPANPLUS/Module.pm | 4 ++-- cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm | 4 ++-- cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm | 2 +- 8 files changed, 20 insertions(+), 22 deletions(-) (limited to 'cpan/CPANPLUS') diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm index 6a37717d05..e5b04fd45d 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS.pm @@ -13,7 +13,7 @@ BEGIN { use vars qw( @EXPORT @ISA $VERSION ); @EXPORT = qw( shell fetch get install ); @ISA = qw( Exporter ); - $VERSION = "0.9111"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.9112"; #have to hardcode or cpan.org gets unhappy } ### purely for backward compatibility, so we can call it from the commandline: diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Config.pm b/cpan/CPANPLUS/lib/CPANPLUS/Config.pm index 321e0659f2..ead0ae7a2b 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Config.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Config.pm @@ -18,6 +18,7 @@ use File::Basename qw[dirname]; use IPC::Cmd qw[can_run]; use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext'; use Module::Load::Conditional qw[check_install]; +use version; =pod @@ -350,7 +351,7 @@ and L are available. $Conf->{'conf'}->{'prefer_makefile'} = ( $] >= 5.010001 or ( check_install( module => 'Module::Build', version => '0.32' ) and - check_install( module => INSTALLER_BUILD, version => '0.24' ) ) + check_install( module => INSTALLER_BUILD, version => '0.60' ) ) ? 0 : 1 ); =item prereqs @@ -589,6 +590,8 @@ remains empty if you do not require super user permissions to install. =item perlwrapper +B + A string holding the path to the C utility bundled with CPANPLUS, which is used to enable autoflushing in spawned processes. @@ -675,6 +678,12 @@ with CPANPLUS, which is used to enable autoflushing in spawned processes. ### we should have a $path by now ideally, if so return it return $path if defined $path; + ### CPANPLUS::Dist::MM doesn't require this anymore + ### but CPANPLUS::Dist::Build might if it is less than 0.60 + my $cpdb = check_install( module => INSTALLER_BUILD ); + return '' unless + $cpdb and eval { version->parse($cpdb->{version}) < version->parse('0.60') }; + ### if not, warn about it and give sensible default. ### XXX try to be a no-op instead then.. ### cross your fingers... diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm index de3d138235..4ef9fc1933 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm @@ -353,20 +353,8 @@ sub prepare { ### in @INC, stopping us from resolving dependencies on CPANPLUS ### at bootstrap time properly. - ### XXX this fails under ipc::run due to the extra quotes, - ### but it works in ipc::open3. however, ipc::open3 doesn't work - ### on win32/cygwin. XXX TODO get a windows box and sort this out - # my $cmd = qq[$perl -MEnglish -le ] . - # QUOTE_PERL_ONE_LINER->( - # qq[\$OUTPUT_AUTOFLUSH++,do(q($makefile_pl))] - # ) - # . $mmflags; - - # my $flush = OPT_AUTOFLUSH; - # my $cmd = "$perl $flush $makefile_pl $mmflags"; - - my $run_perl = $conf->get_program('perlwrapper'); - my $cmd = [$perl, $run_perl, $makefile_pl, @mmflags]; + my @run_perl = ( '-e', PERL_WRAPPER ); + my $cmd = [$perl, @run_perl, $makefile_pl, @mmflags]; ### set ENV var to tell underlying code this is what we're ### executing. diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm index f070b1452d..b52cbf9204 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm @@ -42,7 +42,7 @@ use vars qw[@ISA $VERSION]; CPANPLUS::Internals::Report ]; -$VERSION = "0.9111"; +$VERSION = "0.9112"; =pod diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm index 556fb349df..bd48a1db8c 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm @@ -332,6 +332,7 @@ use constant CALLING_FUNCTION return join '::', (caller(2+$lvl))[3] }; use constant PERL_CORE => 'perl'; +use constant PERL_WRAPPER => 'use strict; BEGIN { my $old = select STDERR; $|++; select $old; $|++; $0 = shift(@ARGV); my $rv = do($0); die $@ if $@; }'; use constant STORABLE_EXT => '.stored'; use constant GET_XS_FILES => sub { my $dir = $_[0] or return; diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm index bdfe1ae5fa..b9ddf408b5 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Module.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Module.pm @@ -688,7 +688,7 @@ sub get_installer_type { if( $type and $type eq INSTALLER_BUILD and ( not CPANPLUS::Dist->has_dist_type( INSTALLER_BUILD ) or not $cb->module_tree( INSTALLER_BUILD ) - ->is_uptodate( version => '0.24' ) + ->is_uptodate( version => '0.60' ) ) ) { ### XXX this is for recording purposes only. We *have* to install @@ -696,7 +696,7 @@ sub get_installer_type { ### saying 'no such dist type'; ### XXX duplicated from CPANPLUS::Selfupdate. fix somehow? my $href = $self->status->configure_requires || {}; - my $deps = { INSTALLER_BUILD, '0.24', %$href }; + my $deps = { INSTALLER_BUILD, '0.60', %$href }; $self->status->configure_requires( $deps ); diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm b/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm index e27f98b09c..654f48fc35 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm @@ -69,7 +69,7 @@ CPANPLUS::Selfupdate 'Parse::CPAN::Meta' => '1.4200', # config_requires support 'ExtUtils::Install' => '1.42', # uninstall outside @INC ( check_install( module => 'CPANPLUS::Dist::Build' ) - ? ( 'CPANPLUS::Dist::Build' => '0.24' ) : () ), + ? ( 'CPANPLUS::Dist::Build' => '0.60' ) : () ), }, features => { @@ -82,7 +82,7 @@ CPANPLUS::Selfupdate my $cb = shift; $cb->configure_object->get_conf('prefer_makefile') ? { } - : { 'CPANPLUS::Dist::Build' => '0.24' }; + : { 'CPANPLUS::Dist::Build' => '0.60' }; }, sub { return 1 }, # always enabled ], diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm index 2350615c21..ef9a927d45 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm @@ -26,7 +26,7 @@ local $Data::Dumper::Indent = 1; # for dumpering from ! BEGIN { use vars qw[ $VERSION @ISA ]; @ISA = qw[ CPANPLUS::Shell::_Base::ReadLine ]; - $VERSION = "0.9111"; + $VERSION = "0.9112"; } load CPANPLUS::Shell; -- cgit v1.2.1