Move Switch from lib to ext.

diff --git a/MANIFEST b/MANIFEST
index 9c7e9cd..0c20ae4 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1257,6 +1257,10 @@ ext/Storable/t/tied.t            See if Storable works
 ext/Storable/t/utf8hash.t      See if Storable works
 ext/Storable/t/utf8.t          See if Storable works
 ext/Storable/t/weak.t          Can Storable store weakrefs
+ext/Switch/Switch.pm           Switch for Perl
+ext/Switch/t/given.t           See if Perl 6 given (switch) works
+ext/Switch/t/nested.t          See if nested switch works
+ext/Switch/t/switch.t          See if Perl 5 switch works
 ext/Sys-Hostname/Hostname.pm   Sys::Hostname extension Perl module
 ext/Sys-Hostname/Hostname.xs   Sys::Hostname extension external subroutines
 ext/Sys-Hostname/t/Hostname.t  See if Sys::Hostname works
@@ -3119,10 +3123,6 @@ lib/strict.pm                    For "use strict"
 lib/strict.t                   See if strictures work
 lib/subs.pm                    Declare overriding subs
 lib/subs.t                     See if subroutine pseudo-importation works
-lib/Switch.pm                  Switch for Perl
-lib/Switch/t/given.t           See if Perl 6 given (switch) works
-lib/Switch/t/nested.t          See if nested switch works
-lib/Switch/t/switch.t          See if Perl 5 switch works
 lib/Symbol.pm                  Symbol table manipulation routines
 lib/Symbol.t                   See if Symbol works
 lib/syslog.pl                  Perl library supporting syslogging

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 72b72d3..8b2e4b5 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1620,10 +1620,7 @@ package Maintainers;
        {
        'MAINTAINER'    => 'rgarcia',
        'DISTRIBUTION'  => 'RGARCIA/Switch-2.14.tar.gz',
-       'FILES'         => q[lib/Switch.pm lib/Switch],
-       'MAP'           => { ''  => 'lib/',
-                            't/'=> 'lib/Switch/t/',
-                          },
+       'FILES'         => q[ext/Switch],
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",
        },

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

diff --git a/lib/Switch/t/given.t b/ext/Switch/t/given.t
similarity index 98%
rename from lib/Switch/t/given.t
rename to ext/Switch/t/given.t
index c396c35..2b56151 100644 (file)
--- a/lib/Switch/t/given.t
+++ b/ext/Switch/t/given.t
@@ -1,10 +1,3 @@
-BEGIN {
-    if ($ENV{PERL_CORE}) {
-        chdir('t') if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 use Carp;
 use Switch qw(Perl6 __ fallthrough);
 

diff --git a/lib/Switch/t/nested.t b/ext/Switch/t/nested.t
similarity index 79%
rename from lib/Switch/t/nested.t
rename to ext/Switch/t/nested.t
index e7e520a..d10dff2 100644 (file)
--- a/lib/Switch/t/nested.t
+++ b/ext/Switch/t/nested.t
@@ -1,10 +1,3 @@
-BEGIN {
-    if ($ENV{PERL_CORE}) {
-        chdir('t') if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 use Switch;
 
 print "1..4\n";

diff --git a/lib/Switch/t/switch.t b/ext/Switch/t/switch.t
similarity index 98%
rename from lib/Switch/t/switch.t
rename to ext/Switch/t/switch.t
index ad0f958..280dcb2 100644 (file)
--- a/lib/Switch/t/switch.t
+++ b/ext/Switch/t/switch.t
@@ -1,10 +1,3 @@
-BEGIN {
-    if ($ENV{PERL_CORE}) {
-        chdir('t') if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 use Carp;
 use Switch qw(__ fallthrough);