From: Chris 'BinGOs' Williams Date: Mon, 27 Apr 2009 16:13:04 +0000 (+0200) Subject: Update CPANPLUS::Dist::Build to version 0.24 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=39a48622bc305354a2fe04d676bbcf726e63ca25;p=p5sagit%2Fp5-mst-13.2.git Update CPANPLUS::Dist::Build to version 0.24 This fixes an integration issue with the latest CPANPLUS (0.86). --- diff --git a/lib/CPANPLUS/Dist/Build.pm b/lib/CPANPLUS/Dist/Build.pm index 11a8d56..714ef79 100644 --- a/lib/CPANPLUS/Dist/Build.pm +++ b/lib/CPANPLUS/Dist/Build.pm @@ -5,7 +5,6 @@ use warnings; use vars qw[@ISA $STATUS $VERSION]; @ISA = qw[CPANPLUS::Dist]; -use CPANPLUS::inc; use CPANPLUS::Internals::Constants; ### these constants were exported by CPANPLUS::Internals::Constants @@ -31,7 +30,7 @@ use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext'; local $Params::Check::VERBOSE = 1; -$VERSION = '0.22'; +$VERSION = '0.24'; =pod @@ -264,7 +263,7 @@ sub prepare { ### to reset the @INC #local $ENV{PERL5OPT} = CPANPLUS::inc->original_perl5opt; #local $ENV{PERL5LIB} = CPANPLUS::inc->original_perl5lib; - local @INC = CPANPLUS::inc->original_inc; + #local @INC = CPANPLUS::inc->original_inc; ### this will generate warnings under anything lower than M::B 0.2606 my @buildflags = $dist->_buildflags_as_list( $buildflags ); @@ -535,7 +534,7 @@ sub create { ### to reset the @INC #local $ENV{PERL5OPT} = CPANPLUS::inc->original_perl5opt; #local $ENV{PERL5LIB} = CPANPLUS::inc->original_perl5lib; - local @INC = CPANPLUS::inc->original_inc; + #local @INC = CPANPLUS::inc->original_inc; ### but do it *before* the new_from_context, as M::B seems ### to be actually running the file... diff --git a/lib/CPANPLUS/Dist/Build/Constants.pm b/lib/CPANPLUS/Dist/Build/Constants.pm index 6fc9534..2a60438 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.22'; + $VERSION = '0.24'; @ISA = qw[Exporter]; @EXPORT = qw[ BUILD_DIR BUILD ]; }