diff options
| -rw-r--r-- | MANIFEST | 42 | ||||
| -rw-r--r-- | Makefile.SH | 2 | ||||
| -rwxr-xr-x | Porting/Maintainers.pl | 11 | ||||
| -rw-r--r-- | ext/Cwd/lib/File/Spec.pm (renamed from lib/File/Spec.pm) | 0 | ||||
| -rw-r--r-- | ext/Cwd/lib/File/Spec/Cygwin.pm (renamed from lib/File/Spec/Cygwin.pm) | 0 | ||||
| -rw-r--r-- | ext/Cwd/lib/File/Spec/Epoc.pm (renamed from lib/File/Spec/Epoc.pm) | 0 | ||||
| -rw-r--r-- | ext/Cwd/lib/File/Spec/Functions.pm (renamed from lib/File/Spec/Functions.pm) | 0 | ||||
| -rw-r--r-- | ext/Cwd/lib/File/Spec/Mac.pm (renamed from lib/File/Spec/Mac.pm) | 0 | ||||
| -rw-r--r-- | ext/Cwd/lib/File/Spec/OS2.pm (renamed from lib/File/Spec/OS2.pm) | 0 | ||||
| -rw-r--r-- | ext/Cwd/lib/File/Spec/Unix.pm (renamed from lib/File/Spec/Unix.pm) | 0 | ||||
| -rw-r--r-- | ext/Cwd/lib/File/Spec/VMS.pm (renamed from lib/File/Spec/VMS.pm) | 0 | ||||
| -rw-r--r-- | ext/Cwd/lib/File/Spec/Win32.pm (renamed from lib/File/Spec/Win32.pm) | 0 | ||||
| -rw-r--r-- | ext/Cwd/t/Functions.t (renamed from lib/File/Spec/t/Functions.t) | 0 | ||||
| -rw-r--r-- | ext/Cwd/t/Spec.t (renamed from lib/File/Spec/t/Spec.t) | 0 | ||||
| -rw-r--r-- | ext/Cwd/t/crossplatform.t (renamed from lib/File/Spec/t/crossplatform.t) | 0 | ||||
| -rw-r--r-- | ext/Cwd/t/rel2abs2rel.t (renamed from lib/File/Spec/t/rel2abs2rel.t) | 0 | ||||
| -rw-r--r-- | ext/Cwd/t/tmpdir.t (renamed from lib/File/Spec/t/tmpdir.t) | 0 | ||||
| -rw-r--r-- | make_ext.pl | 2 | ||||
| -rw-r--r-- | vms/descrip_mms.template | 2 | ||||
| -rw-r--r-- | win32/Makefile | 4 | ||||
| -rw-r--r-- | win32/makefile.mk | 4 |
21 files changed, 29 insertions, 38 deletions
@@ -554,13 +554,27 @@ ext/CPAN/t/02nox.t See if CPAN::Nox works ext/CPAN/t/03pkgs.t See if CPAN::Version works ext/CPAN/t/10version.t See if CPAN the module works ext/CPAN/t/11mirroredby.t See if CPAN::Mirrored::By works -ext/Cwd/Changes Cwd extension Changelog -ext/Cwd/Cwd.pm Various cwd routines (getcwd, fastcwd, chdir) -ext/Cwd/Cwd.xs Cwd extension external subroutines -ext/Cwd/Makefile.PL Cwd extension makefile maker -ext/Cwd/t/cwd.t See if Cwd works -ext/Cwd/t/taint.t See if Cwd works with taint -ext/Cwd/t/win32.t See if Cwd works on Win32 +ext/Cwd/Changes Cwd extension Changelog +ext/Cwd/Cwd.pm Various cwd routines (getcwd, fastcwd, chdir) +ext/Cwd/Cwd.xs Cwd extension external subroutines +ext/Cwd/lib/File/Spec/Cygwin.pm portable operations on Cygwin file names +ext/Cwd/lib/File/Spec/Epoc.pm portable operations on EPOC file names +ext/Cwd/lib/File/Spec/Functions.pm Function interface to File::Spec object methods +ext/Cwd/lib/File/Spec/Mac.pm portable operations on Mac file names +ext/Cwd/lib/File/Spec/OS2.pm portable operations on OS2 file names +ext/Cwd/lib/File/Spec.pm portable operations on file names +ext/Cwd/lib/File/Spec/Unix.pm portable operations on Unix file names +ext/Cwd/lib/File/Spec/VMS.pm portable operations on VMS file names +ext/Cwd/lib/File/Spec/Win32.pm portable operations on Win32 and NetWare file names +ext/Cwd/Makefile.PL Cwd extension makefile maker +ext/Cwd/t/crossplatform.t See if File::Spec works crossplatform +ext/Cwd/t/cwd.t See if Cwd works +ext/Cwd/t/Functions.t See if File::Spec::Functions works +ext/Cwd/t/rel2abs2rel.t See if File::Spec->rel2abs/abs2rel works +ext/Cwd/t/Spec.t See if File::Spec works +ext/Cwd/t/taint.t See if Cwd works with taint +ext/Cwd/t/tmpdir.t See if File::Spec->tmpdir() works +ext/Cwd/t/win32.t See if Cwd works on Win32 ext/Data-Dumper/Changes Data pretty printer, changelog ext/Data-Dumper/Dumper.pm Data pretty printer, module ext/Data-Dumper/Dumper.xs Data pretty printer, externals @@ -3396,20 +3410,6 @@ lib/File/Find/t/find.t See if File::Find works lib/File/Find/t/taint.t See if File::Find works with taint lib/FileHandle.pm Backward-compatible front end to IO extension lib/FileHandle.t See if FileHandle works -lib/File/Spec/Cygwin.pm portable operations on Cygwin file names -lib/File/Spec/Epoc.pm portable operations on EPOC file names -lib/File/Spec/Functions.pm Function interface to File::Spec object methods -lib/File/Spec/Mac.pm portable operations on Mac file names -lib/File/Spec/OS2.pm portable operations on OS2 file names -lib/File/Spec.pm portable operations on file names -lib/File/Spec/t/crossplatform.t See if File::Spec works crossplatform -lib/File/Spec/t/Functions.t See if File::Spec::Functions works -lib/File/Spec/t/rel2abs2rel.t See if File::Spec->rel2abs/abs2rel works -lib/File/Spec/t/Spec.t See if File::Spec works -lib/File/Spec/t/tmpdir.t See if File::Spec->tmpdir() works -lib/File/Spec/Unix.pm portable operations on Unix file names -lib/File/Spec/VMS.pm portable operations on VMS file names -lib/File/Spec/Win32.pm portable operations on Win32 and NetWare file names lib/File/stat.pm By-name interface to Perl's builtin stat lib/File/stat.t See if File::stat works lib/filetest.pm For "use filetest" diff --git a/Makefile.SH b/Makefile.SH index a04995323d..b29542aa81 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -468,7 +468,7 @@ obj = $(ndt_obj) $(DTRACE_O) perltoc_pod_prereqs = extra.pods pod/perlapi.pod pod/perldelta.pod pod/perlintern.pod pod/perlmodlib.pod generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs) -Icwd = -Iext/Cwd +Icwd = -Iext/Cwd -Iext/Cwd/lib lintflags = \ -b \ diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 18e3d4ee59..ca00b58149 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1120,9 +1120,7 @@ use File::Glob qw(:case); { 'MAINTAINER' => 'kwilliams', 'DISTRIBUTION' => 'SMUELLER/PathTools-3.30.tar.gz', - 'FILES' => q[lib/File/Spec.pm - lib/File/Spec - ext/Cwd + 'FILES' => q[ext/Cwd ], # XXX note that the CPAN and blead Makefile.PL are totally # unrelated. The blead one is described as 'core-only'. @@ -1130,13 +1128,6 @@ use File::Glob qw(:case); # to harmonize them? 'EXCLUDED' => [ qr{^t/lib/Test/} ], - 'MAP' => { 'lib/' => 'lib/', - '' => 'ext/Cwd/', - 't/' => 'lib/File/Spec/t/', - 't/cwd.t' => 'ext/Cwd/t/cwd.t', - 't/taint.t' => 'ext/Cwd/t/taint.t', - 't/win32.t' => 'ext/Cwd/t/win32.t', - }, 'CPAN' => 1, 'UPSTREAM' => "cpan", }, diff --git a/lib/File/Spec.pm b/ext/Cwd/lib/File/Spec.pm index 839e2aada2..839e2aada2 100644 --- a/lib/File/Spec.pm +++ b/ext/Cwd/lib/File/Spec.pm diff --git a/lib/File/Spec/Cygwin.pm b/ext/Cwd/lib/File/Spec/Cygwin.pm index 050a1bb2b7..050a1bb2b7 100644 --- a/lib/File/Spec/Cygwin.pm +++ b/ext/Cwd/lib/File/Spec/Cygwin.pm diff --git a/lib/File/Spec/Epoc.pm b/ext/Cwd/lib/File/Spec/Epoc.pm index 54ff667c52..54ff667c52 100644 --- a/lib/File/Spec/Epoc.pm +++ b/ext/Cwd/lib/File/Spec/Epoc.pm diff --git a/lib/File/Spec/Functions.pm b/ext/Cwd/lib/File/Spec/Functions.pm index e7becc7cfa..e7becc7cfa 100644 --- a/lib/File/Spec/Functions.pm +++ b/ext/Cwd/lib/File/Spec/Functions.pm diff --git a/lib/File/Spec/Mac.pm b/ext/Cwd/lib/File/Spec/Mac.pm index 8b47470d6b..8b47470d6b 100644 --- a/lib/File/Spec/Mac.pm +++ b/ext/Cwd/lib/File/Spec/Mac.pm diff --git a/lib/File/Spec/OS2.pm b/ext/Cwd/lib/File/Spec/OS2.pm index a8fa63e3c1..a8fa63e3c1 100644 --- a/lib/File/Spec/OS2.pm +++ b/ext/Cwd/lib/File/Spec/OS2.pm diff --git a/lib/File/Spec/Unix.pm b/ext/Cwd/lib/File/Spec/Unix.pm index 8fd2320a39..8fd2320a39 100644 --- a/lib/File/Spec/Unix.pm +++ b/ext/Cwd/lib/File/Spec/Unix.pm diff --git a/lib/File/Spec/VMS.pm b/ext/Cwd/lib/File/Spec/VMS.pm index 34b592abbf..34b592abbf 100644 --- a/lib/File/Spec/VMS.pm +++ b/ext/Cwd/lib/File/Spec/VMS.pm diff --git a/lib/File/Spec/Win32.pm b/ext/Cwd/lib/File/Spec/Win32.pm index 93301ac735..93301ac735 100644 --- a/lib/File/Spec/Win32.pm +++ b/ext/Cwd/lib/File/Spec/Win32.pm diff --git a/lib/File/Spec/t/Functions.t b/ext/Cwd/t/Functions.t index 457f53cb6f..457f53cb6f 100644 --- a/lib/File/Spec/t/Functions.t +++ b/ext/Cwd/t/Functions.t diff --git a/lib/File/Spec/t/Spec.t b/ext/Cwd/t/Spec.t index 0c629bfa79..0c629bfa79 100644 --- a/lib/File/Spec/t/Spec.t +++ b/ext/Cwd/t/Spec.t diff --git a/lib/File/Spec/t/crossplatform.t b/ext/Cwd/t/crossplatform.t index b7c76fc1af..b7c76fc1af 100644 --- a/lib/File/Spec/t/crossplatform.t +++ b/ext/Cwd/t/crossplatform.t diff --git a/lib/File/Spec/t/rel2abs2rel.t b/ext/Cwd/t/rel2abs2rel.t index 0959d574b9..0959d574b9 100644 --- a/lib/File/Spec/t/rel2abs2rel.t +++ b/ext/Cwd/t/rel2abs2rel.t diff --git a/lib/File/Spec/t/tmpdir.t b/ext/Cwd/t/tmpdir.t index 6adad18cb9..6adad18cb9 100644 --- a/lib/File/Spec/t/tmpdir.t +++ b/ext/Cwd/t/tmpdir.t diff --git a/make_ext.pl b/make_ext.pl index 92639457dd..373f739de3 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -14,7 +14,7 @@ use Cwd; # After which, all nonxs modules are in lib, which was always sufficient to # allow miniperl to build everything else. -my @toolchain = qw(ext/constant/lib ext/Cwd ext/ExtUtils-Command/lib +my @toolchain = qw(ext/constant/lib ext/Cwd ext/Cwd/lib ext/ExtUtils-Command/lib ext/ExtUtils-Install/lib ext/ExtUtils-MakeMaker/lib ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib ext/File-Path/lib ext/AutoLoader/lib); diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index 8a2f2d9aa4..b4e14788ab 100644 --- 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[.ext.Cwd]" +MINIPERL = MCR $(MINIPERL_EXE) "-I[.lib]" "-I[.ext.Cwd]" "-I[.ext.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 e3348f5c63..77ac9b2e82 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -650,7 +650,7 @@ DEL = del # # filenames given to xsubpp must have forward slashes (since it puts # full pathnames in #line strings) -XSUBPP = ..\$(MINIPERL) -I..\..\lib -I..\Cwd ..\$(EXTUTILSDIR)\xsubpp \ +XSUBPP = ..\$(MINIPERL) -I..\..\lib -I..\Cwd -I..\Cwd\lib ..\$(EXTUTILSDIR)\xsubpp \ -C++ -prototypes MICROCORE_SRC = \ @@ -829,7 +829,7 @@ CFG_VARS = \ "LINK_FLAGS=$(LINK_FLAGS:"=\")" \ "optimize=$(OPTIMIZE:"=\")" -ICWD = -I..\ext\Cwd +ICWD = -I..\ext\Cwd -I..\ext\Cwd\lib # # Top targets diff --git a/win32/makefile.mk b/win32/makefile.mk index 1498ea0420..e683091819 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -811,7 +811,7 @@ NOOP = @rem # # filenames given to xsubpp must have forward slashes (since it puts # full pathnames in #line strings) -XSUBPP = ..\$(MINIPERL) -I..\..\lib -I..\Cwd ..\$(EXTUTILSDIR)\xsubpp \ +XSUBPP = ..\$(MINIPERL) -I..\..\lib -I..\Cwd -I..\Cwd\lib ..\$(EXTUTILSDIR)\xsubpp \ -C++ -prototypes MICROCORE_SRC = \ @@ -1019,7 +1019,7 @@ ODBCCP32_DLL = $(SystemRoot)\system32\odbccp32.dll ODBCCP32_DLL = $(windir)\system\odbccp32.dll .ENDIF -ICWD = -I..\ext\Cwd +ICWD = -I..\ext\Cwd -I..\ext\Cwd\lib # # Top targets |