Move ExtUtils::ParseXS from lib to ext.

diff --git a/MANIFEST b/MANIFEST
index cb21681..f8c1592 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1066,6 +1066,15 @@ ext/ExtUtils-Install/t/Packlist.t                        See if Packlist works
 ext/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm         Utilities to write MANIFEST files
 ext/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP       The default MANIFEST.SKIP
 ext/ExtUtils-Manifest/t/Manifest.t                     See if ExtUtils::Manifest works
+ext/ExtUtils-ParseXS/Changes                   ExtUtils::ParseXS change log
+ext/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm   converts Perl XS code into C code
+ext/ExtUtils-ParseXS/lib/ExtUtils/xsubpp       External subroutine preprocessor
+ext/ExtUtils-ParseXS/t/basic.t                 See if ExtUtils::ParseXS works
+ext/ExtUtils-ParseXS/t/usage.t                 ExtUtils::ParseXS tests
+ext/ExtUtils-ParseXS/t/XSTest.pm               Test file for ExtUtils::ParseXS tests
+ext/ExtUtils-ParseXS/t/XSTest.xs               Test file for ExtUtils::ParseXS tests
+ext/ExtUtils-ParseXS/t/XSUsage.pm              ExtUtils::ParseXS tests
+ext/ExtUtils-ParseXS/t/XSUsage.xs              ExtUtils::ParseXS tests
 ext/Fcntl/Fcntl.pm     Fcntl extension Perl module
 ext/Fcntl/Fcntl.xs     Fcntl extension external subroutines
 ext/Fcntl/Makefile.PL  Fcntl extension makefile writer
@@ -2611,14 +2620,6 @@ lib/ExtUtils/MM_Win32.pm MakeMaker methods for Win32
 lib/ExtUtils/MM_Win95.pm       MakeMaker methods for Win95
 lib/ExtUtils/MY.pm             MakeMaker user override class
 lib/ExtUtils/NOTES             Notes about MakeMaker internals
-lib/ExtUtils/ParseXS/Changes   ExtUtils::ParseXS change log
-lib/ExtUtils/ParseXS.pm                converts Perl XS code into C code
-lib/ExtUtils/ParseXS/t/basic.t See if ExtUtils::ParseXS works
-lib/ExtUtils/ParseXS/t/usage.t ExtUtils::ParseXS tests
-lib/ExtUtils/ParseXS/t/XSTest.pm       Test file for ExtUtils::ParseXS tests
-lib/ExtUtils/ParseXS/t/XSTest.xs       Test file for ExtUtils::ParseXS tests
-lib/ExtUtils/ParseXS/t/XSUsage.pm      ExtUtils::ParseXS tests
-lib/ExtUtils/ParseXS/t/XSUsage.xs      ExtUtils::ParseXS tests
 lib/ExtUtils/PATCHING          Suggestions for patching MakeMaker
 lib/ExtUtils/README            MakeMaker README
 lib/ExtUtils/t/00compile.t     See if MakeMaker modules compile
@@ -2683,7 +2684,6 @@ lib/ExtUtils/t/writemakefile_args.t       See if WriteMakefile works
 lib/ExtUtils/t/xs.t            Part of MakeMaker's test suite
 lib/ExtUtils/typemap           Extension interface types
 lib/ExtUtils/XSSymSet.pm       on VMS, manage linker symbols when building extensions
-lib/ExtUtils/xsubpp            External subroutine preprocessor
 lib/fastcwd.pl                 a faster but more dangerous getcwd
 lib/feature.pm                 Pragma to enable new syntax
 lib/feature.t                  See if features work

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

diff --git a/ext/.gitignore b/ext/.gitignore
index 8d01105..82134c9 100644 (file)
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -31,6 +31,7 @@ ppport.h
 /ExtUtils-Constant/Makefile.PL
 /ExtUtils-Install/Makefile.PL
 /ExtUtils-Manifest/Makefile.PL
+/ExtUtils-ParseXS/Makefile.PL
 /FileCache/Makefile.PL
 /File-Fetch/Makefile.PL
 /Filter-Simple/Makefile.PL

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

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

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

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

diff --git a/lib/ExtUtils/ParseXS/t/XSTest.xs b/ext/ExtUtils-ParseXS/t/XSTest.xs
similarity index 100%
rename from lib/ExtUtils/ParseXS/t/XSTest.xs
rename to ext/ExtUtils-ParseXS/t/XSTest.xs

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

diff --git a/lib/ExtUtils/ParseXS/t/XSUsage.xs b/ext/ExtUtils-ParseXS/t/XSUsage.xs
similarity index 100%
rename from lib/ExtUtils/ParseXS/t/XSUsage.xs
rename to ext/ExtUtils-ParseXS/t/XSUsage.xs

diff --git a/lib/ExtUtils/ParseXS/t/basic.t b/ext/ExtUtils-ParseXS/t/basic.t
similarity index 91%
rename from lib/ExtUtils/ParseXS/t/basic.t
rename to ext/ExtUtils-ParseXS/t/basic.t
index 241ab19..39e1ca9 100644 (file)
--- a/lib/ExtUtils/ParseXS/t/basic.t
+++ b/ext/ExtUtils-ParseXS/t/basic.t
@@ -1,13 +1,5 @@
 #!/usr/bin/perl
 
-BEGIN {
-  if ($ENV{PERL_CORE}) {
-    chdir 't' if -d 't';
-    chdir '../lib/ExtUtils/ParseXS'
-      or die "Can't chdir to lib/ExtUtils/ParseXS: $!";
-    @INC = qw(../.. ../../.. .);
-  }
-}
 use strict;
 use Test::More;
 use Config;

diff --git a/lib/ExtUtils/ParseXS/t/usage.t b/ext/ExtUtils-ParseXS/t/usage.t
similarity index 93%
rename from lib/ExtUtils/ParseXS/t/usage.t
rename to ext/ExtUtils-ParseXS/t/usage.t
index 39a6e41..3d6ed79 100644 (file)
--- a/lib/ExtUtils/ParseXS/t/usage.t
+++ b/ext/ExtUtils-ParseXS/t/usage.t
@@ -1,13 +1,5 @@
 #!/usr/bin/perl
 
-BEGIN {
-  if ($ENV{PERL_CORE}) {
-    chdir 't' if -d 't';
-    chdir '../lib/ExtUtils/ParseXS'
-      or die "Can't chdir to lib/ExtUtils/ParseXS: $!";
-    @INC = qw(../.. ../../.. .);
-  }
-}
 use strict;
 use Test::More;
 use Config;

diff --git a/lib/.gitignore b/lib/.gitignore
index b8515c4..2cb6675 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -134,6 +134,7 @@
 /ExtUtils/Manifest.pm
 /ExtUtils/Miniperl.pm
 /ExtUtils/Packlist.pm
+/ExtUtils/ParseXS.pm
 /Fatal.pm
 /Fcntl.pm
 /FileCache.pm

diff --git a/utils/xsubpp.PL b/utils/xsubpp.PL
index 86c4393..c857df4 100644 (file)
--- a/utils/xsubpp.PL
+++ b/utils/xsubpp.PL
@@ -33,7 +33,9 @@ $Config{startperl}
 
 use File::Spec;
 
-my $xsubpp = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, "lib", "ExtUtils"), "xsubpp");
+my $xsubpp = File::Spec->catfile(File::Spec->catdir(File::Spec->updir,
+                                                   qw(ext ExtUtils-ParseXS
+                                                      lib ExtUtils xsubpp)));
 
 if (open(XSUBPP, $xsubpp)) {
     print OUT <XSUBPP>;