diff options
| -rw-r--r-- | MANIFEST | 10 | ||||
| -rw-r--r-- | configure.com | 2 | ||||
| -rw-r--r-- | ext/Filter/Util/Call/Call.pm (renamed from ext/Filter/Util/Call.pm) | 0 | ||||
| -rw-r--r-- | ext/Filter/Util/Call/Call.xs (renamed from ext/Filter/Util/Call.xs) | 0 | ||||
| -rw-r--r-- | ext/Filter/Util/Call/Makefile.PL (renamed from ext/Filter/Util/Makefile.PL) | 0 | ||||
| -rw-r--r-- | hints/uwin.sh | 2 | ||||
| -rw-r--r-- | hints/vmesa.sh | 2 | ||||
| -rw-r--r-- | t/lib/filter-util.pl (renamed from t/lib/filt-util.pl) | 0 | ||||
| -rw-r--r-- | t/lib/filter-util.t (renamed from t/lib/filt-util.t) | 6 | ||||
| -rw-r--r-- | win32/Makefile | 14 | ||||
| -rw-r--r-- | win32/makefile.mk | 13 |
11 files changed, 25 insertions, 24 deletions
@@ -287,9 +287,9 @@ ext/File/Glob/Makefile.PL File::Glob extension makefile writer ext/File/Glob/TODO File::Glob extension todo list ext/File/Glob/bsd_glob.c File::Glob extension run time code ext/File/Glob/bsd_glob.h File::Glob extension header file -ext/Filter/Util/Call.pm Filter::Util::Call extension module -ext/Filter/Util/Call.xs Filter::Util::Call extension external subroutines -ext/Filter/Util/Makefile.PL Filter::Util::Call extension makefile writer +ext/Filter/Util/Call/Call.pm Filter::Util::Call extension module +ext/Filter/Util/Call/Call.xs Filter::Util::Call extension external subroutines +ext/Filter/Util/Call/Makefile.PL Filter::Util::Call extension makefile writer ext/GDBM_File/GDBM_File.pm GDBM extension Perl module ext/GDBM_File/GDBM_File.xs GDBM extension external subroutines ext/GDBM_File/Makefile.PL GDBM extension makefile writer @@ -1388,8 +1388,8 @@ t/lib/filefunc.t See if File::Spec::Functions works t/lib/filehand.t See if FileHandle works t/lib/filepath.t See if File::Path works t/lib/filespec.t See if File::Spec works -t/lib/filt-util.t See if Filter::Util::Call works -t/lib/filt-util.pl See if Filter::Util::Call works +t/lib/filter-util.t See if Filter::Util::Call works +t/lib/filter-util.pl See if Filter::Util::Call works t/lib/findbin.t See if FindBin works t/lib/ftmp-mktemp.t See if File::Temp works t/lib/ftmp-posix.t See if File::Temp works diff --git a/configure.com b/configure.com index 22678cecfe..5b8ccbc302 100644 --- a/configure.com +++ b/configure.com @@ -2368,7 +2368,7 @@ $ echo "SDBM_File if you have the GDBM library built on your machine." $ echo "" $ echo "Which modules do you want to build into perl?" $! we need to add Byteloader to this list: -$ dflt = "re Fcntl Encode Errno File::Glob Filter::Util IO Opcode Devel::Peek Devel::DProf Data::Dumper attrs VMS::Stdio VMS::DCLsym B SDBM_File Storable Thread Sys::Hostname" +$ dflt = "re Fcntl Encode Errno File::Glob Filter::Util::Call IO Opcode Devel::Peek Devel::DProf Data::Dumper attrs VMS::Stdio VMS::DCLsym B SDBM_File Storable Thread Sys::Hostname" $ IF Using_Dec_C .OR. using_cxx $ THEN $ dflt = dflt + " POSIX" diff --git a/ext/Filter/Util/Call.pm b/ext/Filter/Util/Call/Call.pm index 8d8d1254f6..8d8d1254f6 100644 --- a/ext/Filter/Util/Call.pm +++ b/ext/Filter/Util/Call/Call.pm diff --git a/ext/Filter/Util/Call.xs b/ext/Filter/Util/Call/Call.xs index c8105d0d43..c8105d0d43 100644 --- a/ext/Filter/Util/Call.xs +++ b/ext/Filter/Util/Call/Call.xs diff --git a/ext/Filter/Util/Makefile.PL b/ext/Filter/Util/Call/Makefile.PL index 030dbc2d31..030dbc2d31 100644 --- a/ext/Filter/Util/Makefile.PL +++ b/ext/Filter/Util/Call/Makefile.PL diff --git a/hints/uwin.sh b/hints/uwin.sh index 0b2cf9d3a0..9141efcd13 100644 --- a/hints/uwin.sh +++ b/hints/uwin.sh @@ -24,7 +24,7 @@ i_utime=undef # compile/link flags ldflags=-g optimize=-g -static_ext="B Data/Dumper Fcntl IO IPC/SysV Opcode POSIX SDBM_File Socket Storable attrs" +static_ext="B Data/Dumper Fcntl Filter::Util::Call IO IPC/SysV Opcode POSIX SDBM_File Socket Storable attrs" #static_ext=none # dynamic loading needs work usedl=undef diff --git a/hints/vmesa.sh b/hints/vmesa.sh index 2b3dd285d9..81ab6a4f44 100644 --- a/hints/vmesa.sh +++ b/hints/vmesa.sh @@ -218,7 +218,7 @@ dynamic_ext='' eagain='EAGAIN' ebcdic='define' exe_ext='' -extensions='Fcntl GDBM_File IO NDBM_File Opcode POSIX Socket Storable IPC/SysV Errno Thread attrs re Data/Dumper' +extensions=' Data/Dumper Errno Fcntl Filter::Util:Call GDBM_File IO NDBM_File Opcode POSIX Socket Storable IPC/SysV Thread attrs re' fpostype='fpos_t' freetype='void' groupstype='gid_t' diff --git a/t/lib/filt-util.pl b/t/lib/filter-util.pl index 1615873bc9..1615873bc9 100644 --- a/t/lib/filt-util.pl +++ b/t/lib/filter-util.pl diff --git a/t/lib/filt-util.t b/t/lib/filter-util.t index 78f47b8b3c..1ec2b8b4c6 100644 --- a/t/lib/filt-util.t +++ b/t/lib/filter-util.t @@ -3,11 +3,11 @@ BEGIN { @INC = '.'; push @INC, '../lib'; require Config; import Config; - if ($Config{'extensions'} !~ m{\bFilter/Util\b}) { - print "1..0 # Skip: Filter::Util was not built\n"; + if ($Config{'extensions'} !~ m{\bFilter/Util/Call\b}) { + print "1..0 # Skip: Filter::Util::Call was not built\n"; exit 0; } - require 'lib/filt-util.pl'; + require 'lib/filter-util.pl'; } print "1..28\n" ; diff --git a/win32/Makefile b/win32/Makefile index 3315905747..ae9f6c90a4 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -614,7 +614,7 @@ SETARGV_OBJ = setargv$(o) DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \ Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \ - Sys/Hostname Storable Filter/Util + Sys/Hostname Storable Filter/Util/Call STATIC_EXT = DynaLoader NONXS_EXT = Errno @@ -637,7 +637,7 @@ DPROF = $(EXTDIR)\Devel\DProf\DProf GLOB = $(EXTDIR)\File\Glob\Glob HOSTNAME = $(EXTDIR)\Sys\Hostname\Hostname STORABLE = $(EXTDIR)\Storable\Storable -FILTER = $(EXTDIR)\Filter\Util\Call +FILTER = $(EXTDIR)\Filter\Util\Call\Call SOCKET_DLL = $(AUTODIR)\Socket\Socket.dll FCNTL_DLL = $(AUTODIR)\Fcntl\Fcntl.dll @@ -656,7 +656,7 @@ DPROF_DLL = $(AUTODIR)\Devel\DProf\DProf.dll GLOB_DLL = $(AUTODIR)\File\Glob\Glob.dll HOSTNAME_DLL = $(AUTODIR)\Sys\Hostname\Hostname.dll STORABLE_DLL = $(AUTODIR)\Storable\Storable.dll -FILTER_DLL = $(EXTDIR)\Filter\Util\Call.dll +FILTER_DLL = $(EXTDIR)\Filter\Util\Call\Call.dll ERRNO_PM = $(LIBDIR)\Errno.pm @@ -988,7 +988,7 @@ $(STORABLE_DLL): $(PERLEXE) $(STORABLE).xs cd ..\..\win32 $(FILTER_DLL): $(PERLEXE) $(FILTER).xs - cd $(EXTDIR)\Filter\Util + cd $(EXTDIR)\Filter\Util\Call ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl $(MAKE) cd ..\..\..\win32 @@ -1039,7 +1039,7 @@ distclean: clean -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm -del /f $(LIBDIR)\File\Glob.pm -del /f $(LIBDIR)\Storable.pm - -del /f $(LIBDIR)\Filter\Util\Call.pm + -del /f $(LIBDIR)\Filter\Util\Call\Call.pm -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO -rmdir /s $(LIBDIR)\IO -if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread @@ -1048,8 +1048,8 @@ distclean: clean -rmdir /s $(LIBDIR)\B -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data -rmdir /s $(LIBDIR)\Data - -if exist $(LIBDIR)\Filter rmdir /s /q $(LIBDIR)\Filter - -rmdir /s $(LIBDIR)\Filter + -if exist $(LIBDIR)\Filter\Util\Call rmdir /s /q $(LIBDIR)\Filter\Util\Call + -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util -del /f $(PODDIR)\*.html -del /f $(PODDIR)\*.bat cd ..\utils diff --git a/win32/makefile.mk b/win32/makefile.mk index dcf10fed3c..4677c809ed 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -715,7 +715,7 @@ SETARGV_OBJ = setargv$(o) DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \ Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \ - Sys/Hostname Storable Filter/Util Encode + Sys/Hostname Storable Filter/Util/Call Encode STATIC_EXT = DynaLoader NONXS_EXT = Errno @@ -738,7 +738,7 @@ DPROF = $(EXTDIR)\Devel\DProf\DProf GLOB = $(EXTDIR)\File\Glob\Glob HOSTNAME = $(EXTDIR)\Sys\Hostname\Hostname STORABLE = $(EXTDIR)\Storable\Storable -FILTER = $(EXTDIR)\Filter\Util\Call +FILTER = $(EXTDIR)\Filter\Util\Call\Call ENCODE = $(EXTDIR)\Encode\Encode SOCKET_DLL = $(AUTODIR)\Socket\Socket.dll @@ -1197,9 +1197,9 @@ $(STORABLE_DLL): $(PERLEXE) $(STORABLE).xs cd $(EXTDIR)\$(*B) && $(MAKE) $(FILTER_DLL): $(PERLEXE) $(FILTER).xs - cd $(EXTDIR)\Filter\Util && \ + cd $(EXTDIR)\Filter\Util\Call && \ ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl - cd $(EXTDIR)\Filter\Util && $(MAKE) + cd $(EXTDIR)\Filter\Util\Call && $(MAKE) $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL cd $(EXTDIR)\$(*B) && \ @@ -1242,12 +1242,13 @@ distclean: clean -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm -del /f $(LIBDIR)\File\Glob.pm -del /f $(LIBDIR)\Storable.pm - -del /f $(LIBDIR)\Filter\Util\Call.pm + -del /f $(LIBDIR)\Filter\Util\Call\Call.pm -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO -if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data || rmdir /s $(LIBDIR)\Data - -if exist $(LIBDIR)\Filter rmdir /s /q $(LIBDIR)\Filter || rmdir /s $(LIBDIR)\Filter + -if exist $(LIBDIR)\Filter\Util\Call rmdir /s /q $(LIBDIR)\Filter\Util\Call || rmdir /s $(LIBDIR)\Filter + -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util || rmdir /s $(LIBDIR)\Filter -del /f $(PODDIR)\*.html -del /f $(PODDIR)\*.bat -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc \ |