Move Filter::Simple from lib to ext

diff --git a/MANIFEST b/MANIFEST
index 77aea81..e4d2ef8 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -733,6 +733,17 @@ ext/File-Glob/t/case.t             See if File::Glob works
 ext/File-Glob/t/global.t       See if File::Glob works
 ext/File-Glob/TODO             File::Glob extension todo list
 ext/File-Glob/t/taint.t                See if File::Glob works
+ext/Filter-Simple/Changes                              Filter::Simple
+ext/Filter-Simple/lib/Filter/Simple.pm                 Simple frontend to Filter::Util::Call
+ext/Filter-Simple/t/data.t                             See if Filter::Simple works
+ext/Filter-Simple/t/export.t                           See if Filter::Simple works
+ext/Filter-Simple/t/filter_only.t                      See if Filter::Simple works
+ext/Filter-Simple/t/filter.t                           See if Filter::Simple works
+ext/Filter-Simple/t/import.t                           See if Filter::Simple works
+ext/Filter-Simple/t/lib/Filter/Simple/ExportTest.pm    Helper file for Filter::Simple tests
+ext/Filter-Simple/t/lib/Filter/Simple/FilterOnlyTest.pm        Helper file for Filter::Simple tests
+ext/Filter-Simple/t/lib/Filter/Simple/FilterTest.pm    Helper file for Filter::Simple tests
+ext/Filter-Simple/t/lib/Filter/Simple/ImportTest.pm    Helper file for Filter::Simple tests
 ext/Filter-Util-Call/Call.pm   Filter::Util::Call extension module
 ext/Filter-Util-Call/Call.xs   Filter::Util::Call extension external subroutines
 ext/Filter-Util-Call/filter-util.pl            See if Filter::Util::Call works
@@ -2424,13 +2435,6 @@ lib/File/Temp/t/seekable.t       See if File::Temp works
 lib/File/Temp/t/tempfile.t     See if File::Temp works
 lib/filetest.pm                        For "use filetest"
 lib/filetest.t                 See if filetest works
-lib/Filter/Simple/Changes      Filter::Simple
-lib/Filter/Simple.pm           Simple frontend to Filter::Util::Call
-lib/Filter/Simple/t/data.t     See if Filter::Simple works
-lib/Filter/Simple/t/export.t   See if Filter::Simple works
-lib/Filter/Simple/t/filter_only.t      See if Filter::Simple works
-lib/Filter/Simple/t/filter.t   See if Filter::Simple works
-lib/Filter/Simple/t/import.t   See if Filter::Simple works
 lib/FindBin.pm                 Find name of currently executing program
 lib/FindBin.t                  See if FindBin works
 lib/finddepth.pl               A depth-first find emulator--used by find2perl
@@ -4048,10 +4052,6 @@ t/lib/feature/implicit           Tests for implicit loading of feature.pm
 t/lib/feature/nonesuch         Tests for enabling/disabling nonexistent feature
 t/lib/feature/say              Tests for enabling/disabling say feature
 t/lib/feature/switch           Tests for enabling/disabling switch feature
-t/lib/Filter/Simple/ExportTest.pm      Helper file for Filter::Simple tests
-t/lib/Filter/Simple/FilterOnlyTest.pm  Helper file for Filter::Simple tests
-t/lib/Filter/Simple/FilterTest.pm      Helper file for Filter::Simple tests
-t/lib/Filter/Simple/ImportTest.pm      Helper file for Filter::Simple tests
 t/lib/h2ph.h                   Test header file for h2ph
 t/lib/h2ph.pht                 Generated output from h2ph.h by h2ph, for comparison
 t/lib/locale/latin1            Part of locale.t in Latin 1

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index e9fa90b..15c994f 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -787,17 +787,10 @@ package Maintainers;
        {
        'MAINTAINER'    => 'smueller',
        'DISTRIBUTION'  => 'SMUELLER/Filter-Simple-0.84.tar.gz',
-       'FILES'         => q[lib/Filter/Simple.pm
-                            lib/Filter/Simple
-                            t/lib/Filter/Simple/
-                           ],
+       'FILES'         => q[ext/Filter-Simple],
        'EXCLUDED'      => [ qw(Makefile.PL MANIFEST README META.yml),
                             qr{^demo/}
                           ],
-       'MAP'           => { 't/lib/'   => 't/lib/',
-                            't/'       => 'lib/Filter/Simple/t/',
-                            'Changes'  => 'lib/Filter/Simple/Changes',
-                          },
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
        },

diff --git a/ext/.gitignore b/ext/.gitignore
index 7206d0a..ed4c8aa 100644 (file)
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -40,6 +40,7 @@ ppport.h
 /Shell/Makefile.PL
 /Term-ANSIColor/Makefile.PL
 /base/Makefile.PL
+/Filter-Simple/Makefile.PL
 
 # ignore all vim swap files but the one bundled in Module::Pluggable for testing
 *.swp

diff --git a/lib/Filter/Simple/Changes b/ext/Filter-Simple/Changes
similarity index 100%
rename from lib/Filter/Simple/Changes
rename to ext/Filter-Simple/Changes

diff --git a/lib/Filter/Simple.pm b/ext/Filter-Simple/lib/Filter/Simple.pm
similarity index 100%
rename from lib/Filter/Simple.pm
rename to ext/Filter-Simple/lib/Filter/Simple.pm

diff --git a/ext/Filter-Simple/t/data.t b/ext/Filter-Simple/t/data.t
new file mode 100644 (file)
index 0000000..0e67569
--- /dev/null
+++ b/ext/Filter-Simple/t/data.t
@@ -0,0 +1,16 @@
+BEGIN {
+    unshift @INC, 't/lib/';
+}
+
+use Filter::Simple::FilterOnlyTest qr/ok/ => "not ok", "bad" => "ok";
+print "1..6\n";
+
+print "bad 1\n";
+print "bad 2\n";
+print "bad 3\n";
+print  <DATA>;
+
+__DATA__
+ok 4
+ok 5
+ok 6

diff --git a/ext/Filter-Simple/t/export.t b/ext/Filter-Simple/t/export.t
new file mode 100644 (file)
index 0000000..0f4d9b1
--- /dev/null
+++ b/ext/Filter-Simple/t/export.t
@@ -0,0 +1,8 @@
+BEGIN {
+    unshift @INC, 't/lib/';
+}
+BEGIN { print "1..1\n" }
+
+use Filter::Simple::ExportTest 'ok';
+
+notok 1;

diff --git a/lib/Filter/Simple/t/filter.t b/ext/Filter-Simple/t/filter.t
similarity index 70%
rename from lib/Filter/Simple/t/filter.t
rename to ext/Filter-Simple/t/filter.t
index 75c54e7..bf35977 100644 (file)
--- a/lib/Filter/Simple/t/filter.t
+++ b/ext/Filter-Simple/t/filter.t
@@ -1,13 +1,6 @@
 BEGIN {
-    if( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ('../lib', 'lib');
-    }
-    else {
-        unshift @INC, 't/lib/';
-    }
+    unshift @INC, 't/lib/';
 }
-chdir 't';
 
 use Filter::Simple::FilterTest qr/not ok/ => "ok", fail => "ok";
 

diff --git a/lib/Filter/Simple/t/filter_only.t b/ext/Filter-Simple/t/filter_only.t
similarity index 78%
rename from lib/Filter/Simple/t/filter_only.t
rename to ext/Filter-Simple/t/filter_only.t
index 3ec855d..f30fced 100644 (file)
--- a/lib/Filter/Simple/t/filter_only.t
+++ b/ext/Filter-Simple/t/filter_only.t
@@ -1,13 +1,6 @@
 BEGIN {
-    if( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ('../lib', 'lib');
-    }
-    else {
-        unshift @INC, 't/lib/';
-    }
+    unshift @INC, 't/lib/';
 }
-chdir 't';
 
 use Filter::Simple::FilterOnlyTest qr/not ok/ => "ok", 
                                    "bad" => "ok", fail => "die";

diff --git a/ext/Filter-Simple/t/import.t b/ext/Filter-Simple/t/import.t
new file mode 100644 (file)
index 0000000..e5c6070
--- /dev/null
+++ b/ext/Filter-Simple/t/import.t
@@ -0,0 +1,9 @@
+BEGIN {
+    unshift @INC, 't/lib';
+}
+
+BEGIN { print "1..4\n" }
+
+use Filter::Simple::ImportTest (1..3);
+
+say "not ok 4\n";

diff --git a/t/lib/Filter/Simple/ExportTest.pm b/ext/Filter-Simple/t/lib/Filter/Simple/ExportTest.pm
similarity index 100%
rename from t/lib/Filter/Simple/ExportTest.pm
rename to ext/Filter-Simple/t/lib/Filter/Simple/ExportTest.pm

diff --git a/t/lib/Filter/Simple/FilterOnlyTest.pm b/ext/Filter-Simple/t/lib/Filter/Simple/FilterOnlyTest.pm
similarity index 100%
rename from t/lib/Filter/Simple/FilterOnlyTest.pm
rename to ext/Filter-Simple/t/lib/Filter/Simple/FilterOnlyTest.pm

diff --git a/t/lib/Filter/Simple/FilterTest.pm b/ext/Filter-Simple/t/lib/Filter/Simple/FilterTest.pm
similarity index 100%
rename from t/lib/Filter/Simple/FilterTest.pm
rename to ext/Filter-Simple/t/lib/Filter/Simple/FilterTest.pm

diff --git a/t/lib/Filter/Simple/ImportTest.pm b/ext/Filter-Simple/t/lib/Filter/Simple/ImportTest.pm
similarity index 100%
rename from t/lib/Filter/Simple/ImportTest.pm
rename to ext/Filter-Simple/t/lib/Filter/Simple/ImportTest.pm

diff --git a/lib/.gitignore b/lib/.gitignore
index 57cc638..4734363 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -22,6 +22,7 @@
 /Fcntl.pm
 /File/Glob.pm
 /File/GlobMapper.pm
+/Filter/Simple.pm
 /Filter/Util
 /GDBM_File.pm
 /Hash

diff --git a/lib/Filter/Simple/t/data.t b/lib/Filter/Simple/t/data.t
deleted file mode 100644 (file)
index aaf2dca..0000000
--- a/lib/Filter/Simple/t/data.t
+++ /dev/null
@@ -1,23 +0,0 @@
-BEGIN {
-    if( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ('../lib', 'lib');
-    }
-    else {
-        unshift @INC, 't/lib/';
-    }
-}
-chdir 't';
-
-use Filter::Simple::FilterOnlyTest qr/ok/ => "not ok", "bad" => "ok";
-print "1..6\n";
-
-print "bad 1\n";
-print "bad 2\n";
-print "bad 3\n";
-print  <DATA>;
-
-__DATA__
-ok 4
-ok 5
-ok 6

diff --git a/lib/Filter/Simple/t/export.t b/lib/Filter/Simple/t/export.t
deleted file mode 100644 (file)
index 5718442..0000000
--- a/lib/Filter/Simple/t/export.t
+++ /dev/null
@@ -1,16 +0,0 @@
-BEGIN {
-    if( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ('../lib', 'lib');
-    }
-    else {
-        unshift @INC, 't/lib/';
-    }
-}
-chdir 't';
-
-BEGIN { print "1..1\n" }
-
-use Filter::Simple::ExportTest 'ok';
-
-notok 1;

diff --git a/lib/Filter/Simple/t/import.t b/lib/Filter/Simple/t/import.t
deleted file mode 100644 (file)
index 755af74..0000000
--- a/lib/Filter/Simple/t/import.t
+++ /dev/null
@@ -1,17 +0,0 @@
-BEGIN {
-    if( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ('../lib', 'lib');
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
-}
-chdir 't';
-
-BEGIN { print "1..4\n" }
-
-use lib 'lib';
-use Filter::Simple::ImportTest (1..3);
-
-say "not ok 4\n";