In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/41e13b7c97391e529c57ed40083c910e3b9f3951?hp=4206729ba3c39e440203a8ac3ecda62348881cf3>
- Log ----------------------------------------------------------------- commit 41e13b7c97391e529c57ed40083c910e3b9f3951 Author: Florian Ragwitz <[email protected]> Date: Fri Dec 10 22:02:52 2010 +0100 Dual-life Env ----------------------------------------------------------------------- Summary of changes: MANIFEST | 6 +++--- Porting/Maintainers.pl | 10 ++++++++-- {lib => dist/Env/lib}/Env.pm | 0 {lib => dist}/Env/t/array.t | 5 ----- {lib => dist}/Env/t/env.t | 5 ----- lib/.gitignore | 1 + 6 files changed, 12 insertions(+), 15 deletions(-) rename {lib => dist/Env/lib}/Env.pm (100%) rename {lib => dist}/Env/t/array.t (80%) rename {lib => dist}/Env/t/env.t (96%) diff --git a/MANIFEST b/MANIFEST index 082ddb6..c73dfd6 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2704,6 +2704,9 @@ dist/Data-Dumper/t/perl-74170.t Regression test for stack reallocation dist/Data-Dumper/t/terse.t See if Data::Dumper terse option works dist/Devel-SelfStubber/lib/Devel/SelfStubber.pm Generate stubs for SelfLoader.pm dist/Devel-SelfStubber/t/Devel-SelfStubber.t See if Devel::SelfStubber works +dist/Env/lib/Env.pm Map environment into ordinary variables +dist/Env/t/array.t See if Env works for arrays +dist/Env/t/env.t See if Env works dist/ExtUtils-Command/lib/ExtUtils/Command.pm Utilities for Make on non-UNIX platforms dist/ExtUtils-Command/t/cp.t See if ExtUtils::Command works dist/ExtUtils-Command/t/eu_command.t See if ExtUtils::Command works @@ -3682,9 +3685,6 @@ lib/dumpvar.pl A variable dumper lib/dumpvar.t A variable dumper tester lib/English.pm Readable aliases for short variables lib/English.t See if English works -lib/Env.pm Map environment into ordinary variables -lib/Env/t/array.t See if Env works for arrays -lib/Env/t/env.t See if Env works lib/exceptions.pl catch and throw routines lib/Exporter/Heavy.pm Complicated routines for Exporter lib/Exporter.pm Exporter base class diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 3228cc4..1cdd96d 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -517,6 +517,14 @@ use File::Glob qw(:case); 'UPSTREAM' => undef, }, + 'Env' => + { + 'MAINTAINER' => 'p5p', + 'DISTRIBUTION' => 'FLORA/Env-1.01.tar.gz', + 'FILES' => q[dist/Env], + 'UPSTREAM' => 'blead', + }, + 'Exporter' => { 'MAINTAINER' => 'ferreira', @@ -1703,8 +1711,6 @@ use File::Glob qw(:case); lib/DirHandle.{pm,t} lib/Dumpvalue.{pm,t} lib/English.{pm,t} - lib/Env.pm - lib/Env/t/ lib/ExtUtils/Embed.pm lib/ExtUtils/XSSymSet.pm lib/ExtUtils/t/Embed.t diff --git a/lib/Env.pm b/dist/Env/lib/Env.pm similarity index 100% rename from lib/Env.pm rename to dist/Env/lib/Env.pm diff --git a/lib/Env/t/array.t b/dist/Env/t/array.t similarity index 80% rename from lib/Env/t/array.t rename to dist/Env/t/array.t index ff6af2e..ed84834 100644 --- a/lib/Env/t/array.t +++ b/dist/Env/t/array.t @@ -1,11 +1,6 @@ #!./perl BEGIN { - chdir 't' if -d 't'; - @INC = '../lib'; -} - -BEGIN { $ENV{FOO} = "foo"; $ENV{BAR} = "bar"; } diff --git a/lib/Env/t/env.t b/dist/Env/t/env.t similarity index 96% rename from lib/Env/t/env.t rename to dist/Env/t/env.t index c5068fd..8881202 100644 --- a/lib/Env/t/env.t +++ b/dist/Env/t/env.t @@ -2,11 +2,6 @@ $| = 1; -BEGIN { - chdir 't' if -d 't'; - @INC = '../lib'; -} - if ($^O eq 'VMS') { print "1..11\n"; foreach (1..11) { print "ok $_ # skipped for VMS\n"; } diff --git a/lib/.gitignore b/lib/.gitignore index 7f45114..6af1056 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -126,6 +126,7 @@ /DynaLoader.pm /Encode /Encode.pm +/Env.pm /Errno.pm /ExtUtils/CBuilder.pm /ExtUtils/CBuilder/ -- Perl5 Master Repository
