Front page | perl.perl5.changes |
Postings from August 2009
[perl.git] branch blead, updated. GitLive-blead-2039-g25a883e
From:
Nicholas Clark
Date:
August 31, 2009 14:32
Subject:
[perl.git] branch blead, updated. GitLive-blead-2039-g25a883e
Message ID:
E1MiEUH-0000O6-CG@camel.booking.com
In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/25a883e141ef5022e3a9afb466f7bc525d011947?hp=10c2b2bb1bed28f54450876b0419c34d91d8586f>
- Log -----------------------------------------------------------------
commit 25a883e141ef5022e3a9afb466f7bc525d011947
Author: Nicholas Clark <nick@ccl4.org>
Date: Mon Aug 31 21:46:48 2009 +0100
Anchor a regexp, else paths including /Text/ are mistaken for tests in ext/
M TestInit.pm
commit 3fcda861606b23c12f4356df2a20543dc1c1779b
Author: Nicholas Clark <nick@ccl4.org>
Date: Mon Aug 31 21:36:21 2009 +0100
Revert "Move Text::ParseWords from lib to ext"
(ExtUtils::Liblist::Kid::_win32_ext() requires Text::ParseWords, so it can't
live in ext until we solve the general problem of toolchain modules in ext)
This reverts the structural changes of commit
d6052a374138e04d8688ae89baeabff82e80a71c, but retains the boilerplate removal of
4a503f371e8f1d4e174172c023c18046ee5b1a22, as TestInit.pm renders it obsolete.
M MANIFEST
M Porting/Maintainers.pl
M ext/.gitignore
D ext/Text-ParseWords/ParseWords.pm
D ext/Text-ParseWords/t/ParseWords.t
D ext/Text-ParseWords/t/taint.t
M lib/.gitignore
A lib/Text/ParseWords.pm
A lib/Text/ParseWords.t
A lib/Text/ParseWords/taint.t
-----------------------------------------------------------------------
Summary of changes:
MANIFEST | 6 +++---
Porting/Maintainers.pl | 6 +++++-
TestInit.pm | 2 +-
ext/.gitignore | 1 -
lib/.gitignore | 1 -
{ext/Text-ParseWords => lib/Text}/ParseWords.pm | 0
{ext/Text-ParseWords/t => lib/Text}/ParseWords.t | 7 +++++++
.../t => lib/Text/ParseWords}/taint.t | 0
8 files changed, 16 insertions(+), 7 deletions(-)
rename {ext/Text-ParseWords => lib/Text}/ParseWords.pm (100%)
rename {ext/Text-ParseWords/t => lib/Text}/ParseWords.t (94%)
rename {ext/Text-ParseWords/t => lib/Text/ParseWords}/taint.t (100%)
diff --git a/MANIFEST b/MANIFEST
index a8d2de7..a22e00d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1570,9 +1570,6 @@ ext/Text-Balanced/t/06_extqlk.t See if Text::Balanced works
ext/Text-Balanced/t/07_exttag.t See if Text::Balanced works
ext/Text-Balanced/t/08_extvar.t See if Text::Balanced works
ext/Text-Balanced/t/09_gentag.t See if Text::Balanced works
-ext/Text-ParseWords/ParseWords.pm Perl module to split words on arbitrary delimiter
-ext/Text-ParseWords/t/ParseWords.t See if Text::ParseWords works
-ext/Text-ParseWords/t/taint.t See if Text::ParseWords works with tainting
ext/Text-Soundex/Changes Changelog for Text::Soundex
ext/Text-Soundex/README README for Text::Soundex
ext/Text-Soundex/Soundex.pm Text::Soundex extension Perl module
@@ -3308,6 +3305,9 @@ lib/Test/t/todo.t See if Test works
lib/Test/Tutorial.pod A tutorial on writing tests
lib/Text/Abbrev.pm An abbreviation table builder
lib/Text/Abbrev.t Test Text::Abbrev
+lib/Text/ParseWords.pm Perl module to split words on arbitrary delimiter
+lib/Text/ParseWords.t See if Text::ParseWords works
+lib/Text/ParseWords/taint.t See if Text::ParseWords works with tainting
lib/Text/Tabs.pm Do expand and unexpand
lib/Text/TabsWrap/CHANGELOG ChangeLog for Tabs+Wrap
lib/Text/TabsWrap/t/37000.t See if Text::Tabs is working
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index a2f5bcc..1d13d48 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1725,8 +1725,12 @@ package Maintainers;
{
'MAINTAINER' => 'chorny',
'DISTRIBUTION' => 'CHORNY/Text-ParseWords-3.27.zip',
- 'FILES' => q[ext/Text-ParseWords],
+ 'FILES' => q[lib/Text/ParseWords{.pm,.t,}],
'EXCLUDED' => [ qw( t/pod.t ) ],
+ 'MAP' => { '' => 'lib/Text/',
+ 't/ParseWords.t' => 'lib/Text/ParseWords.t',
+ 't/taint.t' => 'lib/Text/ParseWords/taint.t',
+ },
'CPAN' => 1,
'UPSTREAM' => undef,
},
diff --git a/TestInit.pm b/TestInit.pm
index c626965..73bd8cf 100644
--- a/TestInit.pm
+++ b/TestInit.pm
@@ -59,7 +59,7 @@ if (-f 't/TEST' && -f 'MANIFEST' && -d 'lib' && -d 'ext') {
# We're being run from the top level. Try to change directory, and set
# things up correctly. This is a 90% solution, but for hand-running tests,
# that's good enough
- if ($0 =~ s!(ext[\\/][^\\/]+)[\//](.*\.t)$!$2!) {
+ if ($0 =~ s!^(ext[\\/][^\\/]+)[\//](.*\.t)$!$2!) {
# Looks like a test in ext.
chdir $1 or die "Can't chdir '$1': $!";
new_inc(@up_2_t);
diff --git a/ext/.gitignore b/ext/.gitignore
index 758d02b..1156a44 100644
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -40,7 +40,6 @@ ppport.h
/Term-UI/Makefile.PL
/Test-Harness/Makefile.PL
/Text-Balanced/Makefile.PL
-/Text-ParseWords/Makefile.PL
/Text-Soundex/Makefile.PL
/Thread-Queue/Makefile.PL
/Thread-Semaphore/Makefile.PL
diff --git a/lib/.gitignore b/lib/.gitignore
index 383b666..aa57ade 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -81,7 +81,6 @@
/Term/UI/History.pm
/Term/UI.pm
/Text/Balanced.pm
-/Text/ParseWords.pm
/Text/Soundex.pm
/Thread
/Time/HiRes.pm
diff --git a/ext/Text-ParseWords/ParseWords.pm b/lib/Text/ParseWords.pm
similarity index 100%
rename from ext/Text-ParseWords/ParseWords.pm
rename to lib/Text/ParseWords.pm
diff --git a/ext/Text-ParseWords/t/ParseWords.t b/lib/Text/ParseWords.t
similarity index 94%
rename from ext/Text-ParseWords/t/ParseWords.t
rename to lib/Text/ParseWords.t
index 905ea00..eeee6ee 100644
--- a/ext/Text-ParseWords/t/ParseWords.t
+++ b/lib/Text/ParseWords.t
@@ -1,5 +1,12 @@
#!./perl
+BEGIN {
+ if( $ENV{PERL_CORE} ) {
+ chdir 't' if -d 't';
+ @INC = '../lib';
+ }
+}
+
use warnings;
use Text::ParseWords;
use Test::More tests => 27;
diff --git a/ext/Text-ParseWords/t/taint.t b/lib/Text/ParseWords/taint.t
similarity index 100%
rename from ext/Text-ParseWords/t/taint.t
rename to lib/Text/ParseWords/taint.t
--
Perl5 Master Repository
-
[perl.git] branch blead, updated. GitLive-blead-2039-g25a883e
by Nicholas Clark