Move base from lib to ext

diff --git a/MANIFEST b/MANIFEST
index 51e3ff8..2b502f3 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -81,6 +81,21 @@ ext/Attribute-Handlers/t/linerep.t   See if Attribute::Handlers works
 ext/Attribute-Handlers/t/multi.t       See if Attribute::Handlers works
 ext/attributes/attributes.pm           For "sub foo : attrlist"
 ext/attributes/attributes.xs           For "sub foo : attrlist"
+ext/base/Changes               base.pm changelog
+ext/base/lib/base.pm           Establish IS-A relationship at compile time
+ext/base/lib/fields.pm         Set up object field names for pseudo-hash-using classes
+ext/base/t/base.t              See if base works
+ext/base/t/compile-time.t      See if base works
+ext/base/t/fields-5.6.0.t      See if fields work
+ext/base/t/fields-5.8.0.t      See if fields work
+ext/base/t/fields-base.t       See if fields work
+ext/base/t/fields.t            See if fields work
+ext/base/t/isa.t               See if base's behaviour doesn't change
+ext/base/t/lib/Dummy.pm                Test module for base.pm
+ext/base/t/lib/HasSigDie.pm    Module for testing base.pm
+ext/base/t/sigdie.t            See if base works with SIGDIE
+ext/base/t/version.t           See if base works with versions
+ext/base/t/warnings.t          See if base works with warnings
 ext/B/B/Concise.pm     Compiler Concise backend
 ext/B/B.pm             Compiler backend support functions and methods
 ext/B/B/Showlex.pm     Compiler Showlex backend
@@ -1897,20 +1912,6 @@ lib/AutoLoader/t/02AutoSplit.t   See if AutoSplit works
 lib/AutoSplit.pm               Split up autoload functions
 lib/autouse.pm                 Load and call a function only when it's used
 lib/autouse.t                  See if autouse works
-lib/base/Changes               base.pm changelog
-lib/base.pm                    Establish IS-A relationship at compile time
-lib/base/t/base.t              See if base works
-lib/base/t/compile-time.t      See if base works
-lib/base/t/fields-5.6.0.t      See if fields work
-lib/base/t/fields-5.8.0.t      See if fields work
-lib/base/t/fields-base.t       See if fields work
-lib/base/t/fields.t            See if fields work
-lib/base/t/isa.t               See if base's behaviour doesn't change
-lib/base/t/lib/Dummy.pm                Test module for base.pm
-lib/base/t/lib/HasSigDie.pm    Module for testing base.pm
-lib/base/t/sigdie.t            See if base works with SIGDIE
-lib/base/t/version.t           See if base works with versions
-lib/base/t/warnings.t          See if base works with warnings
 lib/Benchmark.pm               Measure execution time
 lib/Benchmark.t                        See if Benchmark works
 lib/bigfloat.pl                        An arbitrary precision floating point package
@@ -2356,7 +2357,6 @@ lib/fastcwd.pl                    a faster but more dangerous getcwd
 lib/Fatal.pm                   Make errors in functions/builtins fatal
 lib/feature.pm                 Pragma to enable new syntax
 lib/feature.t                  See if features work
-lib/fields.pm                  Set up object field names for pseudo-hash-using classes
 lib/File/Basename.pm           Emulate the basename program
 lib/File/Basename.t            See if File::Basename works
 lib/FileCache.pm               Keep more files open than the system permits

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 7acec36..97eee01 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -280,7 +280,7 @@ package Maintainers;
        {
        'MAINTAINER'    => 'rgarcia',
        'DISTRIBUTION'  => 'RGARCIA/base-2.14.tar.gz',
-       'FILES'         => q[lib/base.pm lib/fields.pm lib/base],
+       'FILES'         => q[ext/base],
        'EXCLUDED'      => [ qw( t/Dummy.pm ) ],
        'CPAN'          => 1,
        'UPSTREAM'      => "blead",

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

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

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

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

diff --git a/lib/base/t/base.t b/ext/base/t/base.t
similarity index 94%
rename from lib/base/t/base.t
rename to ext/base/t/base.t
index 68dbea0..19a2817 100644 (file)
--- a/lib/base/t/base.t
+++ b/ext/base/t/base.t
@@ -1,12 +1,5 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 use strict;
 use Test::More tests => 11;
 

diff --git a/lib/base/t/compile-time.t b/ext/base/t/compile-time.t
similarity index 91%
rename from lib/base/t/compile-time.t
rename to ext/base/t/compile-time.t
index f7ffd1f..2be51f9 100644 (file)
--- a/lib/base/t/compile-time.t
+++ b/ext/base/t/compile-time.t
@@ -1,12 +1,5 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 use strict;
 use Test::More tests => 3;
 

diff --git a/lib/base/t/fields-5.6.0.t b/ext/base/t/fields-5.6.0.t
similarity index 97%
rename from lib/base/t/fields-5.6.0.t
rename to ext/base/t/fields-5.6.0.t
index 819c335..93bca34 100644 (file)
--- a/lib/base/t/fields-5.6.0.t
+++ b/ext/base/t/fields-5.6.0.t
@@ -7,13 +7,6 @@ if( $] >= 5.009 ) {
     exit;
 }
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 use strict;
 use vars qw($Total_tests);
 

diff --git a/lib/base/t/fields-5.8.0.t b/ext/base/t/fields-5.8.0.t
similarity index 98%
rename from lib/base/t/fields-5.8.0.t
rename to ext/base/t/fields-5.8.0.t
index af39d0b..2da1412 100644 (file)
--- a/lib/base/t/fields-5.8.0.t
+++ b/ext/base/t/fields-5.8.0.t
@@ -7,12 +7,6 @@ if( $] >= 5.009 ) {
     exit;
 }
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib);
-    }
-}
 
 my $w;
 

diff --git a/lib/base/t/fields-base.t b/ext/base/t/fields-base.t
similarity index 98%
rename from lib/base/t/fields-base.t
rename to ext/base/t/fields-base.t
index b27f066..500486b 100644 (file)
--- a/lib/base/t/fields-base.t
+++ b/ext/base/t/fields-base.t
@@ -1,12 +1,5 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 my ($Has_PH, $Field);
 BEGIN { 
     $Has_PH = $] < 5.009;

diff --git a/lib/base/t/fields.t b/ext/base/t/fields.t
similarity index 95%
rename from lib/base/t/fields.t
rename to ext/base/t/fields.t
index e9c32a2..4999cfe 100644 (file)
--- a/lib/base/t/fields.t
+++ b/ext/base/t/fields.t
@@ -1,12 +1,5 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 my $Has_PH;
 BEGIN {
     $Has_PH = $] < 5.009;

diff --git a/lib/base/t/isa.t b/ext/base/t/isa.t
similarity index 65%
rename from lib/base/t/isa.t
rename to ext/base/t/isa.t
index efe3386..bd5ee7f 100644 (file)
--- a/lib/base/t/isa.t
+++ b/ext/base/t/isa.t
@@ -2,13 +2,6 @@
 
 # Regression test some quirky behavior of base.pm.
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 use strict;
 use Test::More tests => 1;
 
@@ -27,4 +20,4 @@ use Test::More tests => 1;
 }
 
 is_deeply [@Child::ISA], [qw(Middle)],
-          'base.pm will not add to @ISA if you already are-a';
\ No newline at end of file
+          'base.pm will not add to @ISA if you already are-a';

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

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

diff --git a/lib/base/t/sigdie.t b/ext/base/t/sigdie.t
similarity index 81%
rename from lib/base/t/sigdie.t
rename to ext/base/t/sigdie.t
index 4173c48..eba75ae 100644 (file)
--- a/lib/base/t/sigdie.t
+++ b/ext/base/t/sigdie.t
@@ -1,12 +1,5 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib ../lib/base/t/lib);
-    }
-}
-
 use strict;
 use Test::More tests => 2;
 

diff --git a/lib/base/t/version.t b/ext/base/t/version.t
similarity index 69%
rename from lib/base/t/version.t
rename to ext/base/t/version.t
index 2045a7f..73d15e6 100644 (file)
--- a/lib/base/t/version.t
+++ b/ext/base/t/version.t
@@ -1,12 +1,5 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib ../lib/base/t/lib);
-    }
-}
-
 use strict;
 
 use Test::More tests => 1;

diff --git a/lib/base/t/warnings.t b/ext/base/t/warnings.t
similarity index 80%
rename from lib/base/t/warnings.t
rename to ext/base/t/warnings.t
index 631cc37..51e9174 100644 (file)
--- a/lib/base/t/warnings.t
+++ b/ext/base/t/warnings.t
@@ -1,12 +1,5 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-   if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = qw(../lib);
-    }
-}
-
 use strict;
 
 use Test::More tests => 1;

diff --git a/lib/.gitignore b/lib/.gitignore
index 0a261b3..108ef06 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -82,7 +82,9 @@
 /XSLoader.pm
 /attributes.pm
 /auto
+/base.pm
 /encoding.pm
+/fields.pm
 /lib.pm
 /ops.pm
 /re.pm