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.

diff --git a/MANIFEST b/MANIFEST
index a8d2de7..a22e00d 100644 (file)
--- 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 (executable)
--- 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/ext/.gitignore b/ext/.gitignore
index 758d02b..1156a44 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/ext/Text-ParseWords/t/ParseWords.t
+++ b/lib/Text/ParseWords.t
@@ -1,5 +1,12 @@
 #!./perl\r
 \r
+BEGIN {\r
+    if( $ENV{PERL_CORE} ) {\r
+        chdir 't' if -d 't';\r
+        @INC = '../lib';\r
+    }\r
+}\r
+\r
 use warnings;\r
 use Text::ParseWords;\r
 use Test::More tests => 27;\r

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