Move Cwd and List-Util to folders named as per their CPAN distributions

diff --git a/MANIFEST b/MANIFEST
index b919d6d..51250af 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1397,39 +1397,6 @@ cpan/libnet/t/nntp.t             libnet
 cpan/libnet/t/require.t                libnet
 cpan/libnet/t/smtp.t           libnet
 cpan/libnet/t/time.t           libnet
-cpan/List-Util/lib/List/Util.pm                List::Util
-cpan/List-Util/lib/List/Util/XS.pm     List::Util
-cpan/List-Util/lib/Scalar/Util.pm      Scalar::Util
-cpan/List-Util/ListUtil.xs             Util extension
-cpan/List-Util/Makefile.PL             Util extension
-cpan/List-Util/multicall.h             Util extension
-cpan/List-Util/t/00version.t           Scalar::Util
-cpan/List-Util/t/any-all.t             List::Util
-cpan/List-Util/t/blessed.t             Scalar::Util
-cpan/List-Util/t/dualvar.t             Scalar::Util
-cpan/List-Util/t/first.t               List::Util
-cpan/List-Util/t/getmagic-once.t
-cpan/List-Util/t/isvstring.t           Scalar::Util
-cpan/List-Util/t/lln.t                 Scalar::Util
-cpan/List-Util/t/maxstr.t              List::Util
-cpan/List-Util/t/max.t                 List::Util
-cpan/List-Util/t/minstr.t              List::Util
-cpan/List-Util/t/min.t                 List::Util
-cpan/List-Util/t/multicall-refcount.t
-cpan/List-Util/t/openhan.t             Scalar::Util
-cpan/List-Util/t/pair.t
-cpan/List-Util/t/product.t             List::Util
-cpan/List-Util/t/proto.t               Scalar::Util
-cpan/List-Util/t/readonly.t            Scalar::Util
-cpan/List-Util/t/reduce.t              List::Util
-cpan/List-Util/t/refaddr.t             Scalar::Util
-cpan/List-Util/t/reftype.t             Scalar::Util
-cpan/List-Util/t/shuffle.t             List::Util
-cpan/List-Util/t/stack-corruption.t    List::Util
-cpan/List-Util/t/sum0.t
-cpan/List-Util/t/sum.t                 List::Util
-cpan/List-Util/t/tainted.t             Scalar::Util
-cpan/List-Util/t/weak.t                        Scalar::Util
 cpan/Locale-Codes/lib/Locale/Codes/API.pod     Locale::Codes documentation
 cpan/Locale-Codes/lib/Locale/Codes/Changes.pod Locale::Codes documentation
 cpan/Locale-Codes/lib/Locale/Codes/Constants.pm        Locale::Codes
@@ -2039,6 +2006,39 @@ cpan/Pod-Usage/t/pod/testcmp.pl
 cpan/Pod-Usage/t/pod/testp2pt.pl
 cpan/Pod-Usage/t/pod/usage2.pod
 cpan/Pod-Usage/t/pod/usage.pod
+cpan/Scalar-List-Utils/lib/List/Util.pm                List::Util
+cpan/Scalar-List-Utils/lib/List/Util/XS.pm     List::Util
+cpan/Scalar-List-Utils/lib/Scalar/Util.pm      Scalar::Util
+cpan/Scalar-List-Utils/ListUtil.xs             Util extension
+cpan/Scalar-List-Utils/Makefile.PL             Util extension
+cpan/Scalar-List-Utils/multicall.h             Util extension
+cpan/Scalar-List-Utils/t/00version.t           Scalar::Util
+cpan/Scalar-List-Utils/t/any-all.t             List::Util
+cpan/Scalar-List-Utils/t/blessed.t             Scalar::Util
+cpan/Scalar-List-Utils/t/dualvar.t             Scalar::Util
+cpan/Scalar-List-Utils/t/first.t               List::Util
+cpan/Scalar-List-Utils/t/getmagic-once.t
+cpan/Scalar-List-Utils/t/isvstring.t           Scalar::Util
+cpan/Scalar-List-Utils/t/lln.t                 Scalar::Util
+cpan/Scalar-List-Utils/t/maxstr.t              List::Util
+cpan/Scalar-List-Utils/t/max.t                 List::Util
+cpan/Scalar-List-Utils/t/minstr.t              List::Util
+cpan/Scalar-List-Utils/t/min.t                 List::Util
+cpan/Scalar-List-Utils/t/multicall-refcount.t
+cpan/Scalar-List-Utils/t/openhan.t             Scalar::Util
+cpan/Scalar-List-Utils/t/pair.t
+cpan/Scalar-List-Utils/t/product.t             List::Util
+cpan/Scalar-List-Utils/t/proto.t               Scalar::Util
+cpan/Scalar-List-Utils/t/readonly.t            Scalar::Util
+cpan/Scalar-List-Utils/t/reduce.t              List::Util
+cpan/Scalar-List-Utils/t/refaddr.t             Scalar::Util
+cpan/Scalar-List-Utils/t/reftype.t             Scalar::Util
+cpan/Scalar-List-Utils/t/shuffle.t             List::Util
+cpan/Scalar-List-Utils/t/stack-corruption.t    List::Util
+cpan/Scalar-List-Utils/t/sum0.t
+cpan/Scalar-List-Utils/t/sum.t                 List::Util
+cpan/Scalar-List-Utils/t/tainted.t             Scalar::Util
+cpan/Scalar-List-Utils/t/weak.t                        Scalar::Util
 cpan/Socket/Makefile.PL                        Socket extension makefile writer
 cpan/Socket/Socket.pm                  Socket extension Perl module
 cpan/Socket/Socket.xs                  Socket extension external subroutines
@@ -2884,27 +2884,6 @@ dist/Carp/t/with_warnings.t              See if Carp plays nicely with warnings
 dist/constant/lib/constant.pm  For "use constant"
 dist/constant/t/constant.t     See if compile-time constants work
 dist/constant/t/utf8.t         Test Unicode constants under utf8 pragma
-dist/Cwd/Cwd.pm                                Various cwd routines (getcwd, fastcwd, chdir)
-dist/Cwd/Cwd.xs                                Cwd extension external subroutines
-dist/Cwd/lib/File/Spec/Cygwin.pm       portable operations on Cygwin file names
-dist/Cwd/lib/File/Spec/Epoc.pm         portable operations on EPOC file names
-dist/Cwd/lib/File/Spec/Functions.pm    Function interface to File::Spec object methods
-dist/Cwd/lib/File/Spec/Mac.pm          portable operations on Mac file names
-dist/Cwd/lib/File/Spec/OS2.pm          portable operations on OS2 file names
-dist/Cwd/lib/File/Spec.pm              portable operations on file names
-dist/Cwd/lib/File/Spec/Unix.pm         portable operations on Unix file names
-dist/Cwd/lib/File/Spec/VMS.pm          portable operations on VMS file names
-dist/Cwd/lib/File/Spec/Win32.pm                portable operations on Win32 and NetWare file names
-dist/Cwd/Makefile.PL                   makefile writer for Cwd
-dist/Cwd/t/crossplatform.t             See if File::Spec works crossplatform
-dist/Cwd/t/cwd.t                       See if Cwd works
-dist/Cwd/t/Functions.t                 See if File::Spec::Functions works
-dist/Cwd/t/rel2abs2rel.t               See if File::Spec->rel2abs/abs2rel works
-dist/Cwd/t/Spec.t                      See if File::Spec works
-dist/Cwd/t/Spec-taint.t                        See if File::Spec works with taint
-dist/Cwd/t/taint.t                     See if Cwd works with taint
-dist/Cwd/t/tmpdir.t                    See if File::Spec->tmpdir() works
-dist/Cwd/t/win32.t                     See if Cwd works on Win32
 dist/Data-Dumper/Changes       Data pretty printer, changelog
 dist/Data-Dumper/Dumper.pm     Data pretty printer, module
 dist/Data-Dumper/Dumper.xs     Data pretty printer, externals
@@ -3259,6 +3238,27 @@ dist/Net-Ping/t/450_service.t            Ping Net::Ping
 dist/Net-Ping/t/500_ping_icmp.t                Ping Net::Ping
 dist/Net-Ping/t/510_ping_udp.t         Ping Net::Ping
 dist/Net-Ping/t/520_icmp_ttl.t         Ping Net::Ping
+dist/PathTools/Cwd.pm                          Various cwd routines (getcwd, fastcwd, chdir)
+dist/PathTools/Cwd.xs                          Cwd extension external subroutines
+dist/PathTools/lib/File/Spec/Cygwin.pm portable operations on Cygwin file names
+dist/PathTools/lib/File/Spec/Epoc.pm           portable operations on EPOC file names
+dist/PathTools/lib/File/Spec/Functions.pm      Function interface to File::Spec object methods
+dist/PathTools/lib/File/Spec/Mac.pm            portable operations on Mac file names
+dist/PathTools/lib/File/Spec/OS2.pm            portable operations on OS2 file names
+dist/PathTools/lib/File/Spec.pm                portable operations on file names
+dist/PathTools/lib/File/Spec/Unix.pm           portable operations on Unix file names
+dist/PathTools/lib/File/Spec/VMS.pm            portable operations on VMS file names
+dist/PathTools/lib/File/Spec/Win32.pm          portable operations on Win32 and NetWare file names
+dist/PathTools/Makefile.PL                     makefile writer for Cwd
+dist/PathTools/t/crossplatform.t               See if File::Spec works crossplatform
+dist/PathTools/t/cwd.t                 See if Cwd works
+dist/PathTools/t/Functions.t                   See if File::Spec::Functions works
+dist/PathTools/t/rel2abs2rel.t         See if File::Spec->rel2abs/abs2rel works
+dist/PathTools/t/Spec.t                        See if File::Spec works
+dist/PathTools/t/Spec-taint.t                  See if File::Spec works with taint
+dist/PathTools/t/taint.t                       See if Cwd works with taint
+dist/PathTools/t/tmpdir.t                      See if File::Spec->tmpdir() works
+dist/PathTools/t/win32.t                       See if Cwd works on Win32
 dist/Safe/Changes              Changes for Safe.pm
 dist/Safe/Makefile.PL          Makefile.PL for Safe.pm
 dist/Safe/MANIFEST             MANIFEST for Safe.pm

diff --git a/META.json b/META.json
index d15a43c..f5bdd8e 100644 (file)
--- a/META.json
+++ b/META.json
@@ -21,7 +21,6 @@
          "dist/bignum",
          "dist/Carp",
          "dist/constant",
-         "dist/Cwd",
          "dist/Data-Dumper",
          "dist/Devel-SelfStubber",
          "dist/Dumpvalue",
@@ -43,6 +42,7 @@
          "dist/Math-BigRat",
          "dist/Module-CoreList",
          "dist/Net-Ping",
+         "dist/PathTools",
          "dist/Safe",
          "dist/Search-Dict",
          "dist/SelfLoader",

diff --git a/META.yml b/META.yml
index f4762e0..bcd376a 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -19,7 +19,6 @@ no_index:
     - dist/bignum
     - dist/Carp
     - dist/constant
-    - dist/Cwd
     - dist/Data-Dumper
     - dist/Devel-SelfStubber
     - dist/Dumpvalue
@@ -41,6 +40,7 @@ no_index:
     - dist/Math-BigRat
     - dist/Module-CoreList
     - dist/Net-Ping
+    - dist/PathTools
     - dist/Safe
     - dist/Search-Dict
     - dist/SelfLoader

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index e2c479f..359f217 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -878,13 +878,8 @@ use File::Glob qw(:case);
 
     'PathTools' => {
         'DISTRIBUTION' => 'SMUELLER/PathTools-3.40.tar.gz',
-        'FILES'        => q[dist/Cwd],
+        'FILES'        => q[dist/PathTools],
         'EXCLUDED'     => [qr{^t/lib/Test/}],
-
-        # NOTE: PathTools is in dist/Cwd/ instead of dist/PathTools because it
-        # contains Cwd.xs and something, possibly Makefile.SH, makes an assumption
-        # that the leafname of some file corresponds with the pathname of the
-        # directory.
     },
 
     'Perl::OSType' => {
@@ -982,7 +977,7 @@ use File::Glob qw(:case);
 
     'Scalar-List-Utils' => {
         'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.35.tar.gz',
-        'FILES'    => q[cpan/List-Util],
+        'FILES'    => q[cpan/Scalar-List-Utils],
     },
 
     'Search::Dict' => {

diff --git a/cpan/List-Util/ListUtil.xs b/cpan/Scalar-List-Utils/ListUtil.xs
similarity index 100%
rename from cpan/List-Util/ListUtil.xs
rename to cpan/Scalar-List-Utils/ListUtil.xs

diff --git a/cpan/List-Util/Makefile.PL b/cpan/Scalar-List-Utils/Makefile.PL
similarity index 100%
rename from cpan/List-Util/Makefile.PL
rename to cpan/Scalar-List-Utils/Makefile.PL

diff --git a/cpan/List-Util/lib/List/Util.pm b/cpan/Scalar-List-Utils/lib/List/Util.pm
similarity index 100%
rename from cpan/List-Util/lib/List/Util.pm
rename to cpan/Scalar-List-Utils/lib/List/Util.pm

diff --git a/cpan/List-Util/lib/List/Util/XS.pm b/cpan/Scalar-List-Utils/lib/List/Util/XS.pm
similarity index 100%
rename from cpan/List-Util/lib/List/Util/XS.pm
rename to cpan/Scalar-List-Utils/lib/List/Util/XS.pm

diff --git a/cpan/List-Util/lib/Scalar/Util.pm b/cpan/Scalar-List-Utils/lib/Scalar/Util.pm
similarity index 100%
rename from cpan/List-Util/lib/Scalar/Util.pm
rename to cpan/Scalar-List-Utils/lib/Scalar/Util.pm

diff --git a/cpan/List-Util/multicall.h b/cpan/Scalar-List-Utils/multicall.h
similarity index 100%
rename from cpan/List-Util/multicall.h
rename to cpan/Scalar-List-Utils/multicall.h

diff --git a/cpan/List-Util/t/00version.t b/cpan/Scalar-List-Utils/t/00version.t
similarity index 100%
rename from cpan/List-Util/t/00version.t
rename to cpan/Scalar-List-Utils/t/00version.t

diff --git a/cpan/List-Util/t/any-all.t b/cpan/Scalar-List-Utils/t/any-all.t
similarity index 100%
rename from cpan/List-Util/t/any-all.t
rename to cpan/Scalar-List-Utils/t/any-all.t

diff --git a/cpan/List-Util/t/blessed.t b/cpan/Scalar-List-Utils/t/blessed.t
similarity index 100%
rename from cpan/List-Util/t/blessed.t
rename to cpan/Scalar-List-Utils/t/blessed.t

diff --git a/cpan/List-Util/t/dualvar.t b/cpan/Scalar-List-Utils/t/dualvar.t
similarity index 100%
rename from cpan/List-Util/t/dualvar.t
rename to cpan/Scalar-List-Utils/t/dualvar.t

diff --git a/cpan/List-Util/t/first.t b/cpan/Scalar-List-Utils/t/first.t
similarity index 100%
rename from cpan/List-Util/t/first.t
rename to cpan/Scalar-List-Utils/t/first.t

diff --git a/cpan/List-Util/t/getmagic-once.t b/cpan/Scalar-List-Utils/t/getmagic-once.t
similarity index 100%
rename from cpan/List-Util/t/getmagic-once.t
rename to cpan/Scalar-List-Utils/t/getmagic-once.t

diff --git a/cpan/List-Util/t/isvstring.t b/cpan/Scalar-List-Utils/t/isvstring.t
similarity index 100%
rename from cpan/List-Util/t/isvstring.t
rename to cpan/Scalar-List-Utils/t/isvstring.t

diff --git a/cpan/List-Util/t/lln.t b/cpan/Scalar-List-Utils/t/lln.t
similarity index 100%
rename from cpan/List-Util/t/lln.t
rename to cpan/Scalar-List-Utils/t/lln.t

diff --git a/cpan/List-Util/t/max.t b/cpan/Scalar-List-Utils/t/max.t
similarity index 100%
rename from cpan/List-Util/t/max.t
rename to cpan/Scalar-List-Utils/t/max.t

diff --git a/cpan/List-Util/t/maxstr.t b/cpan/Scalar-List-Utils/t/maxstr.t
similarity index 100%
rename from cpan/List-Util/t/maxstr.t
rename to cpan/Scalar-List-Utils/t/maxstr.t

diff --git a/cpan/List-Util/t/min.t b/cpan/Scalar-List-Utils/t/min.t
similarity index 100%
rename from cpan/List-Util/t/min.t
rename to cpan/Scalar-List-Utils/t/min.t

diff --git a/cpan/List-Util/t/minstr.t b/cpan/Scalar-List-Utils/t/minstr.t
similarity index 100%
rename from cpan/List-Util/t/minstr.t
rename to cpan/Scalar-List-Utils/t/minstr.t

diff --git a/cpan/List-Util/t/multicall-refcount.t b/cpan/Scalar-List-Utils/t/multicall-refcount.t
similarity index 100%
rename from cpan/List-Util/t/multicall-refcount.t
rename to cpan/Scalar-List-Utils/t/multicall-refcount.t

diff --git a/cpan/List-Util/t/openhan.t b/cpan/Scalar-List-Utils/t/openhan.t
similarity index 100%
rename from cpan/List-Util/t/openhan.t
rename to cpan/Scalar-List-Utils/t/openhan.t

diff --git a/cpan/List-Util/t/pair.t b/cpan/Scalar-List-Utils/t/pair.t
similarity index 100%
rename from cpan/List-Util/t/pair.t
rename to cpan/Scalar-List-Utils/t/pair.t

diff --git a/cpan/List-Util/t/product.t b/cpan/Scalar-List-Utils/t/product.t
similarity index 100%
rename from cpan/List-Util/t/product.t
rename to cpan/Scalar-List-Utils/t/product.t

diff --git a/cpan/List-Util/t/proto.t b/cpan/Scalar-List-Utils/t/proto.t
similarity index 100%
rename from cpan/List-Util/t/proto.t
rename to cpan/Scalar-List-Utils/t/proto.t

diff --git a/cpan/List-Util/t/readonly.t b/cpan/Scalar-List-Utils/t/readonly.t
similarity index 100%
rename from cpan/List-Util/t/readonly.t
rename to cpan/Scalar-List-Utils/t/readonly.t

diff --git a/cpan/List-Util/t/reduce.t b/cpan/Scalar-List-Utils/t/reduce.t
similarity index 100%
rename from cpan/List-Util/t/reduce.t
rename to cpan/Scalar-List-Utils/t/reduce.t

diff --git a/cpan/List-Util/t/refaddr.t b/cpan/Scalar-List-Utils/t/refaddr.t
similarity index 100%
rename from cpan/List-Util/t/refaddr.t
rename to cpan/Scalar-List-Utils/t/refaddr.t

diff --git a/cpan/List-Util/t/reftype.t b/cpan/Scalar-List-Utils/t/reftype.t
similarity index 100%
rename from cpan/List-Util/t/reftype.t
rename to cpan/Scalar-List-Utils/t/reftype.t

diff --git a/cpan/List-Util/t/shuffle.t b/cpan/Scalar-List-Utils/t/shuffle.t
similarity index 100%
rename from cpan/List-Util/t/shuffle.t
rename to cpan/Scalar-List-Utils/t/shuffle.t

diff --git a/cpan/List-Util/t/stack-corruption.t b/cpan/Scalar-List-Utils/t/stack-corruption.t
similarity index 100%
rename from cpan/List-Util/t/stack-corruption.t
rename to cpan/Scalar-List-Utils/t/stack-corruption.t

diff --git a/cpan/List-Util/t/sum.t b/cpan/Scalar-List-Utils/t/sum.t
similarity index 100%
rename from cpan/List-Util/t/sum.t
rename to cpan/Scalar-List-Utils/t/sum.t

diff --git a/cpan/List-Util/t/sum0.t b/cpan/Scalar-List-Utils/t/sum0.t
similarity index 100%
rename from cpan/List-Util/t/sum0.t
rename to cpan/Scalar-List-Utils/t/sum0.t

diff --git a/cpan/List-Util/t/tainted.t b/cpan/Scalar-List-Utils/t/tainted.t
similarity index 100%
rename from cpan/List-Util/t/tainted.t
rename to cpan/Scalar-List-Utils/t/tainted.t

diff --git a/cpan/List-Util/t/weak.t b/cpan/Scalar-List-Utils/t/weak.t
similarity index 100%
rename from cpan/List-Util/t/weak.t
rename to cpan/Scalar-List-Utils/t/weak.t

diff --git a/dist/Cwd/Cwd.pm b/dist/PathTools/Cwd.pm
similarity index 100%
rename from dist/Cwd/Cwd.pm
rename to dist/PathTools/Cwd.pm

diff --git a/dist/Cwd/Cwd.xs b/dist/PathTools/Cwd.xs
similarity index 100%
rename from dist/Cwd/Cwd.xs
rename to dist/PathTools/Cwd.xs

diff --git a/dist/Cwd/Makefile.PL b/dist/PathTools/Makefile.PL
similarity index 100%
rename from dist/Cwd/Makefile.PL
rename to dist/PathTools/Makefile.PL

diff --git a/dist/Cwd/lib/File/Spec.pm b/dist/PathTools/lib/File/Spec.pm
similarity index 100%
rename from dist/Cwd/lib/File/Spec.pm
rename to dist/PathTools/lib/File/Spec.pm

diff --git a/dist/Cwd/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm
similarity index 100%
rename from dist/Cwd/lib/File/Spec/Cygwin.pm
rename to dist/PathTools/lib/File/Spec/Cygwin.pm

diff --git a/dist/Cwd/lib/File/Spec/Epoc.pm b/dist/PathTools/lib/File/Spec/Epoc.pm
similarity index 100%
rename from dist/Cwd/lib/File/Spec/Epoc.pm
rename to dist/PathTools/lib/File/Spec/Epoc.pm

diff --git a/dist/Cwd/lib/File/Spec/Functions.pm b/dist/PathTools/lib/File/Spec/Functions.pm
similarity index 100%
rename from dist/Cwd/lib/File/Spec/Functions.pm
rename to dist/PathTools/lib/File/Spec/Functions.pm

diff --git a/dist/Cwd/lib/File/Spec/Mac.pm b/dist/PathTools/lib/File/Spec/Mac.pm
similarity index 100%
rename from dist/Cwd/lib/File/Spec/Mac.pm
rename to dist/PathTools/lib/File/Spec/Mac.pm

diff --git a/dist/Cwd/lib/File/Spec/OS2.pm b/dist/PathTools/lib/File/Spec/OS2.pm
similarity index 100%
rename from dist/Cwd/lib/File/Spec/OS2.pm
rename to dist/PathTools/lib/File/Spec/OS2.pm

diff --git a/dist/Cwd/lib/File/Spec/Unix.pm b/dist/PathTools/lib/File/Spec/Unix.pm
similarity index 100%
rename from dist/Cwd/lib/File/Spec/Unix.pm
rename to dist/PathTools/lib/File/Spec/Unix.pm

diff --git a/dist/Cwd/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm
similarity index 100%
rename from dist/Cwd/lib/File/Spec/VMS.pm
rename to dist/PathTools/lib/File/Spec/VMS.pm

diff --git a/dist/Cwd/lib/File/Spec/Win32.pm b/dist/PathTools/lib/File/Spec/Win32.pm
similarity index 100%
rename from dist/Cwd/lib/File/Spec/Win32.pm
rename to dist/PathTools/lib/File/Spec/Win32.pm

diff --git a/dist/Cwd/t/Functions.t b/dist/PathTools/t/Functions.t
similarity index 100%
rename from dist/Cwd/t/Functions.t
rename to dist/PathTools/t/Functions.t

diff --git a/dist/Cwd/t/Spec-taint.t b/dist/PathTools/t/Spec-taint.t
similarity index 100%
rename from dist/Cwd/t/Spec-taint.t
rename to dist/PathTools/t/Spec-taint.t

diff --git a/dist/Cwd/t/Spec.t b/dist/PathTools/t/Spec.t
similarity index 100%
rename from dist/Cwd/t/Spec.t
rename to dist/PathTools/t/Spec.t

diff --git a/dist/Cwd/t/crossplatform.t b/dist/PathTools/t/crossplatform.t
similarity index 100%
rename from dist/Cwd/t/crossplatform.t
rename to dist/PathTools/t/crossplatform.t

diff --git a/dist/Cwd/t/cwd.t b/dist/PathTools/t/cwd.t
similarity index 99%
rename from dist/Cwd/t/cwd.t
rename to dist/PathTools/t/cwd.t
index 62426ff..57fd866 100644 (file)
--- a/dist/Cwd/t/cwd.t
+++ b/dist/PathTools/t/cwd.t
@@ -5,6 +5,7 @@ use strict;
 use Cwd;
 
 chdir 't';
+@INC = '../../../lib' if $ENV{PERL_CORE};
 
 use Config;
 use File::Spec;

diff --git a/dist/Cwd/t/rel2abs2rel.t b/dist/PathTools/t/rel2abs2rel.t
similarity index 100%
rename from dist/Cwd/t/rel2abs2rel.t
rename to dist/PathTools/t/rel2abs2rel.t

diff --git a/dist/Cwd/t/taint.t b/dist/PathTools/t/taint.t
similarity index 100%
rename from dist/Cwd/t/taint.t
rename to dist/PathTools/t/taint.t

diff --git a/dist/Cwd/t/tmpdir.t b/dist/PathTools/t/tmpdir.t
similarity index 100%
rename from dist/Cwd/t/tmpdir.t
rename to dist/PathTools/t/tmpdir.t

diff --git a/dist/Cwd/t/win32.t b/dist/PathTools/t/win32.t
similarity index 100%
rename from dist/Cwd/t/win32.t
rename to dist/PathTools/t/win32.t

diff --git a/make_ext.pl b/make_ext.pl
index 55fa5ae..32684a7 100644 (file)
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -232,6 +232,11 @@ foreach my $spec (@extspec)  {
     # Try new style ext/Data-Dumper/ first
     my $copy = $spec;
     $copy =~ tr!/!-!;
+
+    # List/Util.xs lives in Scalar-List-Utils, Cwd.xs lives in PathTools
+    $copy = 'Scalar-List-Utils' if $copy eq 'List-Util';
+    $copy = 'PathTools'         if $copy eq 'Cwd';
+
     foreach my $dir (@ext_dirs) {
        if (-d "$dir/$copy") {
            $ext_pathname = "$dir/$copy";

diff --git a/mkppport.lst b/mkppport.lst
index 3d5a88c..2519e31 100644 (file)
--- a/mkppport.lst
+++ b/mkppport.lst
@@ -7,7 +7,7 @@
 
 cpan/DB_File
 cpan/IPC-SysV
-cpan/List-Util
+cpan/Scalar-List-Utils
 cpan/Time-HiRes
 cpan/Win32API-File
-dist/Cwd
+dist/PathTools

diff --git a/win32/FindExt.pm b/win32/FindExt.pm
index f65e578..6e62838 100644 (file)
--- a/win32/FindExt.pm
+++ b/win32/FindExt.pm
@@ -115,6 +115,10 @@ sub scan_ext
         $this_ext =~ s!-!/!g;
         $leaf =~ s/.*-//;
 
+        # List/Util.xs lives in Scalar-List-Utils, Cwd.xs lives in PathTools
+        $this_ext = 'List/Util' if $this_ext eq 'Scalar/List/Utils';
+        $this_ext = 'Cwd'       if $this_ext eq 'PathTools';
+
        # Temporary hack to cope with smokers that are not clearing directories:
         next if $ext{$this_ext};
 

diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl
index 73bf8f0..df74fc4 100644 (file)
--- a/write_buildcustomize.pl
+++ b/write_buildcustomize.pl
@@ -20,7 +20,7 @@ my $file = 'lib/buildcustomize.pl';
 
 my @toolchain = qw(cpan/AutoLoader/lib
                   dist/Carp/lib
-                  dist/Cwd dist/Cwd/lib
+                  dist/PathTools dist/PathTools/lib
                   dist/ExtUtils-Command/lib
                   dist/ExtUtils-Install/lib
                   cpan/ExtUtils-MakeMaker/lib