summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MANIFEST18
-rwxr-xr-xPorting/Maintainers.pl5
-rw-r--r--ext/.gitignore1
-rw-r--r--ext/ExtUtils-ParseXS/Changes (renamed from lib/ExtUtils/ParseXS/Changes)0
-rw-r--r--ext/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm (renamed from lib/ExtUtils/ParseXS.pm)0
-rwxr-xr-xext/ExtUtils-ParseXS/lib/ExtUtils/xsubpp (renamed from lib/ExtUtils/xsubpp)0
-rw-r--r--ext/ExtUtils-ParseXS/t/XSTest.pm (renamed from lib/ExtUtils/ParseXS/t/XSTest.pm)0
-rw-r--r--ext/ExtUtils-ParseXS/t/XSTest.xs (renamed from lib/ExtUtils/ParseXS/t/XSTest.xs)0
-rw-r--r--ext/ExtUtils-ParseXS/t/XSUsage.pm (renamed from lib/ExtUtils/ParseXS/t/XSUsage.pm)0
-rw-r--r--ext/ExtUtils-ParseXS/t/XSUsage.xs (renamed from lib/ExtUtils/ParseXS/t/XSUsage.xs)0
-rw-r--r--ext/ExtUtils-ParseXS/t/basic.t (renamed from lib/ExtUtils/ParseXS/t/basic.t)8
-rw-r--r--ext/ExtUtils-ParseXS/t/usage.t (renamed from lib/ExtUtils/ParseXS/t/usage.t)8
-rw-r--r--lib/.gitignore1
-rw-r--r--utils/xsubpp.PL4
14 files changed, 15 insertions, 30 deletions
diff --git a/MANIFEST b/MANIFEST
index cb21681182..f8c15924af 100644
--- 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 0db52a19ef..6740f0800d 100755
--- 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 8d011052d0..82134c98f4 100644
--- 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
index b2568d0243..b2568d0243 100644
--- a/lib/ExtUtils/ParseXS/Changes
+++ b/ext/ExtUtils-ParseXS/Changes
diff --git a/lib/ExtUtils/ParseXS.pm b/ext/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
index 3fa4cc00f5..3fa4cc00f5 100644
--- a/lib/ExtUtils/ParseXS.pm
+++ b/ext/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
diff --git a/lib/ExtUtils/xsubpp b/ext/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
index e4e5b774d8..e4e5b774d8 100755
--- a/lib/ExtUtils/xsubpp
+++ b/ext/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
diff --git a/lib/ExtUtils/ParseXS/t/XSTest.pm b/ext/ExtUtils-ParseXS/t/XSTest.pm
index 988ef472e8..988ef472e8 100644
--- a/lib/ExtUtils/ParseXS/t/XSTest.pm
+++ b/ext/ExtUtils-ParseXS/t/XSTest.pm
diff --git a/lib/ExtUtils/ParseXS/t/XSTest.xs b/ext/ExtUtils-ParseXS/t/XSTest.xs
index 699c7341aa..699c7341aa 100644
--- a/lib/ExtUtils/ParseXS/t/XSTest.xs
+++ b/ext/ExtUtils-ParseXS/t/XSTest.xs
diff --git a/lib/ExtUtils/ParseXS/t/XSUsage.pm b/ext/ExtUtils-ParseXS/t/XSUsage.pm
index a3754285b9..a3754285b9 100644
--- a/lib/ExtUtils/ParseXS/t/XSUsage.pm
+++ b/ext/ExtUtils-ParseXS/t/XSUsage.pm
diff --git a/lib/ExtUtils/ParseXS/t/XSUsage.xs b/ext/ExtUtils-ParseXS/t/XSUsage.xs
index ec663f8653..ec663f8653 100644
--- a/lib/ExtUtils/ParseXS/t/XSUsage.xs
+++ b/ext/ExtUtils-ParseXS/t/XSUsage.xs
diff --git a/lib/ExtUtils/ParseXS/t/basic.t b/ext/ExtUtils-ParseXS/t/basic.t
index 241ab19956..39e1ca912c 100644
--- 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
index 39a6e4157f..3d6ed791b4 100644
--- 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 b8515c44de..2cb6675e62 100644
--- 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 86c43936f7..c857df48e9 100644
--- 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>;