Move ExtUtils::ParseXS from cpan/ to dist/

Both Ken and David agree with this.

diff --git a/MANIFEST b/MANIFEST
index 36105ec..111d4f2 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1015,20 +1015,6 @@ cpan/ExtUtils-MakeMaker/t/xs.t                                   Part of MakeMaker's test suite
 cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm                        Utilities to write MANIFEST files
 cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP              The default MANIFEST.SKIP
 cpan/ExtUtils-Manifest/t/Manifest.t                            See if ExtUtils::Manifest works
-cpan/ExtUtils-ParseXS/Changes                  ExtUtils::ParseXS change log
-cpan/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm  converts Perl XS code into C code
-cpan/ExtUtils-ParseXS/lib/ExtUtils/xsubpp      External subroutine preprocessor
-cpan/ExtUtils-ParseXS/t/basic.t                        See if ExtUtils::ParseXS works
-cpan/ExtUtils-ParseXS/t/lib/IncludeTester.pm   ExtUtils::ParseXS testing utility
-cpan/ExtUtils-ParseXS/t/more.t                 Extended ExtUtils::ParseXS testing
-cpan/ExtUtils-ParseXS/t/typemap                        Standard typemap for controlled testing
-cpan/ExtUtils-ParseXS/t/usage.t                        ExtUtils::ParseXS tests
-cpan/ExtUtils-ParseXS/t/XSInclude.xsh          Test file for ExtUtils::ParseXS tests
-cpan/ExtUtils-ParseXS/t/XSMore.xs              Test file for ExtUtils::ParseXS tests
-cpan/ExtUtils-ParseXS/t/XSTest.pm              Test file for ExtUtils::ParseXS tests
-cpan/ExtUtils-ParseXS/t/XSTest.xs              Test file for ExtUtils::ParseXS tests
-cpan/ExtUtils-ParseXS/t/XSUsage.pm             ExtUtils::ParseXS tests
-cpan/ExtUtils-ParseXS/t/XSUsage.xs             ExtUtils::ParseXS tests
 cpan/File-Fetch/lib/File/Fetch.pm      File::Fetch
 cpan/File-Fetch/t/01_File-Fetch.t      File::Fetch tests
 cpan/File-Fetch/t/null_subclass.t
@@ -2659,6 +2645,20 @@ dist/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm  MakeMaker test utilities
 dist/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm    MakeMaker test utilities
 dist/ExtUtils-Install/t/lib/TieOut.pm                  Testing library to capture prints
 dist/ExtUtils-Install/t/Packlist.t                     See if Packlist works
+dist/ExtUtils-ParseXS/Changes                  ExtUtils::ParseXS change log
+dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm  converts Perl XS code into C code
+dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp      External subroutine preprocessor
+dist/ExtUtils-ParseXS/t/basic.t                        See if ExtUtils::ParseXS works
+dist/ExtUtils-ParseXS/t/lib/IncludeTester.pm   ExtUtils::ParseXS testing utility
+dist/ExtUtils-ParseXS/t/more.t                 Extended ExtUtils::ParseXS testing
+dist/ExtUtils-ParseXS/t/typemap                        Standard typemap for controlled testing
+dist/ExtUtils-ParseXS/t/usage.t                        ExtUtils::ParseXS tests
+dist/ExtUtils-ParseXS/t/XSInclude.xsh          Test file for ExtUtils::ParseXS tests
+dist/ExtUtils-ParseXS/t/XSMore.xs              Test file for ExtUtils::ParseXS tests
+dist/ExtUtils-ParseXS/t/XSTest.pm              Test file for ExtUtils::ParseXS tests
+dist/ExtUtils-ParseXS/t/XSTest.xs              Test file for ExtUtils::ParseXS tests
+dist/ExtUtils-ParseXS/t/XSUsage.pm             ExtUtils::ParseXS tests
+dist/ExtUtils-ParseXS/t/XSUsage.xs             ExtUtils::ParseXS tests
 dist/Filter-Simple/Changes                                     Filter::Simple
 dist/Filter-Simple/lib/Filter/Simple.pm                                Simple frontend to Filter::Util::Call
 dist/Filter-Simple/t/data.t                                    See if Filter::Simple works

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 67350f5..bbb1931 100644 (file)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -607,8 +607,8 @@ use File::Glob qw(:case);
                                        t/include/nsUniversalDetector.h
                                        t/include/nscore.h
                                   }],
-       'FILES'         => q[cpan/ExtUtils-ParseXS],
-       'UPSTREAM'      => 'cpan',
+       'FILES'         => q[dist/ExtUtils-ParseXS],
+       'UPSTREAM'      => 'blead',
        },
 
     'faq' =>

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

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

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

diff --git a/cpan/ExtUtils-ParseXS/t/XSInclude.xsh b/dist/ExtUtils-ParseXS/t/XSInclude.xsh
similarity index 100%
rename from cpan/ExtUtils-ParseXS/t/XSInclude.xsh
rename to dist/ExtUtils-ParseXS/t/XSInclude.xsh

diff --git a/cpan/ExtUtils-ParseXS/t/XSMore.xs b/dist/ExtUtils-ParseXS/t/XSMore.xs
similarity index 100%
rename from cpan/ExtUtils-ParseXS/t/XSMore.xs
rename to dist/ExtUtils-ParseXS/t/XSMore.xs

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

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

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

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

diff --git a/cpan/ExtUtils-ParseXS/t/basic.t b/dist/ExtUtils-ParseXS/t/basic.t
similarity index 100%
rename from cpan/ExtUtils-ParseXS/t/basic.t
rename to dist/ExtUtils-ParseXS/t/basic.t

diff --git a/cpan/ExtUtils-ParseXS/t/lib/IncludeTester.pm b/dist/ExtUtils-ParseXS/t/lib/IncludeTester.pm
similarity index 100%
rename from cpan/ExtUtils-ParseXS/t/lib/IncludeTester.pm
rename to dist/ExtUtils-ParseXS/t/lib/IncludeTester.pm

diff --git a/cpan/ExtUtils-ParseXS/t/more.t b/dist/ExtUtils-ParseXS/t/more.t
similarity index 100%
rename from cpan/ExtUtils-ParseXS/t/more.t
rename to dist/ExtUtils-ParseXS/t/more.t

diff --git a/cpan/ExtUtils-ParseXS/t/typemap b/dist/ExtUtils-ParseXS/t/typemap
similarity index 100%
rename from cpan/ExtUtils-ParseXS/t/typemap
rename to dist/ExtUtils-ParseXS/t/typemap

diff --git a/cpan/ExtUtils-ParseXS/t/usage.t b/dist/ExtUtils-ParseXS/t/usage.t
similarity index 100%
rename from cpan/ExtUtils-ParseXS/t/usage.t
rename to dist/ExtUtils-ParseXS/t/usage.t

diff --git a/t/TEST b/t/TEST
index 15e2feb..23edf87 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -39,7 +39,6 @@ my %abs = (
           '../cpan/ExtUtils-Constant' => 1,
           '../cpan/ExtUtils-MakeMaker' => 1,
           '../cpan/ExtUtils-Manifest' => 1,
-          '../cpan/ExtUtils-ParseXS' => 1,
           '../cpan/File-Fetch' => 1,
           '../cpan/IPC-Cmd' => 1,
           '../cpan/IPC-SysV' => 1,
@@ -60,8 +59,9 @@ my %abs = (
           '../cpan/Tie-File' => 1,
           '../cpan/bignum' => 1,
           '../cpan/podlators' => 1,
-          '../dist/ExtUtils-Install' => 1,
           '../dist/Cwd' => 1,
+          '../dist/ExtUtils-Install' => 1,
+          '../dist/ExtUtils-ParseXS' => 1,
          );
 
 my %temp_no_core =

diff --git a/utils/xsubpp.PL b/utils/xsubpp.PL
index 9d75279..0331d4a 100644 (file)
--- a/utils/xsubpp.PL
+++ b/utils/xsubpp.PL
@@ -34,7 +34,7 @@ $Config{startperl}
 use File::Spec;
 
 my $xsubpp = File::Spec->catfile(File::Spec->catdir(File::Spec->updir,
-                                                   qw(cpan ExtUtils-ParseXS
+                                                   qw(dist ExtUtils-ParseXS
                                                       lib ExtUtils)),
                                 'xsubpp');