Move PathTools from cpan/ to dist/

diff --git a/MANIFEST b/MANIFEST
index d5bce25..89b3f96 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -438,26 +438,6 @@ cpan/CPAN/t/02nox.t                See if CPAN::Nox works
 cpan/CPAN/t/03pkgs.t           See if CPAN::Version works
 cpan/CPAN/t/10version.t                See if CPAN the module works
 cpan/CPAN/t/11mirroredby.t             See if CPAN::Mirrored::By works
-cpan/Cwd/Changes                       Cwd extension Changelog
-cpan/Cwd/Cwd.pm                                Various cwd routines (getcwd, fastcwd, chdir)
-cpan/Cwd/Cwd.xs                                Cwd extension external subroutines
-cpan/Cwd/lib/File/Spec/Cygwin.pm       portable operations on Cygwin file names
-cpan/Cwd/lib/File/Spec/Epoc.pm         portable operations on EPOC file names
-cpan/Cwd/lib/File/Spec/Functions.pm    Function interface to File::Spec object methods
-cpan/Cwd/lib/File/Spec/Mac.pm          portable operations on Mac file names
-cpan/Cwd/lib/File/Spec/OS2.pm          portable operations on OS2 file names
-cpan/Cwd/lib/File/Spec.pm              portable operations on file names
-cpan/Cwd/lib/File/Spec/Unix.pm         portable operations on Unix file names
-cpan/Cwd/lib/File/Spec/VMS.pm          portable operations on VMS file names
-cpan/Cwd/lib/File/Spec/Win32.pm                portable operations on Win32 and NetWare file names
-cpan/Cwd/t/crossplatform.t             See if File::Spec works crossplatform
-cpan/Cwd/t/cwd.t                       See if Cwd works
-cpan/Cwd/t/Functions.t                 See if File::Spec::Functions works
-cpan/Cwd/t/rel2abs2rel.t               See if File::Spec->rel2abs/abs2rel works
-cpan/Cwd/t/Spec.t                      See if File::Spec works
-cpan/Cwd/t/taint.t                     See if Cwd works with taint
-cpan/Cwd/t/tmpdir.t                    See if File::Spec->tmpdir() works
-cpan/Cwd/t/win32.t                     See if Cwd works on Win32
 cpan/DB_File/Changes           Berkeley DB extension change log
 cpan/DB_File/config.in         Part of Berkeley DB configuration
 cpan/DB_File/DB_File_BS                Berkeley DB extension mkbootstrap fodder
@@ -2635,6 +2615,26 @@ dist/B-Deparse/Deparse.pm        Compiler Deparse backend
 dist/B-Deparse/t/deparse.t     See if B::Deparse works
 dist/constant/lib/constant.pm  For "use constant"
 dist/constant/t/constant.t     See if compile-time constants work
+dist/Cwd/Changes                       Cwd extension Changelog
+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/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/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

diff --git a/Makefile.SH b/Makefile.SH
index 36be355..e8ed3fa 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -484,7 +484,7 @@ obj = $(ndt_obj) $(DTRACE_O)
 perltoc_pod_prereqs = extra.pods pod/perlapi.pod pod/perldelta.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
 generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
 
-Icwd = -Icpan/Cwd -Icpan/Cwd/lib
+Icwd = -Idist/Cwd -Idist/Cwd/lib
 
 lintflags = \
     -b \

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index d115f3b..09a2408 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1060,13 +1060,14 @@ use File::Glob qw(:case);
     'PathTools' =>
        {
        'MAINTAINER'    => 'kwilliams',
-       'DISTRIBUTION'  => 'SMUELLER/PathTools-3.31.tar.gz',
-       'FILES'         => q[cpan/Cwd],
+       'DISTRIBUTION'  => 'SMUELLER/PathTools-3.31_02.tar.gz',
+       'FILES'         => q[dist/Cwd],
        'EXCLUDED'      => [ qr{^t/lib/Test/} ],
-       'UPSTREAM'      => "cpan",
-       # NOTE: PathTools is in cpan/Cwd/ 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.
+       'UPSTREAM'      => "blead",
+       # 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.
        },
 
     'perlebcdic' =>

diff --git a/README.cygwin b/README.cygwin
index 3933e56..6ea257a 100644 (file)
--- a/README.cygwin
+++ b/README.cygwin
@@ -565,15 +565,15 @@ be kept as clean as possible.
   pod/perl590delta.pod pod/perlhist.pod pod/perlmodlib.pod
   pod/perltoc.pod pod.lst Porting/Glossary pod/perlrepository.pod
   Porting/checkAUTHORS.pl
-  ext/Compress-Raw-Zlib/Changes ext/Compress-Raw-Zlib/README
-  ext/Compress-Zlib/Changes cpan/Cwd/Changes ext/DB_File/Changes
-  ext/Encode/Changes ext/Sys-Syslog/Changes ext/Time-HiRes/Changes
-  ext/Win32API-File/Changes lib/CGI/Changes lib/ExtUtils/CBuilder/Changes
-  lib/ExtUtils/Changes lib/ExtUtils/NOTES lib/ExtUtils/PATCHING
-  lib/ExtUtils/README lib/Module/Build/Changes lib/Net/Ping/Changes
-  lib/Test/Harness/Changes
-  lib/Term/ANSIColor/ChangeLog lib/Term/ANSIColor/README
-  README.symbian symbian/TODO
+  dist/Cwd/Changes ext/Compress-Raw-Zlib/Changes
+  ext/Compress-Raw-Zlib/README ext/Compress-Zlib/Changes
+  ext/DB_File/Changes ext/Encode/Changes ext/Sys-Syslog/Changes
+  ext/Time-HiRes/Changes ext/Win32API-File/Changes lib/CGI/Changes
+  lib/ExtUtils/CBuilder/Changes lib/ExtUtils/Changes lib/ExtUtils/NOTES
+  lib/ExtUtils/PATCHING lib/ExtUtils/README lib/Module/Build/Changes
+  lib/Net/Ping/Changes lib/Test/Harness/Changes
+  lib/Term/ANSIColor/ChangeLog lib/Term/ANSIColor/README README.symbian
+  symbian/TODO
 
 =item Build, Configure, Make, Install
 
@@ -714,8 +714,8 @@ be kept as clean as possible.
 
 =item Perl Module Tests
 
+  dist/Cwd/t/cwd.t
   ext/Compress-Zlib/t/14gzopen.t
-  cpan/Cwd/t/cwd.t
   ext/DB_File/t/db-btree.t
   ext/DB_File/t/db-hash.t
   ext/DB_File/t/db-recno.t

diff --git a/README.qnx b/README.qnx
index 0ad269a..cf9dc1f 100644 (file)
--- a/README.qnx
+++ b/README.qnx
@@ -86,7 +86,7 @@ they both point to the correct library, that is,
 
 The following tests may report errors under QNX4:
 
-cpan/Cwd/Cwd.t will complain if `pwd` and cwd don't give
+dist/Cwd/Cwd.t will complain if `pwd` and cwd don't give
 the same results. cwd calls `fullpath -t`, so if you
 cd `fullpath -t` before running the test, it will
 pass.

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

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

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

diff --git a/cpan/Cwd/lib/File/Spec.pm b/dist/Cwd/lib/File/Spec.pm
similarity index 99%
rename from cpan/Cwd/lib/File/Spec.pm
rename to dist/Cwd/lib/File/Spec.pm
index 9caf4eb..f0b6f52 100644 (file)
--- a/cpan/Cwd/lib/File/Spec.pm
+++ b/dist/Cwd/lib/File/Spec.pm
@@ -214,7 +214,7 @@ The results can be passed to L</catpath()> to get back a path equivalent to
 =item splitdir
 X<splitdir> X<split, dir>
 
-The opposite of L</catdir()>.
+The opposite of L</catdir>.
 
     @dirs = File::Spec->splitdir( $directories );
 
@@ -289,7 +289,7 @@ On systems that have a grammar that indicates filenames, this ignores the
 C<$base> filename as well. Otherwise all path components are assumed to be
 directories.
 
-If C<$path> is absolute, it is cleaned up and returned using L</canonpath()>.
+If C<$path> is absolute, it is cleaned up and returned using L</canonpath>.
 
 No checks against the filesystem are made.  On VMS, there is
 interaction with the working environment, as logicals and

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/hints/qnx.sh b/hints/qnx.sh
index f7f8053..f4f1f25 100644 (file)
--- a/hints/qnx.sh
+++ b/hints/qnx.sh
@@ -55,7 +55,7 @@
 #   they both point to the correct library, that is,
 #   /usr/tcptk/current/usr/lib/socket3r.lib.
 # 
-#   cpan/Cwd/Cwd.t will complain if `pwd` and cwd don't give
+#   dist/Cwd/Cwd.t will complain if `pwd` and cwd don't give
 #   the same results. cwd calls `fullpath -t`, so if you
 #   cd `fullpath -t` before running the test, it will
 #   pass.

diff --git a/hints/uwin.sh b/hints/uwin.sh
index b73b305..6ee9821 100644 (file)
--- a/hints/uwin.sh
+++ b/hints/uwin.sh
@@ -123,7 +123,7 @@ usevfork=false
 
 #          got: '/E/users/jpl/src/cmd/perl/t'
 #     expected: '/e/users/jpl/src/cmd/perl/t'
-#     Failed test (../cpan/Cwd/t/cwd.t at line 88)
+#     Failed test (../dist/Cwd/t/cwd.t at line 88)
 
 # when running tests under harness, try the simple expedient of
 # changing to directory

diff --git a/make_ext.pl b/make_ext.pl
index de26d84..11f1194 100644 (file)
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -4,12 +4,12 @@ use warnings;
 use Config;
 BEGIN {
     if ($^O eq 'MSWin32') {
-       unshift @INC, ('../cpan/Cwd', '../cpan/Cwd/lib');
+       unshift @INC, ('../dist/Cwd', '../dist/Cwd/lib');
        require File::Spec::Functions;
        require FindExt;
     }
     else {
-       unshift @INC, 'cpan/Cwd';
+       unshift @INC, 'dist/Cwd';
     }
 }
 use Cwd;
@@ -28,7 +28,7 @@ my $is_Unix = !$is_Win32 && !$is_VMS;
 # This list cannot get any longer without overflowing the length limit for
 # environment variables on VMS
 my @toolchain = qw(cpan/AutoLoader/lib
-                  cpan/Cwd cpan/Cwd/lib
+                  dist/Cwd dist/Cwd/lib
                   cpan/ExtUtils-Command/lib
                   dist/ExtUtils-Install/lib
                   cpan/ExtUtils-MakeMaker/lib

diff --git a/mkppport.lst b/mkppport.lst
index 94b4129..57b9b9e 100644 (file)
--- a/mkppport.lst
+++ b/mkppport.lst
@@ -5,8 +5,8 @@
 # This file is read by mkppport at build time.
 #
 
-cpan/Cwd
 cpan/DB_File
 cpan/IPC-SysV
 cpan/Time-HiRes
 cpan/Win32API-File
+dist/Cwd

diff --git a/t/TEST b/t/TEST
index 92c9bf5..15e2feb 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -33,7 +33,6 @@ my %abs = (
           '../cpan/AutoLoader' => 1,
           '../cpan/CPAN' => 1,
           '../cpan/Class-ISA' => 1,
-          '../cpan/Cwd' => 1,
           '../cpan/Devel-PPPort' => 1,
           '../cpan/Encode' => 1,
           '../cpan/ExtUtils-Command' => 1,
@@ -62,8 +61,9 @@ my %abs = (
           '../cpan/bignum' => 1,
           '../cpan/podlators' => 1,
           '../dist/ExtUtils-Install' => 1,
+          '../dist/Cwd' => 1,
          );
-             
+
 my %temp_no_core =
     ('../cpan/B-Debug' => 1,
      '../cpan/Compress-Raw-Bzip2' => 1,

diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index 25f5075..9047b62 100644 (file)
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -241,7 +241,7 @@ NOOP = continue
 # Macros to invoke a copy of miniperl during the build.  Targets which
 # are built using these macros should depend on $(MINIPERL_EXE)
 MINIPERL_EXE = Sys$Disk:[]miniperl$(E)
-MINIPERL = MCR $(MINIPERL_EXE) "-I[.lib]" "-I[.cpan.Cwd]" "-I[.cpan.Cwd.lib]"
+MINIPERL = MCR $(MINIPERL_EXE) "-I[.lib]" "-I[.dist.Cwd]" "-I[.dist.Cwd.lib]"
 MINIPERLQ = MCR $(MINIPERL_EXE) ""-I[.lib]""
 XSUBPP = $(MINIPERL) "-I[.ext.re]" [.lib.extutils]xsubpp -noprototypes
 # Macro to invoke a preexisting copy of Perl.  This is used to regenerate

diff --git a/win32/Makefile b/win32/Makefile
index 500d42a..2f7c55f 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -807,7 +807,7 @@ CFG_VARS    =                                       \
                "LINK_FLAGS=$(LINK_FLAGS:"=\")"         \
                "optimize=$(OPTIMIZE:"=\")"
 
-ICWD = -I..\cpan\Cwd -I..\cpan\Cwd\lib
+ICWD = -I..\dist\Cwd -I..\dist\Cwd\lib
 
 #
 # Top targets
@@ -1234,7 +1234,7 @@ inst_lib : $(CONFIGPM)
 
 $(UNIDATAFILES) ..\pod\perluniprops.pod : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs
        cd ..\lib\unicore && \
-       ..\$(MINIPERL) -I.. -I..\..\cpan\Cwd\lib -I..\..\cpan\Cwd mktables -P ..\..\pod -maketest -makelist -p -check $@ $(FIRSTUNIFILE)
+       ..\$(MINIPERL) -I.. -I..\..\dist\Cwd\lib -I..\..\dist\Cwd mktables -P ..\..\pod -maketest -makelist -p -check $@ $(FIRSTUNIFILE)
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils $(UNIDATAFILES)
        $(XCOPY) $(MINIPERL) ..\t\$(NULL)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index c7053ff..01c177a 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1041,7 +1041,7 @@ ODBCCP32_DLL = $(SystemRoot)\system32\odbccp32.dll
 ODBCCP32_DLL = $(windir)\system\odbccp32.dll
 .ENDIF
 
-ICWD = -I..\cpan\Cwd -I..\cpan\Cwd\lib
+ICWD = -I..\dist\Cwd -I..\dist\Cwd\lib
 
 #
 # Top targets
@@ -1611,7 +1611,7 @@ inst_lib : $(CONFIGPM)
 
 $(UNIDATAFILES) ..\pod\perluniprops.pod .UPDATEALL : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs
        cd ..\lib\unicore && \
-       ..\$(MINIPERL) -I.. -I..\..\cpan\Cwd\lib -I..\..\cpan\Cwd mktables -P ..\..\pod -maketest -makelist -p
+       ..\$(MINIPERL) -I.. -I..\..\dist\Cwd\lib -I..\..\dist\Cwd mktables -P ..\..\pod -maketest -makelist -p
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils
        $(XCOPY) $(MINIPERL) ..\t\$(NULL)

diff --git a/win32/pod.mak b/win32/pod.mak
index fab1b2d..d3de5d5 100644 (file)
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -14,7 +14,7 @@ converters: $(CONVERTERS)
 PERL = ..\miniperl.exe
 REALPERL = ..\perl.exe
 
-ICWD = -I..\cpan\Cwd
+ICWD = -I..\dist\Cwd
 
 POD = \
        perl.pod        \