diff options
author | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-09 08:02:52 +0000 |
---|---|---|
committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-09 08:02:52 +0000 |
commit | 823edd999e1a252d36bcee7f4b8cc4bb197530e3 (patch) | |
tree | 5aa813d577fb904161bd4b105f0df8143a16bc3c /win32 | |
parent | 45f6cd40adbe98ca464cda969ccb3807be35e893 (diff) | |
download | perl-823edd999e1a252d36bcee7f4b8cc4bb197530e3.tar.gz |
add Data-Dumper, up patchlevel to 71, various misc tweaks to
make all configs build on Solaris and win32
p4raw-id: //depot/perl@1396
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile | 19 | ||||
-rw-r--r-- | win32/config_H.bc | 16 | ||||
-rw-r--r-- | win32/config_H.gc | 16 | ||||
-rw-r--r-- | win32/config_H.vc | 16 | ||||
-rw-r--r-- | win32/makefile.mk | 16 |
5 files changed, 54 insertions, 29 deletions
diff --git a/win32/Makefile b/win32/Makefile index 99bd631fac..6eaa3ee392 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -25,7 +25,7 @@ INST_TOP = $(INST_DRV)\perl # versioned installation can be obtained by setting INST_TOP above to a # path that includes an arbitrary version string. # -INST_VER = \5.00470 +INST_VER = \5.00471 # # uncomment to enable threads-capabilities @@ -448,7 +448,8 @@ PERLEXE_OBJ = $(PERLEXE_OBJ) $(WIN32_OBJ) $(DLL_OBJ) PERL95_OBJ = $(PERL95_OBJ) DynaLoadmt$(o) !ENDIF -DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re +DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \ + Data/Dumper STATIC_EXT = DynaLoader NONXS_EXT = Errno @@ -462,7 +463,8 @@ POSIX = $(EXTDIR)\POSIX\POSIX ATTRS = $(EXTDIR)\attrs\attrs THREAD = $(EXTDIR)\Thread\Thread B = $(EXTDIR)\B\B -RE = $(EXTDIR)\RE\RE +RE = $(EXTDIR)\re\re +DUMPER = $(EXTDIR)\Data\Dumper\Dumper ERRNO = $(EXTDIR)\Errno\Errno SOCKET_DLL = $(AUTODIR)\Socket\Socket.dll @@ -474,6 +476,7 @@ POSIX_DLL = $(AUTODIR)\POSIX\POSIX.dll ATTRS_DLL = $(AUTODIR)\attrs\attrs.dll THREAD_DLL = $(AUTODIR)\Thread\Thread.dll B_DLL = $(AUTODIR)\B\B.dll +DUMPER_DLL = $(AUTODIR)\Data\Dumper\Dumper.dll RE_DLL = $(AUTODIR)\re\re.dll ERRNO_PM = $(LIBDIR)\Errno.pm @@ -488,6 +491,7 @@ EXTENSION_C = \ $(ATTRS).c \ $(THREAD).c \ $(RE).c \ + $(DUMPER).c \ $(B).c EXTENSION_DLL = \ @@ -498,6 +502,7 @@ EXTENSION_DLL = \ $(IO_DLL) \ $(POSIX_DLL) \ $(ATTRS_DLL) \ + $(DUMPER_DLL) \ $(B_DLL) EXTENSION_PM = \ @@ -714,6 +719,12 @@ $(CAPILIB) : PerlCAPI.cpp PerlCAPI$(o) $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs +$(DUMPER_DLL): $(PERLEXE) $(DUMPER).xs + cd $(EXTDIR)\Data\$(*B) + ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl + $(MAKE) + cd ..\..\..\win32 + $(RE_DLL): $(PERLEXE) $(RE).xs cd $(EXTDIR)\$(*B) ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl @@ -806,9 +817,11 @@ distclean: clean -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm $(LIBDIR)\Thread.pm -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm -del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm + -del /f $(LIBDIR)\Data\Dumper.pm -rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO -rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread -rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B + -rmdir /s /q $(LIBDIR)\Data || rmdir /s $(LIBDIR)\Data -del /f $(PODDIR)\*.html -del /f $(PODDIR)\*.bat cd ..\utils diff --git a/win32/config_H.bc b/win32/config_H.bc index 1e29d62387..70022f8e09 100644 --- a/win32/config_H.bc +++ b/win32/config_H.bc @@ -34,8 +34,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.00470\\bin\\MSWin32-x86" /**/ -#define BIN_EXP "c:\\perl\\5.00470\\bin\\MSWin32-x86" /**/ +#define BIN "c:\\perl\\5.00471\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.00471\\bin\\MSWin32-x86" /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke @@ -1471,7 +1471,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.00470\\lib\\MSWin32-x86" /**/ +#define ARCHLIB "c:\\perl\\5.00471\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* CAT2: @@ -1773,8 +1773,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "c:\\perl\\5.00470\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.00470")) /**/ +#define PRIVLIB "c:\\perl\\5.00471\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.00471")) /**/ /* SIG_NAME: * This symbol contains a list of signal names in order of @@ -1820,7 +1820,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.00470\\lib\\MSWin32-x86" /**/ +#define SITEARCH "c:\\perl\\site\\5.00471\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -1836,8 +1836,8 @@ * This symbol contains the ~name expanded version of SITELIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITELIB "c:\\perl\\site\\5.00470\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.00470")) /**/ +#define SITELIB "c:\\perl\\site\\5.00471\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.00471")) /**/ /* DLSYM_NEEDS_UNDERSCORE: * This symbol, if defined, indicates that we need to prepend an diff --git a/win32/config_H.gc b/win32/config_H.gc index f11ca85ec8..d47fc66a8c 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -34,8 +34,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.00470\\bin\\MSWin32-x86" /**/ -#define BIN_EXP "c:\\perl\\5.00470\\bin\\MSWin32-x86" /**/ +#define BIN "c:\\perl\\5.00471\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.00471\\bin\\MSWin32-x86" /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke @@ -1471,7 +1471,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.00470\\lib\\MSWin32-x86" /**/ +#define ARCHLIB "c:\\perl\\5.00471\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* CAT2: @@ -1773,8 +1773,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "c:\\perl\\5.00470\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.00470")) /**/ +#define PRIVLIB "c:\\perl\\5.00471\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.00471")) /**/ /* SIG_NAME: * This symbol contains a list of signal names in order of @@ -1820,7 +1820,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.00470\\lib\\MSWin32-x86" /**/ +#define SITEARCH "c:\\perl\\site\\5.00471\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -1836,8 +1836,8 @@ * This symbol contains the ~name expanded version of SITELIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITELIB "c:\\perl\\site\\5.00470\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.00470")) /**/ +#define SITELIB "c:\\perl\\site\\5.00471\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.00471")) /**/ /* DLSYM_NEEDS_UNDERSCORE: * This symbol, if defined, indicates that we need to prepend an diff --git a/win32/config_H.vc b/win32/config_H.vc index 1678bcdfbe..b5c5c496b1 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -34,8 +34,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.00470\\bin\\MSWin32-x86" /**/ -#define BIN_EXP "c:\\perl\\5.00470\\bin\\MSWin32-x86" /**/ +#define BIN "c:\\perl\\5.00471\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.00471\\bin\\MSWin32-x86" /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke @@ -1471,7 +1471,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.00470\\lib\\MSWin32-x86" /**/ +#define ARCHLIB "c:\\perl\\5.00471\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* CAT2: @@ -1773,8 +1773,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "c:\\perl\\5.00470\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.00470")) /**/ +#define PRIVLIB "c:\\perl\\5.00471\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.00471")) /**/ /* SIG_NAME: * This symbol contains a list of signal names in order of @@ -1820,7 +1820,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.00470\\lib\\MSWin32-x86" /**/ +#define SITEARCH "c:\\perl\\site\\5.00471\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -1836,8 +1836,8 @@ * This symbol contains the ~name expanded version of SITELIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITELIB "c:\\perl\\site\\5.00470\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.00470")) /**/ +#define SITELIB "c:\\perl\\site\\5.00471\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.00471")) /**/ /* DLSYM_NEEDS_UNDERSCORE: * This symbol, if defined, indicates that we need to prepend an diff --git a/win32/makefile.mk b/win32/makefile.mk index c552aa4b71..46ebccd629 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -29,7 +29,7 @@ INST_TOP *= $(INST_DRV)\perl # versioned installation can be obtained by setting INST_TOP above to a # path that includes an arbitrary version string. # -INST_VER *= \5.00470 +INST_VER *= \5.00471 # # uncomment to enable threads-capabilities @@ -560,7 +560,8 @@ PERLEXE_OBJ += $(WIN32_OBJ) $(DLL_OBJ) PERL95_OBJ += DynaLoadmt$(o) .ENDIF -DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re +DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \ + Data/Dumper STATIC_EXT = DynaLoader NONXS_EXT = Errno @@ -575,6 +576,7 @@ ATTRS = $(EXTDIR)\attrs\attrs THREAD = $(EXTDIR)\Thread\Thread B = $(EXTDIR)\B\B RE = $(EXTDIR)\re\re +DUMPER = $(EXTDIR)\Data\Dumper\Dumper ERRNO = $(EXTDIR)\Errno\Errno SOCKET_DLL = $(AUTODIR)\Socket\Socket.dll @@ -586,6 +588,7 @@ POSIX_DLL = $(AUTODIR)\POSIX\POSIX.dll ATTRS_DLL = $(AUTODIR)\attrs\attrs.dll THREAD_DLL = $(AUTODIR)\Thread\Thread.dll B_DLL = $(AUTODIR)\B\B.dll +DUMPER_DLL = $(AUTODIR)\Data\Dumper\Dumper.dll RE_DLL = $(AUTODIR)\re\re.dll ERRNO_PM = $(LIBDIR)\Errno.pm @@ -600,6 +603,7 @@ EXTENSION_C = \ $(ATTRS).c \ $(THREAD).c \ $(RE).c \ + $(DUMPER).c \ $(B).c EXTENSION_DLL = \ @@ -610,6 +614,7 @@ EXTENSION_DLL = \ $(IO_DLL) \ $(POSIX_DLL) \ $(ATTRS_DLL) \ + $(DUMPER_DLL) \ $(B_DLL) EXTENSION_PM = \ @@ -890,6 +895,11 @@ $(CAPILIB) : PerlCAPI.cpp PerlCAPI$(o) $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs +$(DUMPER_DLL): $(PERLEXE) $(DUMPER).xs + cd $(EXTDIR)\Data\$(*B) && \ + ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl + cd $(EXTDIR)\Data\$(*B) && $(MAKE) + $(RE_DLL): $(PERLEXE) $(RE).xs cd $(EXTDIR)\$(*B) && \ ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl @@ -968,9 +978,11 @@ distclean: clean -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm $(LIBDIR)\Thread.pm -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm -del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm + -del /f $(LIBDIR)\Data\Dumper.pm -rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO -rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread -rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B + -rmdir /s /q $(LIBDIR)\Data || rmdir /s $(LIBDIR)\Data -del /f $(PODDIR)\*.html -del /f $(PODDIR)\*.bat -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc pstruct *.bat |