summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlperl/lib/CPANPLUS/Dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-21 00:15:27 +0000
committerKarl Berry <karl@freefriends.org>2012-05-21 00:15:27 +0000
commita4c42bfb2337d37da89d789cb8cc226367994e32 (patch)
treec3eabdef5d565a4e515d2be0d9d4d0540bde0250 /Master/tlpkg/tlperl/lib/CPANPLUS/Dist
parent8274475057f024d35332ac47c2e2f23ea156e6ed (diff)
perl 5.14.2 from siep
git-svn-id: svn://tug.org/texlive/trunk@26525 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlperl/lib/CPANPLUS/Dist')
-rw-r--r--Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Autobundle.pm2
-rw-r--r--Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Base.pm8
-rw-r--r--Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm24
-rw-r--r--Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build/Constants.pm2
-rw-r--r--Master/tlpkg/tlperl/lib/CPANPLUS/Dist/MM.pm20
5 files changed, 32 insertions, 24 deletions
diff --git a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Autobundle.pm b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Autobundle.pm
index 16638b258f8..9561dd9f325 100644
--- a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Autobundle.pm
+++ b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Autobundle.pm
@@ -16,7 +16,7 @@ CPANPLUS::Dist::Autobundle
$modobj = $cb->parse_module( module => 'file://path/to/Snapshot_XXYY.pm' );
$modobj->install;
-
+
=head1 DESCRIPTION
C<CPANPLUS::Dist::Autobundle> is a distribution class for installing installation
diff --git a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Base.pm b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Base.pm
index c7108ed1392..904ab172266 100644
--- a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Base.pm
+++ b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Base.pm
@@ -97,14 +97,14 @@ For example, you might want to add extra accessors to the C<status>
object, which you might do as follows:
$dist->status->mk_accessors( qw[my_implementation_accessor] );
-
+
The C<status> object is implemented as an instance of the
C<Object::Accessor> class. Please refer to its documentation for
details.
-
-Return true if the initialization was successul, and false if it was
+
+Return true if the initialization was successful, and false if it was
not.
-
+
The C<CPANPLUS::Dist::Base> implementation does not alter your object
and always returns true.
diff --git a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm
index 0f27639cda5..164bcb0a9ec 100644
--- a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm
+++ b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build.pm
@@ -30,7 +30,7 @@ use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext';
local $Params::Check::VERBOSE = 1;
-$VERSION = '0.46';
+$VERSION = '0.54';
=pod
@@ -98,7 +98,7 @@ BOOL indicating if the C<Build test> command was successful.
=item C<prepared ()>
-BOOL indicating if the C<prepare> call exited succesfully
+BOOL indicating if the C<prepare> call exited successfully
This gets set after C<perl Build.PL>
=item C<distdir ()>
@@ -108,7 +108,7 @@ set after a call to C<prepare>.
=item C<created ()>
-BOOL indicating if the C<create> call exited succesfully. This gets
+BOOL indicating if the C<create> call exited successfully. This gets
set after C<Build> and C<Build test>.
=item C<installed ()>
@@ -145,8 +145,8 @@ to create and install modules in your environment.
### check if the format is available ###
sub format_available {
- my $mod = "Module::Build";
- unless( can_load( modules => { $mod => '0.2611' } ) ) {
+ my $mod = 'Module::Build';
+ unless( can_load( modules => { $mod => '0.2611' }, nocache => 1 ) ) {
error( loc( "You do not have '%1' -- '%2' not available",
$mod, __PACKAGE__ ) );
return;
@@ -192,7 +192,7 @@ The variable C<PERL5_CPANPLUS_IS_EXECUTING> will be set to the full path
of the C<Build.PL> that is being executed. This enables any code inside
the C<Build.PL> to know that it is being installed via CPANPLUS.
-After a succcesfull C<prepare> you may call C<create> to create the
+After a successful C<prepare> you may call C<create> to create the
distribution, followed by C<install> to actually install it.
Returns true on success and false on failure.
@@ -275,9 +275,9 @@ sub prepare {
### we resolve 'configure requires' here, so we can run the 'perl
### Makefile.PL' command
### XXX for tests: mock f_c_r to something that *can* resolve and
- ### something that *doesnt* resolve. Check the error log for ok
+ ### something that *doesn't* resolve. Check the error log for ok
### on this step or failure
- ### XXX make a seperate tarball to test for this scenario: simply
+ ### XXX make a separate tarball to test for this scenario: simply
### containing a makefile.pl/build.pl for test purposes?
my $safe_ver = version->new('0.85_01');
if ( version->new($CPANPLUS::Internals::VERSION) >= $safe_ver )
@@ -426,8 +426,12 @@ sub _find_prereqs {
$prereqs->{$_} = $bphash->{$type}->{$_} for keys %{ $bphash->{$type} };
}
}
- # Temporary fix
- delete $prereqs->{'perl'};
+
+ {
+ delete $prereqs->{'perl'}
+ unless version->new($CPANPLUS::Internals::VERSION)
+ >= version->new('0.9102');
+ }
### allows for a user defined callback to filter the prerequisite
### list as they see fit, to remove (or add) any prereqs they see
diff --git a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build/Constants.pm b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build/Constants.pm
index 1ac02108e44..ba1ca8665c0 100644
--- a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build/Constants.pm
+++ b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/Build/Constants.pm
@@ -9,7 +9,7 @@ BEGIN {
require Exporter;
use vars qw[$VERSION @ISA @EXPORT];
- $VERSION = '0.46';
+ $VERSION = '0.54';
@ISA = qw[Exporter];
@EXPORT = qw[ BUILD_DIR BUILD ];
}
diff --git a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/MM.pm b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/MM.pm
index be65cd43cc8..b2205e46f0b 100644
--- a/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/MM.pm
+++ b/Master/tlpkg/tlperl/lib/CPANPLUS/Dist/MM.pm
@@ -32,7 +32,7 @@ CPANPLUS::Dist::MM
$mm->create; # runs make && make test
$mm->install; # runs make install
-
+
=head1 DESCRIPTION
C<CPANPLUS::Dist::MM> is a distribution class for MakeMaker related
@@ -78,7 +78,7 @@ successful.
=item prepared ()
-BOOL indicating if the C<prepare> call exited succesfully
+BOOL indicating if the C<prepare> call exited successfully
This gets set after C<perl Makefile.PL>
=item distdir ()
@@ -88,7 +88,7 @@ set after a call to C<prepare>.
=item created ()
-BOOL indicating if the C<create> call exited succesfully. This gets
+BOOL indicating if the C<create> call exited successfully. This gets
set after C<make> and C<make test>.
=item installed ()
@@ -154,7 +154,9 @@ sub format_available {
return 1;
}
-=pod $bool = $dist->init();
+=pod
+
+=head2 $bool = $dist->init();
Sets up the C<CPANPLUS::Dist::MM> object for use.
Effectively creates all the needed status accessors.
@@ -174,7 +176,9 @@ sub init {
return 1;
}
-=pod $bool = $dist->prepare([perl => '/path/to/perl', makemakerflags => 'EXTRA=FLAGS', force => BOOL, verbose => BOOL])
+=pod
+
+=head2 $bool = $dist->prepare([perl => '/path/to/perl', makemakerflags => 'EXTRA=FLAGS', force => BOOL, verbose => BOOL])
C<prepare> preps a distribution for installation. This means it will
run C<perl Makefile.PL> and determine what prerequisites this distribution
@@ -258,9 +262,9 @@ sub prepare {
### we resolve 'configure requires' here, so we can run the 'perl
### Makefile.PL' command
### XXX for tests: mock f_c_r to something that *can* resolve and
- ### something that *doesnt* resolve. Check the error log for ok
+ ### something that *doesn't* resolve. Check the error log for ok
### on this step or failure
- ### XXX make a seperate tarball to test for this scenario: simply
+ ### XXX make a separate tarball to test for this scenario: simply
### containing a makefile.pl/build.pl for test purposes?
{ my $configure_requires = $dist->find_configure_requires;
my $ok = $dist->_resolve_prereqs(
@@ -694,7 +698,7 @@ sub create {
$dist->status->test(1);
} else {
- error( loc( "MAKE TEST failed: %1 %2", $!, $captured ) );
+ error( loc( "MAKE TEST failed: %1", $captured ) );
### send out error report here? or do so at a higher level?
### --higher level --kane.