Move ExtUtils::CBuilder from lib to ext.

diff --git a/MANIFEST b/MANIFEST
index f8c1592..7af5c96 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1040,6 +1040,20 @@ ext/Errno/ChangeLog      Errno changes
 ext/Errno/Errno_pm.PL  Errno perl module create script
 ext/Errno/Makefile.PL  Errno extension makefile writer
 ext/Errno/t/Errno.t    See if Errno works
+ext/ExtUtils-CBuilder/Changes                                  Changes for ExtUtils::CBuilder
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm            Base class for ExtUtils::CBuilder methods
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/aix.pm    CBuilder methods for AIX
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/cygwin.pm CBuilder methods for cygwin
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/darwin.pm CBuilder methods for darwin
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/dec_osf.pm        CBuilder methods for OSF
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/os2.pm    CBuilder methods for OS/2
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Unix.pm   CBuilder methods for Unix
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/VMS.pm    CBuilder methods for VMS
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows.pm        CBuilder methods for Windows
+ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder.pm                 Compile and link C code for Perl modules
+ext/ExtUtils-CBuilder/t/00-have-compiler.t                     ExtUtils::CBuilder tests
+ext/ExtUtils-CBuilder/t/01-basic.t                             tests for ExtUtils::CBuilder
+ext/ExtUtils-CBuilder/t/02-link.t                              tests for ExtUtils::CBuilder
 ext/ExtUtils-Command/lib/ExtUtils/Command.pm   Utilities for Make on non-UNIX platforms
 ext/ExtUtils-Command/t/cp.t                    See if ExtUtils::Command works
 ext/ExtUtils-Command/t/eu_command.t            See if ExtUtils::Command works
@@ -2575,20 +2589,6 @@ lib/exceptions.pl                catch and throw routines
 lib/Exporter/Heavy.pm          Complicated routines for Exporter
 lib/Exporter.pm                        Exporter base class
 lib/Exporter.t                 See if Exporter works
-lib/ExtUtils/CBuilder/Base.pm  Base class for ExtUtils::CBuilder methods
-lib/ExtUtils/CBuilder/Changes  Changes for ExtUtils::CBuilder
-lib/ExtUtils/CBuilder/Platform/aix.pm  CBuilder methods for AIX
-lib/ExtUtils/CBuilder/Platform/cygwin.pm       CBuilder methods for cygwin
-lib/ExtUtils/CBuilder/Platform/darwin.pm       CBuilder methods for darwin
-lib/ExtUtils/CBuilder/Platform/dec_osf.pm      CBuilder methods for OSF
-lib/ExtUtils/CBuilder/Platform/os2.pm  CBuilder methods for OS/2
-lib/ExtUtils/CBuilder/Platform/Unix.pm CBuilder methods for Unix
-lib/ExtUtils/CBuilder/Platform/VMS.pm  CBuilder methods for VMS
-lib/ExtUtils/CBuilder/Platform/Windows.pm      CBuilder methods for Windows
-lib/ExtUtils/CBuilder.pm       Compile and link C code for Perl modules
-lib/ExtUtils/CBuilder/t/00-have-compiler.t     ExtUtils::CBuilder tests
-lib/ExtUtils/CBuilder/t/01-basic.t     tests for ExtUtils::CBuilder
-lib/ExtUtils/CBuilder/t/02-link.t      tests for ExtUtils::CBuilder
 lib/ExtUtils/Changes           MakeMaker change log
 lib/ExtUtils/Command/MM.pm     Calling MM functions from the cmd line
 lib/ExtUtils/Embed.pm          Utilities for embedding Perl in C programs

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 6740f08..0f76466 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -563,7 +563,7 @@ use File::Glob qw(:case);
        {
        'MAINTAINER'    => 'kwilliams',
        'DISTRIBUTION'  => 'DAGOLDEN/ExtUtils-CBuilder-0.2602.tar.gz',
-       'FILES'         => q[lib/ExtUtils/CBuilder.pm lib/ExtUtils/CBuilder],
+       'FILES'         => q[ext/ExtUtils-CBuilder],
        'EXCLUDED'      => [ qw{devtools} ],
        'CPAN'          => 1,
        'UPSTREAM'      => 'cpan',

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

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

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

diff --git a/lib/ExtUtils/CBuilder/Platform/Unix.pm b/ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Unix.pm
similarity index 100%
rename from lib/ExtUtils/CBuilder/Platform/Unix.pm
rename to ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Unix.pm

diff --git a/lib/ExtUtils/CBuilder/Platform/VMS.pm b/ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/VMS.pm
similarity index 100%
rename from lib/ExtUtils/CBuilder/Platform/VMS.pm
rename to ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/VMS.pm

diff --git a/lib/ExtUtils/CBuilder/Platform/Windows.pm b/ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows.pm
similarity index 100%
rename from lib/ExtUtils/CBuilder/Platform/Windows.pm
rename to ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows.pm

diff --git a/lib/ExtUtils/CBuilder/Platform/aix.pm b/ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/aix.pm
similarity index 100%
rename from lib/ExtUtils/CBuilder/Platform/aix.pm
rename to ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/aix.pm

diff --git a/lib/ExtUtils/CBuilder/Platform/cygwin.pm b/ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/cygwin.pm
similarity index 100%
rename from lib/ExtUtils/CBuilder/Platform/cygwin.pm
rename to ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/cygwin.pm

diff --git a/lib/ExtUtils/CBuilder/Platform/darwin.pm b/ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/darwin.pm
similarity index 100%
rename from lib/ExtUtils/CBuilder/Platform/darwin.pm
rename to ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/darwin.pm

diff --git a/lib/ExtUtils/CBuilder/Platform/dec_osf.pm b/ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
similarity index 100%
rename from lib/ExtUtils/CBuilder/Platform/dec_osf.pm
rename to ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/dec_osf.pm

diff --git a/lib/ExtUtils/CBuilder/Platform/os2.pm b/ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/os2.pm
similarity index 100%
rename from lib/ExtUtils/CBuilder/Platform/os2.pm
rename to ext/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/os2.pm

diff --git a/lib/ExtUtils/CBuilder/t/00-have-compiler.t b/ext/ExtUtils-CBuilder/t/00-have-compiler.t
similarity index 81%
rename from lib/ExtUtils/CBuilder/t/00-have-compiler.t
rename to ext/ExtUtils-CBuilder/t/00-have-compiler.t
index cf62e97..245bce5 100644 (file)
--- a/lib/ExtUtils/CBuilder/t/00-have-compiler.t
+++ b/ext/ExtUtils-CBuilder/t/00-have-compiler.t
@@ -4,12 +4,6 @@ use File::Spec;
 my $perl;
 BEGIN {
   $perl = File::Spec->rel2abs($^X);
-  if ($ENV{PERL_CORE}) {
-    chdir 't' if -d 't';
-    chdir '../lib/ExtUtils/CBuilder'
-      or die "Can't chdir to lib/ExtUtils/CBuilder: $!";
-    @INC = qw(../..);
-  }
 }
 
 use strict;

diff --git a/lib/ExtUtils/CBuilder/t/01-basic.t b/ext/ExtUtils-CBuilder/t/01-basic.t
similarity index 89%
rename from lib/ExtUtils/CBuilder/t/01-basic.t
rename to ext/ExtUtils-CBuilder/t/01-basic.t
index 79a0b0c..66a025f 100644 (file)
--- a/lib/ExtUtils/CBuilder/t/01-basic.t
+++ b/ext/ExtUtils-CBuilder/t/01-basic.t
@@ -1,14 +1,5 @@
 #! perl -w
 
-BEGIN {
-  if ($ENV{PERL_CORE}) {
-    chdir 't' if -d 't';
-    chdir '../lib/ExtUtils/CBuilder'
-      or die "Can't chdir to lib/ExtUtils/CBuilder: $!";
-    @INC = qw(../..);
-  }
-}
-
 use strict;
 use Test::More;
 BEGIN { 

diff --git a/lib/ExtUtils/CBuilder/t/02-link.t b/ext/ExtUtils-CBuilder/t/02-link.t
similarity index 92%
rename from lib/ExtUtils/CBuilder/t/02-link.t
rename to ext/ExtUtils-CBuilder/t/02-link.t
index c748d3b..1e55f6a 100644 (file)
--- a/lib/ExtUtils/CBuilder/t/02-link.t
+++ b/ext/ExtUtils-CBuilder/t/02-link.t
@@ -1,14 +1,5 @@
 #! perl -w
 
-BEGIN {
-  if ($ENV{PERL_CORE}) {
-    chdir 't' if -d 't';
-    chdir '../lib/ExtUtils/CBuilder'
-      or die "Can't chdir to lib/ExtUtils/CBuilder: $!";
-    @INC = qw(../..);
-  }
-}
-
 use strict;
 use Test::More;
 BEGIN {