r65680 - in /branches/upstream/liblocal-lib-perl/current: Changes META.yml Makefile.PL lib/POD2/DE/local/lib.pod lib/POD2/PT_BR/local/lib.pod lib/local/lib.pm
carnil at users.alioth.debian.org
carnil at users.alioth.debian.org
Fri Dec 10 14:51:00 UTC 2010
Author: carnil
Date: Fri Dec 10 14:49:57 2010
New Revision: 65680
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=65680
Log:
[svn-upgrade] new version liblocal-lib-perl (1.007000)
Modified:
branches/upstream/liblocal-lib-perl/current/Changes
branches/upstream/liblocal-lib-perl/current/META.yml
branches/upstream/liblocal-lib-perl/current/Makefile.PL
branches/upstream/liblocal-lib-perl/current/lib/POD2/DE/local/lib.pod
branches/upstream/liblocal-lib-perl/current/lib/POD2/PT_BR/local/lib.pod
branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm
Modified: branches/upstream/liblocal-lib-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/Changes?rev=65680&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/Changes (original)
+++ branches/upstream/liblocal-lib-perl/current/Changes Fri Dec 10 14:49:57 2010
@@ -1,4 +1,13 @@
Revision history for local::lib
+
+1.007000 2010-12-09
+ - Chase the Module::Build version which supports PERL_MB_OPT. Thanks to
+ miyagawa for pointing this out.
+
+1.006009 2010-12-09
+
+ - Split up method guess_shelltype from parts of print_environment_vars_for
+ - Updated documentation about change of use with .modulebuildrc
1.006008 2010-11-17
Modified: branches/upstream/liblocal-lib-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/META.yml?rev=65680&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/META.yml (original)
+++ branches/upstream/liblocal-lib-perl/current/META.yml Fri Dec 10 14:49:57 2010
@@ -24,8 +24,8 @@
ExtUtils::Install: 1.43
ExtUtils::MakeMaker: 6.31
ExtUtils::ParseXS: 0
- Module::Build: 0.28
+ Module::Build: 0.36
perl: 5.8.1
resources:
license: http://dev.perl.org/licenses/
-version: 1.006008
+version: 1.007000
Modified: branches/upstream/liblocal-lib-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/Makefile.PL?rev=65680&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/Makefile.PL (original)
+++ branches/upstream/liblocal-lib-perl/current/Makefile.PL Fri Dec 10 14:49:57 2010
@@ -174,7 +174,7 @@
requires 'ExtUtils::Install' => '1.43'; # ditto
requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
requires 'ExtUtils::ParseXS';
-requires 'Module::Build' => '0.28'; # lib -> lib/perl5 change
+requires 'Module::Build' => '0.36'; # PERL_MB_OPT
my $required_CPAN = '1.82';
requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
Modified: branches/upstream/liblocal-lib-perl/current/lib/POD2/DE/local/lib.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/lib/POD2/DE/local/lib.pod?rev=65680&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/lib/POD2/DE/local/lib.pod (original)
+++ branches/upstream/liblocal-lib-perl/current/lib/POD2/DE/local/lib.pod Fri Dec 10 14:49:57 2010
@@ -23,10 +23,10 @@
# Gibt die Shell Kommandos aus um die Umgebung vorzubereiten
$ perl -Mlocal::lib
- export MODULEBUILDRC=/home/username/perl/.modulebuildrc
- export PERL_MM_OPT='INSTALL_BASE=/home/username/perl'
- export PERL5LIB='/home/username/perl/lib/perl5:/home/username/perl/lib/perl5/i386-linux'
- export PATH="/home/username/perl/bin:$PATH"
+ export PERL_MB_OPT='--install_base /home/username/perl5'
+ export PERL_MM_OPT='INSTALL_BASE=/home/username/perl5'
+ export PERL5LIB='/home/username/perl5/lib/perl5/i386-linux:/home/username/perl5/lib/perl5'
+ export PATH="/home/username/perl5/bin:$PATH"
=head2 Die Bootstrapping Methode
@@ -137,7 +137,7 @@
Sitzung mit C<CMD.EXE> zu setzen, kann man folgendes kommando nutzen:
C:\>perl -Mlocal::lib
- set MODULEBUILDRC=C:\DOCUME~1\ADMINI~1\perl5\.modulebuildrc
+ set PERL_MB_OPT=--install_base C:\DOCUME~1\ADMINI~1\perl5
set PERL_MM_OPT=INSTALL_BASE=C:\DOCUME~1\ADMINI~1\perl5
set PERL5LIB=C:\DOCUME~1\ADMINI~1\perl5\lib\perl5;C:\DOCUME~1\ADMINI~1\perl5\lib\perl5\MSWin32-x86-multi-thread
set PATH=C:\DOCUME~1\ADMINI~1\perl5\bin;%PATH%
@@ -202,7 +202,7 @@
=over 4
-=item MODULEBUILDRC
+=item PERL_MB_OPT
=item PERL_MM_OPT
@@ -319,19 +319,6 @@
Gibt den Pfad zurück, wo ausführbare Programme installiert werden, basierend
auf der Basis des angegebenen Pfad. Basierend auf L</install_base_perl_path>
Rückgabewert, hängt diese Methode noch C<bin> an.
-
-=head2 modulebuildrc_path
-
-=over 4
-
-=item Parameter: $pfad
-
-=item Rückgabewert: $modulebuildrc_pfad
-
-=back
-
-Gibt den Pfad zurück wo die C<.modulebuildrc> Datei angelegt wird, basierend
-auf der Basis des angegebenen Pfad.
=head2 resolve_empty_path
@@ -423,7 +410,7 @@
Bootstrap ist leider ein Hack, und wird auf jedenfall CPAN.pm benutzen für
ExtUtils::MakeMaker, auch wenn CPANPLUS installiert ist.
-Es setzt definitiv PERL5LIB, PERL_MM_OPT und MODULEBUILDRC neu und vernichtet
+Es setzt definitiv PERL5LIB, PERL_MM_OPT und PERL_MB_OPT neu und vernichtet
jeden Wert der vorher gesetzt war.
Es sollte vielleicht eine automatische Korrektur der CPAN Config machen, wenn
Modified: branches/upstream/liblocal-lib-perl/current/lib/POD2/PT_BR/local/lib.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/lib/POD2/PT_BR/local/lib.pod?rev=65680&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/lib/POD2/PT_BR/local/lib.pod (original)
+++ branches/upstream/liblocal-lib-perl/current/lib/POD2/PT_BR/local/lib.pod Fri Dec 10 14:49:57 2010
@@ -23,10 +23,10 @@
# Apenas exibe alguns comandos úteis para a shell
$ perl -Mlocal::lib
- export MODULEBUILDRC=/home/username/perl/.modulebuildrc
- export PERL_MM_OPT='INSTALL_BASE=/home/username/perl'
- export PERL5LIB='/home/username/perl/lib/perl5:/home/username/perl/lib/perl5/i386-linux'
- export PATH="/home/username/perl/bin:$PATH"
+ export PERL_MB_OPT='--install_base /home/username/perl5'
+ export PERL_MM_OPT='INSTALL_BASE=/home/username/perl5'
+ export PERL5LIB='/home/username/perl5/lib/perl5/i386-linux:/home/username/perl5/lib/perl5'
+ export PATH="/home/username/perl5/bin:$PATH"
=head2 A técnica de 'bootstrapping'
@@ -134,7 +134,7 @@
do C<CMD.exe>, você pode fazer assim:
C:\>perl -Mlocal::lib
- set MODULEBUILDRC=C:\DOCUME~1\ADMINI~1\perl5\.modulebuildrc
+ set PERL_MB_OPT=--install_base C:\DOCUME~1\ADMINI~1\perl5
set PERL_MM_OPT=INSTALL_BASE=C:\DOCUME~1\ADMINI~1\perl5
set PERL5LIB=C:\DOCUME~1\ADMINI~1\perl5\lib\perl5;C:\DOCUME~1\ADMINI~1\perl5\lib\perl5\MSWin32-x86-multi-thread
set PATH=C:\DOCUME~1\ADMINI~1\perl5\bin;%PATH%
@@ -194,7 +194,7 @@
=over 4
-=item MODULEBUILDRC
+=item PERL_MB_OPT
=item PERL_MM_OPT
@@ -311,19 +311,6 @@
Retorna um caminho de diretório indicando onde instalar programas executáveis
para essa instalação local de bibliotecas. Baseia-se no valor de retorno do
método L</install_base_perl_path>, adicionando o diretório C<bin>.
-
-=head2 modulebuildrc_path
-
-=over 4
-
-=item Argumentos: $caminho_do_diretorio
-
-=item Valor de Retorno: $caminho_para_modulebuildrc
-
-=back
-
-Retorna um caminho de diretório indicando onde instalar o arquivo
-C<.modulebuildrc>, baseado no caminho fornecido.
=head2 resolve_empty_path
@@ -413,7 +400,7 @@
mesmo que você tenha o CPANPLUS instalado.
Destrói qualquer valor pré-existente nas variáveis de ambiente PERL5LIB,
-PERL_MM_OPT e MODULEBUILDRC.
+PERL_MM_OPT e PERL_MB_OPT.
Provavelmente deveria auto-configurar o CPAN caso isso ainda não tenha
sido feito.
Modified: branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm?rev=65680&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm (original)
+++ branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm Fri Dec 10 14:49:57 2010
@@ -11,7 +11,7 @@
use Carp ();
use Config;
-our $VERSION = '1.006008'; # 1.6.8
+our $VERSION = '1.007000'; # 1.7.0
our @KNOWN_FLAGS = qw(--self-contained);
@@ -230,16 +230,7 @@
sub INTERPOLATE_ENV () { 1 }
sub LITERAL_ENV () { 0 }
-sub print_environment_vars_for {
- my ($class, $path) = @_;
- my @envs = $class->build_environment_vars_for($path, LITERAL_ENV);
- my $out = '';
-
- # rather basic csh detection, goes on the assumption that something won't
- # call itself csh unless it really is. also, default to bourne in the
- # pathological situation where a user doesn't have $ENV{SHELL} defined.
- # note also that shells with funny names, like zoid, are assumed to be
- # bourne.
+sub guess_shelltype {
my $shellbin = 'sh';
if(defined $ENV{'SHELL'}) {
my @shell_bin_path_parts = File::Spec->splitpath($ENV{'SHELL'});
@@ -271,6 +262,21 @@
}
};
}
+ return $shelltype;
+}
+
+sub print_environment_vars_for {
+ my ($class, $path) = @_;
+ my @envs = $class->build_environment_vars_for($path, LITERAL_ENV);
+ my $out = '';
+
+ # rather basic csh detection, goes on the assumption that something won't
+ # call itself csh unless it really is. also, default to bourne in the
+ # pathological situation where a user doesn't have $ENV{SHELL} defined.
+ # note also that shells with funny names, like zoid, are assumed to be
+ # bourne.
+
+ my $shelltype = $class->guess_shelltype;
while (@envs) {
my ($name, $value) = (shift(@envs), shift(@envs));
@@ -368,9 +374,9 @@
# Just print out useful shell commands
$ perl -Mlocal::lib
export PERL_MB_OPT='--install_base /home/username/perl5'
- export PERL_MM_OPT='INSTALL_BASE=/home/username/perl'
- export PERL5LIB='/home/username/perl/lib/perl5:/home/username/perl/lib/perl5/i386-linux'
- export PATH="/home/username/perl/bin:$PATH"
+ export PERL_MM_OPT='INSTALL_BASE=/home/username/perl5'
+ export PERL5LIB='/home/username/perl5/lib/perl5/i386-linux:/home/username/perl5/lib/perl5'
+ export PATH="/home/username/perl5/bin:$PATH"
=head2 The bootstrapping technique
More information about the Pkg-perl-cvs-commits
mailing list