Move ExtUtils::Constant to from lib to ext.

diff --git a/MANIFEST b/MANIFEST
index 602a573..f56f40f 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1043,6 +1043,12 @@ ext/ExtUtils-Command/lib/ExtUtils/Command.pm     Utilities for Make on non-UNIX plat
 ext/ExtUtils-Command/t/cp.t                    See if ExtUtils::Command works
 ext/ExtUtils-Command/t/eu_command.t            See if ExtUtils::Command works
 ext/ExtUtils-Command/t/lib/TieOut.pm           Testing library to capture prints
+ext/ExtUtils-Constant/lib/ExtUtils/Constant/Base.pm            generate XS code to import C header constants
+ext/ExtUtils-Constant/lib/ExtUtils/Constant.pm                 generate XS code to import C header constants
+ext/ExtUtils-Constant/lib/ExtUtils/Constant/ProxySubs.pm       generate XS code for proxy constants
+ext/ExtUtils-Constant/lib/ExtUtils/Constant/Utils.pm           generate XS code to import C header constants
+ext/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm              generate XS code to import C header constants
+ext/ExtUtils-Constant/t/Constant.t                             See if ExtUtils::Constant works
 ext/Fcntl/Fcntl.pm     Fcntl extension Perl module
 ext/Fcntl/Fcntl.xs     Fcntl extension external subroutines
 ext/Fcntl/Makefile.PL  Fcntl extension makefile writer
@@ -2560,11 +2566,6 @@ lib/ExtUtils/CBuilder/t/02-link.t        tests for ExtUtils::CBuilder
 lib/ExtUtils/Changes           MakeMaker change log
 lib/ExtUtils/Changes_EU-Install                ExtUtils-Install change log
 lib/ExtUtils/Command/MM.pm     Calling MM functions from the cmd line
-lib/ExtUtils/Constant/Base.pm  generate XS code to import C header constants
-lib/ExtUtils/Constant.pm       generate XS code to import C header constants
-lib/ExtUtils/Constant/ProxySubs.pm     generate XS code for proxy constants
-lib/ExtUtils/Constant/Utils.pm generate XS code to import C header constants
-lib/ExtUtils/Constant/XS.pm    generate XS code to import C header constants
 lib/ExtUtils/Embed.pm          Utilities for embedding Perl in C programs
 lib/ExtUtils/Installed.pm      Information on installed extensions
 lib/ExtUtils/Install.pm                Handles 'make install' on extensions
@@ -2617,7 +2618,6 @@ lib/ExtUtils/t/build_man.t        Set if MakeMaker builds manpages
 lib/ExtUtils/t/can_write_dir.t Does the _can_write_dir function of ExtUtils::Install work properly?
 lib/ExtUtils/t/cd.t            Test to see cd works
 lib/ExtUtils/t/config.t                Test ExtUtils::MakeMaker::Config
-lib/ExtUtils/t/Constant.t      See if ExtUtils::Constant works
 lib/ExtUtils/t/dir_target.t    Verify if dir_target() is supported
 lib/ExtUtils/t/Embed.t         See if ExtUtils::Embed and embedding works
 lib/ExtUtils/testlib.pm                Fixes up @INC to use just-built extension

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 951c9d9..f3b16b9 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -587,18 +587,12 @@ use File::Glob qw(:case);
        {
        'MAINTAINER'    => 'nwclark',
        'DISTRIBUTION'  => 'NWCLARK/ExtUtils-Constant-0.16.tar.gz',
-       'FILES'         => q[lib/ExtUtils/Constant.pm
-                            lib/ExtUtils/Constant
-                            lib/ExtUtils/t/Constant.t
-                           ],
+       'FILES'         => q[ext/ExtUtils-Constant],
        'EXCLUDED'      => [ qw{ lib/ExtUtils/Constant/Aaargh56Hash.pm
                                 examples/perl_keyword.pl
                                 examples/perl_regcomp_posix_keyword.pl
                               },
                           ],
-       'MAP'           => { 't/'       => 'lib/ExtUtils/t/',
-                            'lib/'     => 'lib/',
-                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },

diff --git a/ext/.gitignore b/ext/.gitignore
index 76dda53..1082a07 100644 (file)
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -27,6 +27,7 @@ ppport.h
 /Data-Dumper/Makefile.PL
 /Digest/Makefile.PL
 /Devel-SelfStubber/Makefile.PL
+/ExtUtils-Constant/Makefile.PL
 /FileCache/Makefile.PL
 /File-Fetch/Makefile.PL
 /Filter-Simple/Makefile.PL

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

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

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

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

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

diff --git a/lib/ExtUtils/t/Constant.t b/ext/ExtUtils-Constant/t/Constant.t
similarity index 99%
rename from lib/ExtUtils/t/Constant.t
rename to ext/ExtUtils-Constant/t/Constant.t
index 02b7528..17330f7 100644 (file)
--- a/lib/ExtUtils/t/Constant.t
+++ b/ext/ExtUtils-Constant/t/Constant.t
@@ -1,15 +1,9 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-    if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = '../lib';
-    }
-    use Config;
-    unless ($Config{usedl}) {
-       print "1..0 # no usedl, skipping\n";
-       exit 0;
-    }
+use Config;
+unless ($Config{usedl}) {
+    print "1..0 # no usedl, skipping\n";
+    exit 0;
 }
 
 # use warnings;

diff --git a/lib/.gitignore b/lib/.gitignore
index 7f50914..3817b3d 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -125,6 +125,8 @@
 /Encode.pm
 /Encode
 /Errno.pm
+/ExtUtils/Constant.pm
+/ExtUtils/Constant
 /ExtUtils/Miniperl.pm
 /Fatal.pm
 /Fcntl.pm