From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 10 Sep 2009 09:10:24 +0000 (+0100)
Subject: Redo moving Text::ParseWords from lib to ext
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f1d72bc4f93301613aaebd1e84ca89818fe21f42;p=p5sagit%2Fp5-mst-13.2.git

Redo moving Text::ParseWords from lib to ext

This reverts commit 3fcda861606b23c12f4356df2a20543dc1c1779b, but adds
ext/Text-ParseWords to the list of directories that make_ext.pl should put
into $ENV{PERL5LIB}.

Conflicts:

	MANIFEST
---

diff --git a/MANIFEST b/MANIFEST
index 18d67a2..240189b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2060,6 +2060,9 @@ 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
@@ -3381,9 +3384,6 @@ 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/Thread.pm			Thread extensions frontend
 lib/Thread.t			Thread extensions frontend tests
 lib/Tie/Array.pm		Base class for tied arrays
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index eb62920..6309e4c 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1655,12 +1655,8 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'chorny',
 	'DISTRIBUTION'	=> 'CHORNY/Text-ParseWords-3.27.zip',
-	'FILES'		=> q[lib/Text/ParseWords{.pm,.t,}],
+	'FILES'		=> q[ext/Text-ParseWords],
 	'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 df7d738..76dda53 100644
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -64,6 +64,7 @@ ppport.h
 /Term-UI/Makefile.PL
 /Test-Harness/Makefile.PL
 /Text-Balanced/Makefile.PL
+/Text-ParseWords/Makefile.PL
 /Text-Soundex/Makefile.PL
 /Text-Tabs/Makefile.PL
 /Thread-Queue/Makefile.PL
diff --git a/lib/Text/ParseWords.pm b/ext/Text-ParseWords/ParseWords.pm
similarity index 100%
rename from lib/Text/ParseWords.pm
rename to ext/Text-ParseWords/ParseWords.pm
diff --git a/lib/Text/ParseWords.t b/ext/Text-ParseWords/t/ParseWords.t
similarity index 94%
rename from lib/Text/ParseWords.t
rename to ext/Text-ParseWords/t/ParseWords.t
index eeee6ee..905ea00 100644
--- a/lib/Text/ParseWords.t
+++ b/ext/Text-ParseWords/t/ParseWords.t
@@ -1,12 +1,5 @@
 #!./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/lib/Text/ParseWords/taint.t b/ext/Text-ParseWords/t/taint.t
similarity index 100%
rename from lib/Text/ParseWords/taint.t
rename to ext/Text-ParseWords/t/taint.t
diff --git a/lib/.gitignore b/lib/.gitignore
index 956f44b..7f50914 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -233,6 +233,7 @@
 /Term/UI/History.pm
 /Term/UI.pm
 /Text/Balanced.pm
+/Text/ParseWords.pm
 /Text/Soundex.pm
 /Text/Tabs.pm
 /Text/Wrap.pm
diff --git a/make_ext.pl b/make_ext.pl
index a9988ac..e475c4e 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -11,7 +11,8 @@ use Cwd;
 # After which, all nonxs modules are in lib, which was always sufficient to
 # allow miniperl to build everything else.
 
-my @toolchain = qw(ext/constant/lib ext/ExtUtils-Command/lib);
+my @toolchain = qw(ext/constant/lib ext/ExtUtils-Command/lib
+		   ext/Text-ParseWords);
 
 # This script acts as a simple interface for building extensions.