From: H.Merijn Brand Date: Wed, 6 Mar 2002 13:41:30 +0000 (+0100) Subject: Re: perl@15047 WinCE X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e04f449fe47df0d43680ac5c251c9933e3689ea7;p=p5sagit%2Fp5-mst-13.2.git Re: perl@15047 WinCE From: "H.Merijn Brand" Date: Wed, 06 Mar 2002 13:41:30 +0100 Message-Id: <20020306134107.C6F8.H.M.BRAND@hccnet.nl> Subject: Re: perl@15047 Win32 From: "H.Merijn Brand" Date: Wed, 06 Mar 2002 13:46:02 +0100 Message-Id: <20020306134539.C6FB.H.M.BRAND@hccnet.nl> Subject: Re: perl@15047 Epoc From: "H.Merijn Brand" Date: Wed, 06 Mar 2002 13:48:31 +0100 Message-Id: <20020306134811.C6FE.H.M.BRAND@hccnet.nl> Subject: Re: perl@15047 NetWare From: "H.Merijn Brand" Date: Wed, 06 Mar 2002 13:55:46 +0100 Message-Id: <20020306135406.C701.H.M.BRAND@hccnet.nl> p4raw-id: //depot/perl@15063 --- diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc index 104610f..8adcbaa 100644 --- a/NetWare/config_H.wc +++ b/NetWare/config_H.wc @@ -1027,7 +1027,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.7.2\\lib\\NetWare-x86-multi-thread" /**/ +#define ARCHLIB "c:\\perl\\5.7.3\\lib\\NetWare-x86-multi-thread" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -1058,8 +1058,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.7.2\\bin\\NetWare-x86-multi-thread" /**/ -#define BIN_EXP "c:\\perl\\5.7.2\\bin\\NetWare-x86-multi-thread" /**/ +#define BIN "c:\\perl\\5.7.3\\bin\\NetWare-x86-multi-thread" /**/ +#define BIN_EXP "c:\\perl\\5.7.3\\bin\\NetWare-x86-multi-thread" /**/ /* PERL_BINCOMPAT_5005: * This symbol, if defined, indicates that this version of Perl should be @@ -2998,7 +2998,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.7.2\\lib\\NetWare-x86-multi-thread" /**/ +#define SITEARCH "c:\\perl\\site\\5.7.3\\lib\\NetWare-x86-multi-thread" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3021,8 +3021,8 @@ * removed. The elements in inc_version_list (inc_version_list.U) can * be tacked onto this variable to generate a list of directories to search. */ -#define SITELIB "c:\\perl\\site\\5.7.2\\lib" /**/ -#define SITELIB_EXP (nw_get_sitelib("5.7.2")) /**/ +#define SITELIB "c:\\perl\\site\\5.7.3\\lib" /**/ +#define SITELIB_EXP (nw_get_sitelib("5.7.3")) /**/ #define SITELIB_STEM "" /**/ /* Size_t_size: @@ -3259,7 +3259,7 @@ /* PERL_XS_APIVERSION: * This variable contains the version of the oldest perl binary * compatible with the present perl. perl.c:incpush() and - * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.2\\lib\\NetWare-x86-multi-thread for older + * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.3\\lib\\NetWare-x86-multi-thread for older * directories across major versions back to xs_apiversion. * This is only useful if you have a perl library directory tree * structured like the default one. @@ -3278,7 +3278,7 @@ * compatible with the present perl. (That is, pure perl modules * written for pm_apiversion will still work for the current * version). perl.c:incpush() and lib/lib.pm will automatically - * search in c:\\perl\\site\\5.7.2\\lib for older directories across major versions + * search in c:\\perl\\site\\5.7.3\\lib for older directories across major versions * back to pm_apiversion. This is only useful if you have a perl * library directory tree structured like the default one. The * versioned site_perl library was introduced in 5.005, so that's diff --git a/epoc/config.sh b/epoc/config.sh index 6909d55..266960f 100644 --- a/epoc/config.sh +++ b/epoc/config.sh @@ -33,8 +33,8 @@ apirevision='' apisubversion='' apiversion='' ar='arm-epoc-pe-ar' -archlib='?:/perl/lib/5.7.2/epoc' -archlibexp='?:/perl/lib/5.7.2/epoc' +archlib='?:/perl/lib/5.7.3/epoc' +archlibexp='?:/perl/lib/5.7.3/epoc' archname64='' archname='epoc' archobjs='epoc.o epocish.o epoc_stubs.o' @@ -644,8 +644,8 @@ pmake='' pr='' prefix='' prefixexp='' -privlib='?:/perl/lib/5.7.2' -privlibexp='?:/perl/lib/5.7.2' +privlib='?:/perl/lib/5.7.3' +privlibexp='?:/perl/lib/5.7.3' prototype='define' procselfexe='' ptrsize='4' @@ -690,11 +690,11 @@ sig_num='0' sig_num_init='0, 0' sig_size='1' signal_t='void' -sitearch='?:/perl/lib/site_perl/5.7.2/epoc' -sitearchexp='?:/perl/lib/site_perl/5.7.2/epoc' -sitelib='?:/perl/lib/site_perl/5.7.2/' +sitearch='?:/perl/lib/site_perl/5.7.3/epoc' +sitearchexp='?:/perl/lib/site_perl/5.7.3/epoc' +sitelib='?:/perl/lib/site_perl/5.7.3/' sitelib_stem='?:/perl/lib/site_perl' -sitelibexp='?:/perl/lib/site_perl/5.7.2/' +sitelibexp='?:/perl/lib/site_perl/5.7.3/' siteprefix='' siteprefixexp='' sizesize='4' @@ -766,7 +766,7 @@ vendorlib_stem='' vendorlibexp='' vendorprefix='' vendorprefixexp='' -version='5.7.2' +version='5.7.3' versiononly='undef' vi='' voidflags='15' @@ -898,7 +898,7 @@ vendorlib_stem='' vendorlibexp='' vendorprefix='' vendorprefixexp='' -version='5.7.2' +version='5.7.3' vi='' voidflags='15' xlibpth='' diff --git a/win32/Makefile b/win32/Makefile index b1c7bee..7b7bf34 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1,1116 +1,1116 @@ -# -# Makefile to build perl on Windows NT using Microsoft NMAKE. -# Supported compilers: -# Visual C++ 5.x (possibly other versions) -# -# This is set up to build a perl.exe that runs off a shared library -# (perl57.dll). Also makes individual DLLs for the XS extensions. -# - -## -## Make sure you read README.win32 *before* you mess with anything here! -## - -## -## Build configuration. Edit the values below to suit your needs. -## - -# -# Set these to wherever you want "nmake install" to put your -# newly built perl. -# -INST_DRV = c: -INST_TOP = $(INST_DRV)\perl - -# -# Comment this out if you DON'T want your perl installation to be versioned. -# This means that the new installation will overwrite any files from the -# old installation at the same INST_TOP location. Leaving it enabled is -# the safest route, as perl adds the extra version directory to all the -# locations it installs files to. If you disable it, an alternative -# versioned installation can be obtained by setting INST_TOP above to a -# path that includes an arbitrary version string. -# -#INST_VER = \5.7.2 - -# -# Comment this out if you DON'T want your perl installation to have -# architecture specific components. This means that architecture- -# specific files will be installed along with the architecture-neutral -# files. Leaving it enabled is safer and more flexible, in case you -# want to build multiple flavors of perl and install them together in -# the same location. Commenting it out gives you a simpler -# installation that is easier to understand for beginners. -# -#INST_ARCH = \$(ARCHNAME) - -# -# uncomment to enable multiple interpreters. This is need for fork() -# emulation. -# -USE_MULTI = define - -# -# Beginnings of interpreter cloning/threads; still very incomplete. -# This should be enabled to get the fork() emulation. This needs -# USE_MULTI as well. -# -USE_ITHREADS = define - -# -# uncomment to enable the implicit "host" layer for all system calls -# made by perl. This needs USE_MULTI above. This is also needed to -# get fork(). -# -USE_IMP_SYS = define - -# -# uncomment to enable the experimental PerlIO I/O subsystem. -USE_PERLIO = define - -# -# WARNING! This option is deprecated and will eventually go away (enable -# USE_ITHREADS instead). -# -# uncomment to enable threads-capabilities. This is incompatible with -# USE_ITHREADS, and is only here for people who may have come to rely -# on the experimental Thread support that was in 5.005. -# -#USE_5005THREADS = define - -# -# uncomment one of the following lines if you are using either -# Visual C++ 2.x or Visual C++ 6.x (aka Visual Studio 98) -# -#CCTYPE = MSVC20 -#CCTYPE = MSVC60 - -# -# uncomment next line if you want debug version of perl (big,slow) -# -#CFG = Debug - -# -# uncomment to enable use of PerlCRT.DLL when using the Visual C compiler. -# It has patches that fix known bugs in older versions of MSVCRT.DLL. -# This currently requires VC 5.0 with Service Pack 3 or later. -# Get it from CPAN at http://www.cpan.org/authors/id/D/DO/DOUGL/ -# and follow the directions in the package to install. -# -# Not recommended if you have VC 6.x and you're not running Windows 9x. -# -#USE_PERLCRT = define - -# -# uncomment to enable linking with setargv.obj under the Visual C -# compiler. Setting this options enables perl to expand wildcards in -# arguments, but it may be harder to use alternate methods like -# File::DosGlob that are more powerful. This option is supported only with -# Visual C. -# -#USE_SETARGV = define - -# -# if you have the source for des_fcrypt(), uncomment this and make sure the -# file exists (see README.win32). File should be located in the same -# directory as this file. -# -#CRYPT_SRC = fcrypt.c - -# -# if you didn't set CRYPT_SRC and if you have des_fcrypt() available in a -# library, uncomment this, and make sure the library exists (see README.win32) -# Specify the full pathname of the library. -# -#CRYPT_LIB = fcrypt.lib - -# -# set this if you wish to use perl's malloc -# WARNING: Turning this on/off WILL break binary compatibility with extensions -# you may have compiled with/without it. Be prepared to recompile all -# extensions if you change the default. Currently, this cannot be enabled -# if you ask for USE_IMP_SYS above. -# -#PERL_MALLOC = define - -# -# set the install locations of the compiler include/libraries -# Running VCVARS32.BAT is *required* when using Visual C. -# Some versions of Visual C don't define MSVCDIR in the environment, -# so you may have to set CCHOME explicitly (spaces in the path name should -# not be quoted) -# -#CCHOME = f:\msvc20 -CCHOME = $(MSVCDIR) -CCINCDIR = $(CCHOME)\include -CCLIBDIR = $(CCHOME)\lib - -# -# Additional compiler flags can be specified here. -# - -# -# This should normally be disabled. Adding -DPERL_POLLUTE enables support -# for old symbols by default, at the expense of extreme pollution. You most -# probably just want to build modules that won't compile with -# perl Makefile.PL POLLUTE=1 -# instead of enabling this. Please report such modules to the respective -# authors. -# -#BUILDOPT = $(BUILDOPT) -DPERL_POLLUTE - -# -# This should normally be disabled. Enabling it will disable the File::Glob -# implementation of CORE::glob. -# -#BUILDOPT = $(BUILDOPT) -DPERL_EXTERNAL_GLOB - -# -# This should normally be disabled. Enabling it causes perl to read scripts -# in text mode (which is the 5.005 behavior) and will break ByteLoader. -#BUILDOPT = $(BUILDOPT) -DPERL_TEXTMODE_SCRIPTS - -# -# specify semicolon-separated list of extra directories that modules will -# look for libraries (spaces in path names need not be quoted) -# -EXTRALIBDIRS = - -# -# set this to your email address (perl will guess a value from -# from your loginname and your hostname, which may not be right) -# -#EMAIL = - -## -## Build configuration ends. -## - -##################### CHANGE THESE ONLY IF YOU MUST ##################### - -!IF "$(CRYPT_SRC)$(CRYPT_LIB)" == "" -D_CRYPT = undef -!ELSE -D_CRYPT = define -CRYPT_FLAG = -DHAVE_DES_FCRYPT -!ENDIF - -!IF "$(PERL_MALLOC)" == "" -PERL_MALLOC = undef -!ENDIF - -!IF "$(USE_5005THREADS)" == "" -USE_5005THREADS = undef -!ENDIF - -!IF "$(USE_5005THREADS)" == "define" -USE_ITHREADS = undef -!ENDIF - -!IF "$(USE_IMP_SYS)" == "define" -PERL_MALLOC = undef -!ENDIF - -!IF "$(USE_MULTI)" == "" -USE_MULTI = undef -!ENDIF - -!IF "$(USE_ITHREADS)" == "" -USE_ITHREADS = undef -!ENDIF - -!IF "$(USE_IMP_SYS)" == "" -USE_IMP_SYS = undef -!ENDIF - -!IF "$(USE_PERLIO)" == "" -USE_PERLIO = undef -!ENDIF - -!IF "$(USE_PERLCRT)" == "" -USE_PERLCRT = undef -!ENDIF - -!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef" -USE_MULTI = define -!ENDIF - -!IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef" -USE_MULTI = define -USE_5005THREADS = undef -!ENDIF - -!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef" -BUILDOPT = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT -!ENDIF - -!IF "$(USE_IMP_SYS)" != "undef" -BUILDOPT = $(BUILDOPT) -DPERL_IMPLICIT_SYS -!ENDIF - -!IF "$(PROCESSOR_ARCHITECTURE)" == "" -PROCESSOR_ARCHITECTURE = x86 -!ENDIF - -!IF "$(USE_5005THREADS)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread -!ELSE -!IF "$(USE_MULTI)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi -!ELSE -!IF "$(USE_PERLIO)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-perlio -!ELSE -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE) -!ENDIF -!ENDIF -!ENDIF - -!IF "$(USE_PERLIO)" == "define" -BUILDOPT = $(BUILDOPT) -DUSE_PERLIO -!ENDIF - -!IF "$(USE_ITHREADS)" == "define" -ARCHNAME = $(ARCHNAME)-thread -!ENDIF - -# Visual Studio 98 specific -!IF "$(CCTYPE)" == "MSVC60" - -# VC 6.0 can load the socket dll on demand. Makes the test suite -# run in about 10% less time. -DELAYLOAD = -DELAYLOAD:wsock32.dll -DELAYLOAD:shell32.dll delayimp.lib -!ENDIF - -ARCHDIR = ..\lib\$(ARCHNAME) -COREDIR = ..\lib\CORE -AUTODIR = ..\lib\auto -LIBDIR = ..\lib -EXTDIR = ..\ext -PODDIR = ..\pod -EXTUTILSDIR = $(LIBDIR)\ExtUtils - -# -INST_SCRIPT = $(INST_TOP)$(INST_VER)\bin -INST_BIN = $(INST_SCRIPT)$(INST_ARCH) -INST_LIB = $(INST_TOP)$(INST_VER)\lib -INST_ARCHLIB = $(INST_LIB)$(INST_ARCH) -INST_COREDIR = $(INST_ARCHLIB)\CORE -INST_POD = $(INST_LIB)\pod -INST_HTML = $(INST_TOP)$(INST_VER)\html - -# -# Programs to compile, build .lib files and link -# - -CC = cl -LINK32 = link -LIB32 = $(LINK32) -lib -RSC = rc - -# -# Options -# - -INCLUDES = -I$(COREDIR) -I.\include -I. -I.. -#PCHFLAGS = -Fpc:\temp\vcmoduls.pch -YX -DEFINES = -DWIN32 -D_CONSOLE -DNO_STRICT $(CRYPT_FLAG) -LOCDEFS = -DPERLDLL -DPERL_CORE -SUBSYS = console -CXX_FLAG = -TP -GX - -!IF "$(USE_PERLCRT)" != "define" -LIBC = msvcrt.lib -!ELSE -LIBC = PerlCRT.lib -!ENDIF - -PERLEXE_RES = -PERLDLL_RES = - -!IF "$(CFG)" == "Debug" -! IF "$(CCTYPE)" == "MSVC20" -OPTIMIZE = -Od -MD -Z7 -DDEBUGGING -! ELSE -OPTIMIZE = -Od -MD -Zi -DDEBUGGING -! ENDIF -LINK_DBG = -debug -pdb:none -!ELSE -# -O1 yields smaller code, which turns out to be faster than -O2 -#OPTIMIZE = -O2 -MD -DNDEBUG -OPTIMIZE = -O1 -MD -DNDEBUG -LINK_DBG = -release -!ENDIF - -!IF "$(USE_PERLCRT)" != "define" -BUILDOPT = $(BUILDOPT) -DPERL_MSVCRT_READFIX -!ENDIF - -LIBBASEFILES = $(CRYPT_LIB) \ - oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib \ - comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ - netapi32.lib uuid.lib wsock32.lib mpr.lib winmm.lib \ - version.lib odbc32.lib odbccp32.lib - -# we add LIBC here, since we may be using PerlCRT.dll -LIBFILES = $(LIBBASEFILES) $(LIBC) - -CFLAGS = -nologo -Gf -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \ - $(PCHFLAGS) $(OPTIMIZE) -LINK_FLAGS = -nologo -nodefaultlib $(LINK_DBG) \ - -libpath:"$(INST_COREDIR)" \ - -machine:$(PROCESSOR_ARCHITECTURE) -OBJOUT_FLAG = -Fo -EXEOUT_FLAG = -Fe - -CFLAGS_O = $(CFLAGS) $(BUILDOPT) - -#################### do not edit below this line ####################### -############# NO USER-SERVICEABLE PARTS BEYOND THIS POINT ############## - -o = .obj - -# -# Rules -# - -.SUFFIXES : .c $(o) .dll .lib .exe .rc .res - -.c$(o): - $(CC) -c -I$( ..\config.sh - -# this target is for when changes to the main config.sh happen -# edit config.{b,v,g}c and make this target once for each supported -# compiler (e.g. `nmake CCTYPE=BORLAND regen_config_h`) -regen_config_h: - perl config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh - cd .. - -del /f perl.exe - perl configpm - cd win32 - -del /f $(CFGH_TMPL) - -mkdir $(COREDIR) - -perl -I..\lib config_h.PL "INST_VER=$(INST_VER)" - rename config.h $(CFGH_TMPL) - -$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl - cd .. - miniperl configpm - cd win32 - if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL) - $(XCOPY) ..\*.h $(COREDIR)\*.* - $(XCOPY) *.h $(COREDIR)\*.* - $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.* - $(RCOPY) include $(COREDIR)\*.* - -$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)" - if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM) - -$(MINIPERL) : $(MINIDIR) $(MINI_OBJ) - $(LINK32) -subsystem:console -out:$@ @<< - $(LINK_FLAGS) $(LIBFILES) $(MINI_OBJ) -<< - -$(MINIDIR) : - if not exist "$(MINIDIR)" mkdir "$(MINIDIR)" - -$(MINICORE_OBJ) : $(CORE_NOCFG_H) - $(CC) -c $(CFLAGS) -DPERL_EXTERNAL_GLOB $(OBJOUT_FLAG)$@ ..\$(*F).c - -$(MINIWIN32_OBJ) : $(CORE_NOCFG_H) - $(CC) -c $(CFLAGS) $(OBJOUT_FLAG)$@ $(*F).c - -# -DPERL_IMPLICIT_SYS needs C++ for perllib.c -# This is the only file that depends on perlhost.h, vmem.h, and vdir.h -!IF "$(USE_IMP_SYS)" == "define" -perllib$(o) : perllib.c .\perlhost.h .\vdir.h .\vmem.h - $(CC) -c -I. $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c -!ENDIF - -# 1. we don't want to rebuild miniperl.exe when config.h changes -# 2. we don't want to rebuild miniperl.exe with non-default config.h -$(MINI_OBJ) : $(CORE_NOCFG_H) - -$(WIN32_OBJ) : $(CORE_H) -$(CORE_OBJ) : $(CORE_H) -$(DLL_OBJ) : $(CORE_H) -$(X2P_OBJ) : $(CORE_H) - -perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl - $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \ - CCTYPE=$(CCTYPE) > perldll.def - -$(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) - $(LINK32) -dll -def:perldll.def -base:0x28000000 -out:$@ @<< - $(LINK_FLAGS) $(DELAYLOAD) $(LIBFILES) $(PERLDLL_OBJ) $(PERLDLL_RES) -<< - $(XCOPY) $(PERLIMPLIB) $(COREDIR) - -$(MINIMOD) : $(MINIPERL) ..\minimod.pl - cd .. - miniperl minimod.pl > lib\ExtUtils\Miniperl.pm - cd win32 - -..\x2p\a2p$(o) : ..\x2p\a2p.c - $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\a2p.c - -..\x2p\hash$(o) : ..\x2p\hash.c - $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\hash.c - -..\x2p\str$(o) : ..\x2p\str.c - $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\str.c - -..\x2p\util$(o) : ..\x2p\util.c - $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\util.c - -..\x2p\walk$(o) : ..\x2p\walk.c - $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\walk.c - -$(X2P) : $(MINIPERL) $(X2P_OBJ) - $(MINIPERL) ..\x2p\find2perl.PL - $(MINIPERL) ..\x2p\s2p.PL - $(LINK32) -subsystem:console -out:$@ @<< - $(LINK_FLAGS) $(LIBFILES) $(X2P_OBJ) -<< - -perlmain.c : runperl.c - copy runperl.c perlmain.c - -perlmain$(o) : perlmain.c - $(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c - -$(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) - $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(LINK_FLAGS) \ - $(LIBFILES) $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES) - copy $(PERLEXE) $(WPERLEXE) - $(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS - copy splittree.pl .. - $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR) - -$(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) - if not exist $(AUTODIR) mkdir $(AUTODIR) - cd $(EXTDIR)\$(*B) - ..\$(MINIPERL) -I..\..\lib $(*B)_pm.PL - ..\$(MINIPERL) -I..\..\lib XSLoader_pm.PL - cd ..\..\win32 - $(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL) - $(XCOPY) $(EXTDIR)\$(*B)\XSLoader.pm $(LIBDIR)\$(NULL) - cd $(EXTDIR)\$(*B) - $(XSUBPP) dl_win32.xs > $(*B).c - cd ..\..\win32 - -$(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs - copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs - -#---------------------------------------------------------------------------------- -Extensions: buildext.pl $(PERLDEP) $(CONFIGPM) - $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) - -Extensions_clean: - -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean - -#---------------------------------------------------------------------------------- - -doc: $(PERLEXE) - $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \ - --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML::=|)" \ - --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse - -utils: $(PERLEXE) $(X2P) - cd ..\utils - $(MAKE) PERL=$(MINIPERL) - cd ..\pod - copy ..\README.aix .\perlaix.pod - copy ..\README.amiga .\perlamiga.pod - copy ..\README.apollo .\perlapollo.pod - copy ..\README.beos .\perlbeos.pod - copy ..\README.bs2000 .\perlbs2000.pod - copy ..\README.ce .\perlce.pod - copy ..\README.cygwin .\perlcygwin.pod - copy ..\README.dgux .\perldgux.pod - copy ..\README.dos .\perldos.pod - copy ..\README.epoc .\perlepoc.pod - copy ..\README.hurd .\perlhurd.pod - copy ..\README.hpux .\perlhpux.pod - copy ..\README.machten .\perlmachten.pod - copy ..\README.macos .\perlmacos.pod - copy ..\README.mint .\perlmint.pod - copy ..\README.mpeix .\perlmpeix.pod - copy ..\README.netware .\perlnetware.pod - copy ..\README.os2 .\perlos2.pod - copy ..\README.os390 .\perlos390.pod - copy ..\README.plan9 .\perlplan9.pod - copy ..\README.qnx .\perlqnx.pod - copy ..\README.solaris .\perlsolaris.pod - copy ..\README.tru64 .\perltru64.pod - copy ..\README.uts .\perluts.pod - copy ..\README.vmesa .\perlvmesa.pod - copy ..\vms\perlvms.pod .\perlvms.pod - copy ..\README.vos .\perlvos.pod - copy ..\README.win32 .\perlwin32.pod - $(MAKE) -f ..\win32\pod.mak converters - cd ..\lib - $(PERLEXE) lib_pm.PL - cd ..\win32 - $(PERLEXE) $(PL2BAT) $(UTILS) - -distclean: clean - -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \ - $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD) - -del /f *.def *.map - -del /f $(EXTENSION_DLL) - -del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm - -del /f $(EXTDIR)\DynaLoader\dl_win32.xs - -del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm - -del /f $(LIBDIR)\XSLoader.pm - -del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm - -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.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 $(LIBDIR)\ByteLoader.pm - -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)\Digest\MD5.pm - -del /f $(LIBDIR)\PerlIO\Scalar.pm - -del /f $(LIBDIR)\PerlIO\Via.pm - -del /f $(LIBDIR)\MIME\Base64.pm - -del /f $(LIBDIR)\MIME\QuotedPrint.pm - -del /f $(LIBDIR)\List\Util.pm - -del /f $(LIBDIR)\Scalar\Util.pm - -del /f $(LIBDIR)\Time\HiRes.pm - -del /f $(LIBDIR)\XS\Typemap.pm - -del /f $(LIBDIR)\Unicode\Normalize.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\Util rmdir /s /q $(LIBDIR)\Filter\Util - -if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest - -rmdir /s $(LIBDIR)\Digest - -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME - -rmdir /s $(LIBDIR)\MIME - -if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List - -rmdir /s $(LIBDIR)\List - -if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar - -rmdir /s $(LIBDIR)\Scalar - -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS - -rmdir /s $(LIBDIR)\XS - cd $(PODDIR) - -del /f *.html *.bat checkpods \ - perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \ - perlbs2000.pod perlce.pod perlcygwin.pod perldgux.pod \ - perldos.pod perlepoc.pod perlhurd.pod \ - perlhpux.pod perlmachten.pod \ - perlmacos.pod perlmint.pod perlmpeix.pod perlnetware.pod \ - perlos2.pod perlos390.pod perlplan9.pod perlqnx.pod \ - perlsolaris.pod perltru64.pod perluts.pod \ - perlvmesa.pod perlvms.pod perlvos.pod \ - perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \ - podchecker podselect - cd ..\utils - -del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc perlivp dprofpp - -del /f *.bat - cd ..\win32 - cd ..\x2p - -del /f find2perl s2p - -del /f *.bat - cd ..\win32 - -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new - -del /f $(CONFIGPM) - -del /f bin\*.bat - cd $(EXTDIR) - -del /s *.lib *.def *.map *.pdb *.bs Makefile *$(o) pm_to_blib - cd ..\win32 - -if exist $(AUTODIR) rmdir /s /q $(AUTODIR) - -rmdir /s $(AUTODIR) - -if exist $(COREDIR) rmdir /s /q $(COREDIR) - -rmdir /s $(COREDIR) - -install : all installbare installhtml - -installbare : utils - $(PERLEXE) ..\installperl - if exist $(WPERLEXE) $(XCOPY) $(WPERLEXE) $(INST_BIN)\*.* - $(XCOPY) $(GLOBEXE) $(INST_BIN)\*.* - $(XCOPY) bin\*.bat $(INST_SCRIPT)\*.* - -installhtml : doc - $(RCOPY) html\*.* $(INST_HTML)\*.* - -inst_lib : $(CONFIGPM) - copy splittree.pl .. - $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR) - $(RCOPY) ..\lib $(INST_LIB)\*.* - -minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils - $(XCOPY) $(MINIPERL) ..\t\perl.exe - $(XCOPY) $(GLOBEXE) ..\t\$(NULL) - attrib -r ..\t\*.* - copy test ..\t - cd ..\t - $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t - cd ..\win32 - -test-prep : all utils - $(XCOPY) $(PERLEXE) ..\t\$(NULL) - $(XCOPY) $(PERLDLL) ..\t\$(NULL) - $(XCOPY) $(GLOBEXE) ..\t\$(NULL) - -test : test-prep - cd ..\t - $(PERLEXE) -I..\lib harness - cd ..\win32 - -test-notty : test-prep - set PERL_SKIP_TTY_TEST=1 - cd ..\t - $(PERLEXE) -I..\lib harness - cd ..\win32 - -test-wide : test-prep - set HARNESS_PERL_SWITCHES=-C - cd ..\t - $(PERLEXE) -I..\lib harness - cd ..\win32 - -test-wide-notty : test-prep - set PERL_SKIP_TTY_TEST=1 - set HARNESS_PERL_SWITCHES=-C - cd ..\t - $(PERLEXE) -I..\lib harness - cd ..\win32 - -clean : Extensions_clean - -@$(DEL) miniperlmain$(o) - -@$(DEL) $(MINIPERL) - -@$(DEL) perlglob$(o) - -@$(DEL) perlmain$(o) - -@$(DEL) config.w32 - -@$(DEL) config.h - -@$(DEL) $(GLOBEXE) - -@$(DEL) $(PERLEXE) - -@$(DEL) $(WPERLEXE) - -@$(DEL) $(PERLDLL) - -@$(DEL) $(CORE_OBJ) - -if exist $(MINIDIR) rmdir /s /q $(MINIDIR) - -rmdir /s $(MINIDIR) - -@$(DEL) $(WIN32_OBJ) - -@$(DEL) $(DLL_OBJ) - -@$(DEL) $(X2P_OBJ) - -@$(DEL) ..\*$(o) ..\*.lib ..\*.exp *$(o) *.lib *.exp *.res - -@$(DEL) ..\t\*.exe ..\t\*.dll ..\t\*.bat - -@$(DEL) ..\x2p\*.exe ..\x2p\*.bat - -@$(DEL) *.ilk - -@$(DEL) *.pdb - -# Handy way to run perlbug -ok without having to install and run the -# installed perlbug. We don't re-run the tests here - we trust the user. -# Please *don't* use this unless all tests pass. -# If you want to report test failures, use "nmake nok" instead. -ok: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)" - -okfile: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)" -F perl.ok - -nok: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)" - -nokfile: utils - $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)" -F perl.nok +# +# Makefile to build perl on Windows NT using Microsoft NMAKE. +# Supported compilers: +# Visual C++ 5.x (possibly other versions) +# +# This is set up to build a perl.exe that runs off a shared library +# (perl57.dll). Also makes individual DLLs for the XS extensions. +# + +## +## Make sure you read README.win32 *before* you mess with anything here! +## + +## +## Build configuration. Edit the values below to suit your needs. +## + +# +# Set these to wherever you want "nmake install" to put your +# newly built perl. +# +INST_DRV = c: +INST_TOP = $(INST_DRV)\perl + +# +# Comment this out if you DON'T want your perl installation to be versioned. +# This means that the new installation will overwrite any files from the +# old installation at the same INST_TOP location. Leaving it enabled is +# the safest route, as perl adds the extra version directory to all the +# locations it installs files to. If you disable it, an alternative +# versioned installation can be obtained by setting INST_TOP above to a +# path that includes an arbitrary version string. +# +#INST_VER = \5.7.2 + +# +# Comment this out if you DON'T want your perl installation to have +# architecture specific components. This means that architecture- +# specific files will be installed along with the architecture-neutral +# files. Leaving it enabled is safer and more flexible, in case you +# want to build multiple flavors of perl and install them together in +# the same location. Commenting it out gives you a simpler +# installation that is easier to understand for beginners. +# +#INST_ARCH = \$(ARCHNAME) + +# +# uncomment to enable multiple interpreters. This is need for fork() +# emulation. +# +USE_MULTI = define + +# +# Beginnings of interpreter cloning/threads; still very incomplete. +# This should be enabled to get the fork() emulation. This needs +# USE_MULTI as well. +# +USE_ITHREADS = define + +# +# uncomment to enable the implicit "host" layer for all system calls +# made by perl. This needs USE_MULTI above. This is also needed to +# get fork(). +# +USE_IMP_SYS = define + +# +# uncomment to enable the experimental PerlIO I/O subsystem. +USE_PERLIO = define + +# +# WARNING! This option is deprecated and will eventually go away (enable +# USE_ITHREADS instead). +# +# uncomment to enable threads-capabilities. This is incompatible with +# USE_ITHREADS, and is only here for people who may have come to rely +# on the experimental Thread support that was in 5.005. +# +#USE_5005THREADS = define + +# +# uncomment one of the following lines if you are using either +# Visual C++ 2.x or Visual C++ 6.x (aka Visual Studio 98) +# +#CCTYPE = MSVC20 +#CCTYPE = MSVC60 + +# +# uncomment next line if you want debug version of perl (big,slow) +# +#CFG = Debug + +# +# uncomment to enable use of PerlCRT.DLL when using the Visual C compiler. +# It has patches that fix known bugs in older versions of MSVCRT.DLL. +# This currently requires VC 5.0 with Service Pack 3 or later. +# Get it from CPAN at http://www.cpan.org/authors/id/D/DO/DOUGL/ +# and follow the directions in the package to install. +# +# Not recommended if you have VC 6.x and you're not running Windows 9x. +# +#USE_PERLCRT = define + +# +# uncomment to enable linking with setargv.obj under the Visual C +# compiler. Setting this options enables perl to expand wildcards in +# arguments, but it may be harder to use alternate methods like +# File::DosGlob that are more powerful. This option is supported only with +# Visual C. +# +#USE_SETARGV = define + +# +# if you have the source for des_fcrypt(), uncomment this and make sure the +# file exists (see README.win32). File should be located in the same +# directory as this file. +# +#CRYPT_SRC = fcrypt.c + +# +# if you didn't set CRYPT_SRC and if you have des_fcrypt() available in a +# library, uncomment this, and make sure the library exists (see README.win32) +# Specify the full pathname of the library. +# +#CRYPT_LIB = fcrypt.lib + +# +# set this if you wish to use perl's malloc +# WARNING: Turning this on/off WILL break binary compatibility with extensions +# you may have compiled with/without it. Be prepared to recompile all +# extensions if you change the default. Currently, this cannot be enabled +# if you ask for USE_IMP_SYS above. +# +#PERL_MALLOC = define + +# +# set the install locations of the compiler include/libraries +# Running VCVARS32.BAT is *required* when using Visual C. +# Some versions of Visual C don't define MSVCDIR in the environment, +# so you may have to set CCHOME explicitly (spaces in the path name should +# not be quoted) +# +#CCHOME = f:\msvc20 +CCHOME = $(MSVCDIR) +CCINCDIR = $(CCHOME)\include +CCLIBDIR = $(CCHOME)\lib + +# +# Additional compiler flags can be specified here. +# + +# +# This should normally be disabled. Adding -DPERL_POLLUTE enables support +# for old symbols by default, at the expense of extreme pollution. You most +# probably just want to build modules that won't compile with +# perl Makefile.PL POLLUTE=1 +# instead of enabling this. Please report such modules to the respective +# authors. +# +#BUILDOPT = $(BUILDOPT) -DPERL_POLLUTE + +# +# This should normally be disabled. Enabling it will disable the File::Glob +# implementation of CORE::glob. +# +#BUILDOPT = $(BUILDOPT) -DPERL_EXTERNAL_GLOB + +# +# This should normally be disabled. Enabling it causes perl to read scripts +# in text mode (which is the 5.005 behavior) and will break ByteLoader. +#BUILDOPT = $(BUILDOPT) -DPERL_TEXTMODE_SCRIPTS + +# +# specify semicolon-separated list of extra directories that modules will +# look for libraries (spaces in path names need not be quoted) +# +EXTRALIBDIRS = + +# +# set this to your email address (perl will guess a value from +# from your loginname and your hostname, which may not be right) +# +#EMAIL = + +## +## Build configuration ends. +## + +##################### CHANGE THESE ONLY IF YOU MUST ##################### + +!IF "$(CRYPT_SRC)$(CRYPT_LIB)" == "" +D_CRYPT = undef +!ELSE +D_CRYPT = define +CRYPT_FLAG = -DHAVE_DES_FCRYPT +!ENDIF + +!IF "$(PERL_MALLOC)" == "" +PERL_MALLOC = undef +!ENDIF + +!IF "$(USE_5005THREADS)" == "" +USE_5005THREADS = undef +!ENDIF + +!IF "$(USE_5005THREADS)" == "define" +USE_ITHREADS = undef +!ENDIF + +!IF "$(USE_IMP_SYS)" == "define" +PERL_MALLOC = undef +!ENDIF + +!IF "$(USE_MULTI)" == "" +USE_MULTI = undef +!ENDIF + +!IF "$(USE_ITHREADS)" == "" +USE_ITHREADS = undef +!ENDIF + +!IF "$(USE_IMP_SYS)" == "" +USE_IMP_SYS = undef +!ENDIF + +!IF "$(USE_PERLIO)" == "" +USE_PERLIO = undef +!ENDIF + +!IF "$(USE_PERLCRT)" == "" +USE_PERLCRT = undef +!ENDIF + +!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef" +USE_MULTI = define +!ENDIF + +!IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef" +USE_MULTI = define +USE_5005THREADS = undef +!ENDIF + +!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef" +BUILDOPT = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT +!ENDIF + +!IF "$(USE_IMP_SYS)" != "undef" +BUILDOPT = $(BUILDOPT) -DPERL_IMPLICIT_SYS +!ENDIF + +!IF "$(PROCESSOR_ARCHITECTURE)" == "" +PROCESSOR_ARCHITECTURE = x86 +!ENDIF + +!IF "$(USE_5005THREADS)" == "define" +ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread +!ELSE +!IF "$(USE_MULTI)" == "define" +ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi +!ELSE +!IF "$(USE_PERLIO)" == "define" +ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-perlio +!ELSE +ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE) +!ENDIF +!ENDIF +!ENDIF + +!IF "$(USE_PERLIO)" == "define" +BUILDOPT = $(BUILDOPT) -DUSE_PERLIO +!ENDIF + +!IF "$(USE_ITHREADS)" == "define" +ARCHNAME = $(ARCHNAME)-thread +!ENDIF + +# Visual Studio 98 specific +!IF "$(CCTYPE)" == "MSVC60" + +# VC 6.0 can load the socket dll on demand. Makes the test suite +# run in about 10% less time. +DELAYLOAD = -DELAYLOAD:wsock32.dll -DELAYLOAD:shell32.dll delayimp.lib +!ENDIF + +ARCHDIR = ..\lib\$(ARCHNAME) +COREDIR = ..\lib\CORE +AUTODIR = ..\lib\auto +LIBDIR = ..\lib +EXTDIR = ..\ext +PODDIR = ..\pod +EXTUTILSDIR = $(LIBDIR)\ExtUtils + +# +INST_SCRIPT = $(INST_TOP)$(INST_VER)\bin +INST_BIN = $(INST_SCRIPT)$(INST_ARCH) +INST_LIB = $(INST_TOP)$(INST_VER)\lib +INST_ARCHLIB = $(INST_LIB)$(INST_ARCH) +INST_COREDIR = $(INST_ARCHLIB)\CORE +INST_POD = $(INST_LIB)\pod +INST_HTML = $(INST_TOP)$(INST_VER)\html + +# +# Programs to compile, build .lib files and link +# + +CC = cl +LINK32 = link +LIB32 = $(LINK32) -lib +RSC = rc + +# +# Options +# + +INCLUDES = -I$(COREDIR) -I.\include -I. -I.. +#PCHFLAGS = -Fpc:\temp\vcmoduls.pch -YX +DEFINES = -DWIN32 -D_CONSOLE -DNO_STRICT $(CRYPT_FLAG) +LOCDEFS = -DPERLDLL -DPERL_CORE +SUBSYS = console +CXX_FLAG = -TP -GX + +!IF "$(USE_PERLCRT)" != "define" +LIBC = msvcrt.lib +!ELSE +LIBC = PerlCRT.lib +!ENDIF + +PERLEXE_RES = +PERLDLL_RES = + +!IF "$(CFG)" == "Debug" +! IF "$(CCTYPE)" == "MSVC20" +OPTIMIZE = -Od -MD -Z7 -DDEBUGGING +! ELSE +OPTIMIZE = -Od -MD -Zi -DDEBUGGING +! ENDIF +LINK_DBG = -debug -pdb:none +!ELSE +# -O1 yields smaller code, which turns out to be faster than -O2 +#OPTIMIZE = -O2 -MD -DNDEBUG +OPTIMIZE = -O1 -MD -DNDEBUG +LINK_DBG = -release +!ENDIF + +!IF "$(USE_PERLCRT)" != "define" +BUILDOPT = $(BUILDOPT) -DPERL_MSVCRT_READFIX +!ENDIF + +LIBBASEFILES = $(CRYPT_LIB) \ + oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib \ + comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ + netapi32.lib uuid.lib wsock32.lib mpr.lib winmm.lib \ + version.lib odbc32.lib odbccp32.lib + +# we add LIBC here, since we may be using PerlCRT.dll +LIBFILES = $(LIBBASEFILES) $(LIBC) + +CFLAGS = -nologo -Gf -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \ + $(PCHFLAGS) $(OPTIMIZE) +LINK_FLAGS = -nologo -nodefaultlib $(LINK_DBG) \ + -libpath:"$(INST_COREDIR)" \ + -machine:$(PROCESSOR_ARCHITECTURE) +OBJOUT_FLAG = -Fo +EXEOUT_FLAG = -Fe + +CFLAGS_O = $(CFLAGS) $(BUILDOPT) + +#################### do not edit below this line ####################### +############# NO USER-SERVICEABLE PARTS BEYOND THIS POINT ############## + +o = .obj + +# +# Rules +# + +.SUFFIXES : .c $(o) .dll .lib .exe .rc .res + +.c$(o): + $(CC) -c -I$( ..\config.sh + +# this target is for when changes to the main config.sh happen +# edit config.{b,v,g}c and make this target once for each supported +# compiler (e.g. `nmake CCTYPE=BORLAND regen_config_h`) +regen_config_h: + perl config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh + cd .. + -del /f perl.exe + perl configpm + cd win32 + -del /f $(CFGH_TMPL) + -mkdir $(COREDIR) + -perl -I..\lib config_h.PL "INST_VER=$(INST_VER)" + rename config.h $(CFGH_TMPL) + +$(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl + cd .. + miniperl configpm + cd win32 + if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL) + $(XCOPY) ..\*.h $(COREDIR)\*.* + $(XCOPY) *.h $(COREDIR)\*.* + $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.* + $(RCOPY) include $(COREDIR)\*.* + -$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)" + if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM) + +$(MINIPERL) : $(MINIDIR) $(MINI_OBJ) + $(LINK32) -subsystem:console -out:$@ @<< + $(LINK_FLAGS) $(LIBFILES) $(MINI_OBJ) +<< + +$(MINIDIR) : + if not exist "$(MINIDIR)" mkdir "$(MINIDIR)" + +$(MINICORE_OBJ) : $(CORE_NOCFG_H) + $(CC) -c $(CFLAGS) -DPERL_EXTERNAL_GLOB $(OBJOUT_FLAG)$@ ..\$(*F).c + +$(MINIWIN32_OBJ) : $(CORE_NOCFG_H) + $(CC) -c $(CFLAGS) $(OBJOUT_FLAG)$@ $(*F).c + +# -DPERL_IMPLICIT_SYS needs C++ for perllib.c +# This is the only file that depends on perlhost.h, vmem.h, and vdir.h +!IF "$(USE_IMP_SYS)" == "define" +perllib$(o) : perllib.c .\perlhost.h .\vdir.h .\vmem.h + $(CC) -c -I. $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c +!ENDIF + +# 1. we don't want to rebuild miniperl.exe when config.h changes +# 2. we don't want to rebuild miniperl.exe with non-default config.h +$(MINI_OBJ) : $(CORE_NOCFG_H) + +$(WIN32_OBJ) : $(CORE_H) +$(CORE_OBJ) : $(CORE_H) +$(DLL_OBJ) : $(CORE_H) +$(X2P_OBJ) : $(CORE_H) + +perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl + $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \ + CCTYPE=$(CCTYPE) > perldll.def + +$(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) + $(LINK32) -dll -def:perldll.def -base:0x28000000 -out:$@ @<< + $(LINK_FLAGS) $(DELAYLOAD) $(LIBFILES) $(PERLDLL_OBJ) $(PERLDLL_RES) +<< + $(XCOPY) $(PERLIMPLIB) $(COREDIR) + +$(MINIMOD) : $(MINIPERL) ..\minimod.pl + cd .. + miniperl minimod.pl > lib\ExtUtils\Miniperl.pm + cd win32 + +..\x2p\a2p$(o) : ..\x2p\a2p.c + $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\a2p.c + +..\x2p\hash$(o) : ..\x2p\hash.c + $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\hash.c + +..\x2p\str$(o) : ..\x2p\str.c + $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\str.c + +..\x2p\util$(o) : ..\x2p\util.c + $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\util.c + +..\x2p\walk$(o) : ..\x2p\walk.c + $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\walk.c + +$(X2P) : $(MINIPERL) $(X2P_OBJ) + $(MINIPERL) ..\x2p\find2perl.PL + $(MINIPERL) ..\x2p\s2p.PL + $(LINK32) -subsystem:console -out:$@ @<< + $(LINK_FLAGS) $(LIBFILES) $(X2P_OBJ) +<< + +perlmain.c : runperl.c + copy runperl.c perlmain.c + +perlmain$(o) : perlmain.c + $(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c + +$(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) + $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(LINK_FLAGS) \ + $(LIBFILES) $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES) + copy $(PERLEXE) $(WPERLEXE) + $(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS + copy splittree.pl .. + $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR) + +$(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) + if not exist $(AUTODIR) mkdir $(AUTODIR) + cd $(EXTDIR)\$(*B) + ..\$(MINIPERL) -I..\..\lib $(*B)_pm.PL + ..\$(MINIPERL) -I..\..\lib XSLoader_pm.PL + cd ..\..\win32 + $(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL) + $(XCOPY) $(EXTDIR)\$(*B)\XSLoader.pm $(LIBDIR)\$(NULL) + cd $(EXTDIR)\$(*B) + $(XSUBPP) dl_win32.xs > $(*B).c + cd ..\..\win32 + +$(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs + copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs + +#---------------------------------------------------------------------------------- +Extensions: buildext.pl $(PERLDEP) $(CONFIGPM) + $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) + +Extensions_clean: + -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean + +#---------------------------------------------------------------------------------- + +doc: $(PERLEXE) + $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \ + --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML::=|)" \ + --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse + +utils: $(PERLEXE) $(X2P) + cd ..\utils + $(MAKE) PERL=$(MINIPERL) + cd ..\pod + copy ..\README.aix .\perlaix.pod + copy ..\README.amiga .\perlamiga.pod + copy ..\README.apollo .\perlapollo.pod + copy ..\README.beos .\perlbeos.pod + copy ..\README.bs2000 .\perlbs2000.pod + copy ..\README.ce .\perlce.pod + copy ..\README.cygwin .\perlcygwin.pod + copy ..\README.dgux .\perldgux.pod + copy ..\README.dos .\perldos.pod + copy ..\README.epoc .\perlepoc.pod + copy ..\README.hurd .\perlhurd.pod + copy ..\README.hpux .\perlhpux.pod + copy ..\README.machten .\perlmachten.pod + copy ..\README.macos .\perlmacos.pod + copy ..\README.mint .\perlmint.pod + copy ..\README.mpeix .\perlmpeix.pod + copy ..\README.netware .\perlnetware.pod + copy ..\README.os2 .\perlos2.pod + copy ..\README.os390 .\perlos390.pod + copy ..\README.plan9 .\perlplan9.pod + copy ..\README.qnx .\perlqnx.pod + copy ..\README.solaris .\perlsolaris.pod + copy ..\README.tru64 .\perltru64.pod + copy ..\README.uts .\perluts.pod + copy ..\README.vmesa .\perlvmesa.pod + copy ..\vms\perlvms.pod .\perlvms.pod + copy ..\README.vos .\perlvos.pod + copy ..\README.win32 .\perlwin32.pod + $(MAKE) -f ..\win32\pod.mak converters + cd ..\lib + $(PERLEXE) lib_pm.PL + cd ..\win32 + $(PERLEXE) $(PL2BAT) $(UTILS) + +distclean: clean + -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \ + $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD) + -del /f *.def *.map + -del /f $(EXTENSION_DLL) + -del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm + -del /f $(EXTDIR)\DynaLoader\dl_win32.xs + -del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm + -del /f $(LIBDIR)\XSLoader.pm + -del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm + -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.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 $(LIBDIR)\ByteLoader.pm + -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)\Digest\MD5.pm + -del /f $(LIBDIR)\PerlIO\Scalar.pm + -del /f $(LIBDIR)\PerlIO\Via.pm + -del /f $(LIBDIR)\MIME\Base64.pm + -del /f $(LIBDIR)\MIME\QuotedPrint.pm + -del /f $(LIBDIR)\List\Util.pm + -del /f $(LIBDIR)\Scalar\Util.pm + -del /f $(LIBDIR)\Time\HiRes.pm + -del /f $(LIBDIR)\XS\Typemap.pm + -del /f $(LIBDIR)\Unicode\Normalize.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\Util rmdir /s /q $(LIBDIR)\Filter\Util + -if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest + -rmdir /s $(LIBDIR)\Digest + -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME + -rmdir /s $(LIBDIR)\MIME + -if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List + -rmdir /s $(LIBDIR)\List + -if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar + -rmdir /s $(LIBDIR)\Scalar + -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS + -rmdir /s $(LIBDIR)\XS + cd $(PODDIR) + -del /f *.html *.bat checkpods \ + perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \ + perlbs2000.pod perlce.pod perlcygwin.pod perldgux.pod \ + perldos.pod perlepoc.pod perlhurd.pod \ + perlhpux.pod perlmachten.pod \ + perlmacos.pod perlmint.pod perlmpeix.pod perlnetware.pod \ + perlos2.pod perlos390.pod perlplan9.pod perlqnx.pod \ + perlsolaris.pod perltru64.pod perluts.pod \ + perlvmesa.pod perlvms.pod perlvos.pod \ + perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \ + podchecker podselect + cd ..\utils + -del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc perlivp dprofpp + -del /f *.bat + cd ..\win32 + cd ..\x2p + -del /f find2perl s2p + -del /f *.bat + cd ..\win32 + -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new + -del /f $(CONFIGPM) + -del /f bin\*.bat + cd $(EXTDIR) + -del /s *.lib *.def *.map *.pdb *.bs Makefile *$(o) pm_to_blib + cd ..\win32 + -if exist $(AUTODIR) rmdir /s /q $(AUTODIR) + -rmdir /s $(AUTODIR) + -if exist $(COREDIR) rmdir /s /q $(COREDIR) + -rmdir /s $(COREDIR) + +install : all installbare installhtml + +installbare : utils + $(PERLEXE) ..\installperl + if exist $(WPERLEXE) $(XCOPY) $(WPERLEXE) $(INST_BIN)\*.* + $(XCOPY) $(GLOBEXE) $(INST_BIN)\*.* + $(XCOPY) bin\*.bat $(INST_SCRIPT)\*.* + +installhtml : doc + $(RCOPY) html\*.* $(INST_HTML)\*.* + +inst_lib : $(CONFIGPM) + copy splittree.pl .. + $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR) + $(RCOPY) ..\lib $(INST_LIB)\*.* + +minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils + $(XCOPY) $(MINIPERL) ..\t\perl.exe + $(XCOPY) $(GLOBEXE) ..\t\$(NULL) + attrib -r ..\t\*.* + copy test ..\t + cd ..\t + $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t + cd ..\win32 + +test-prep : all utils + $(XCOPY) $(PERLEXE) ..\t\$(NULL) + $(XCOPY) $(PERLDLL) ..\t\$(NULL) + $(XCOPY) $(GLOBEXE) ..\t\$(NULL) + +test : test-prep + cd ..\t + $(PERLEXE) -I..\lib harness + cd ..\win32 + +test-notty : test-prep + set PERL_SKIP_TTY_TEST=1 + cd ..\t + $(PERLEXE) -I..\lib harness + cd ..\win32 + +test-wide : test-prep + set HARNESS_PERL_SWITCHES=-C + cd ..\t + $(PERLEXE) -I..\lib harness + cd ..\win32 + +test-wide-notty : test-prep + set PERL_SKIP_TTY_TEST=1 + set HARNESS_PERL_SWITCHES=-C + cd ..\t + $(PERLEXE) -I..\lib harness + cd ..\win32 + +clean : Extensions_clean + -@$(DEL) miniperlmain$(o) + -@$(DEL) $(MINIPERL) + -@$(DEL) perlglob$(o) + -@$(DEL) perlmain$(o) + -@$(DEL) config.w32 + -@$(DEL) config.h + -@$(DEL) $(GLOBEXE) + -@$(DEL) $(PERLEXE) + -@$(DEL) $(WPERLEXE) + -@$(DEL) $(PERLDLL) + -@$(DEL) $(CORE_OBJ) + -if exist $(MINIDIR) rmdir /s /q $(MINIDIR) + -rmdir /s $(MINIDIR) + -@$(DEL) $(WIN32_OBJ) + -@$(DEL) $(DLL_OBJ) + -@$(DEL) $(X2P_OBJ) + -@$(DEL) ..\*$(o) ..\*.lib ..\*.exp *$(o) *.lib *.exp *.res + -@$(DEL) ..\t\*.exe ..\t\*.dll ..\t\*.bat + -@$(DEL) ..\x2p\*.exe ..\x2p\*.bat + -@$(DEL) *.ilk + -@$(DEL) *.pdb + +# Handy way to run perlbug -ok without having to install and run the +# installed perlbug. We don't re-run the tests here - we trust the user. +# Please *don't* use this unless all tests pass. +# If you want to report test failures, use "nmake nok" instead. +ok: utils + $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)" + +okfile: utils + $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)" -F perl.ok + +nok: utils + $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)" + +nokfile: utils + $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)" -F perl.nok diff --git a/win32/config_H.bc b/win32/config_H.bc index a8b039b..631e06d 100644 --- a/win32/config_H.bc +++ b/win32/config_H.bc @@ -980,7 +980,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.7.2\\lib\\MSWin32-x86-multi-thread" /**/ +#define ARCHLIB "c:\\perl\\5.7.3\\lib\\MSWin32-x86-multi-thread" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -1011,8 +1011,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.7.2\\bin\\MSWin32-x86-multi-thread" /**/ -#define BIN_EXP "c:\\perl\\5.7.2\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN_EXP "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread" /**/ /* PERL_BINCOMPAT_5005: * This symbol, if defined, indicates that this version of Perl should be @@ -2959,8 +2959,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.7.2\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.7.2")) /**/ +#define PRIVLIB "c:\\perl\\5.7.3\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.7.3")) /**/ /* PTRSIZE: * This symbol contains the size of a pointer, so that the C preprocessor @@ -3063,7 +3063,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.7.2\\lib\\MSWin32-x86-multi-thread" /**/ +#define SITEARCH "c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3086,8 +3086,8 @@ * removed. The elements in inc_version_list (inc_version_list.U) can * be tacked onto this variable to generate a list of directories to search. */ -#define SITELIB "c:\\perl\\site\\5.7.2\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.7.2")) /**/ +#define SITELIB "c:\\perl\\site\\5.7.3\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.7.3")) /**/ #define SITELIB_STEM "" /**/ /* Size_t_size: @@ -3324,7 +3324,7 @@ /* PERL_XS_APIVERSION: * This variable contains the version of the oldest perl binary * compatible with the present perl. perl.c:incpush() and - * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.2\\lib\\MSWin32-x86-multi-thread for older + * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread for older * directories across major versions back to xs_apiversion. * This is only useful if you have a perl library directory tree * structured like the default one. @@ -3343,7 +3343,7 @@ * compatible with the present perl. (That is, pure perl modules * written for pm_apiversion will still work for the current * version). perl.c:incpush() and lib/lib.pm will automatically - * search in c:\\perl\\site\\5.7.2\\lib for older directories across major versions + * search in c:\\perl\\site\\5.7.3\\lib for older directories across major versions * back to pm_apiversion. This is only useful if you have a perl * library directory tree structured like the default one. The * versioned site_perl library was introduced in 5.005, so that's diff --git a/win32/config_H.gc b/win32/config_H.gc index c15dba1..2c39f80 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -980,7 +980,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.7.2\\lib\\MSWin32-x86-multi-thread" /**/ +#define ARCHLIB "c:\\perl\\5.7.3\\lib\\MSWin32-x86-multi-thread" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -1011,8 +1011,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.7.2\\bin\\MSWin32-x86-multi-thread" /**/ -#define BIN_EXP "c:\\perl\\5.7.2\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN_EXP "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread" /**/ /* PERL_BINCOMPAT_5005: * This symbol, if defined, indicates that this version of Perl should be @@ -2959,8 +2959,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.7.2\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.7.2")) /**/ +#define PRIVLIB "c:\\perl\\5.7.3\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.7.3")) /**/ /* PTRSIZE: * This symbol contains the size of a pointer, so that the C preprocessor @@ -3063,7 +3063,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.7.2\\lib\\MSWin32-x86-multi-thread" /**/ +#define SITEARCH "c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3086,8 +3086,8 @@ * removed. The elements in inc_version_list (inc_version_list.U) can * be tacked onto this variable to generate a list of directories to search. */ -#define SITELIB "c:\\perl\\site\\5.7.2\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.7.2")) /**/ +#define SITELIB "c:\\perl\\site\\5.7.3\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.7.3")) /**/ #define SITELIB_STEM "" /**/ /* Size_t_size: @@ -3324,7 +3324,7 @@ /* PERL_XS_APIVERSION: * This variable contains the version of the oldest perl binary * compatible with the present perl. perl.c:incpush() and - * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.2\\lib\\MSWin32-x86-multi-thread for older + * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread for older * directories across major versions back to xs_apiversion. * This is only useful if you have a perl library directory tree * structured like the default one. @@ -3343,7 +3343,7 @@ * compatible with the present perl. (That is, pure perl modules * written for pm_apiversion will still work for the current * version). perl.c:incpush() and lib/lib.pm will automatically - * search in c:\\perl\\site\\5.7.2\\lib for older directories across major versions + * search in c:\\perl\\site\\5.7.3\\lib for older directories across major versions * back to pm_apiversion. This is only useful if you have a perl * library directory tree structured like the default one. The * versioned site_perl library was introduced in 5.005, so that's diff --git a/win32/config_H.vc b/win32/config_H.vc index 58b22db..e378f5a 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -980,7 +980,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.7.2\\lib\\MSWin32-x86-multi-thread" /**/ +#define ARCHLIB "c:\\perl\\5.7.3\\lib\\MSWin32-x86-multi-thread" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -1011,8 +1011,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.7.2\\bin\\MSWin32-x86-multi-thread" /**/ -#define BIN_EXP "c:\\perl\\5.7.2\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread" /**/ +#define BIN_EXP "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread" /**/ /* PERL_BINCOMPAT_5005: * This symbol, if defined, indicates that this version of Perl should be @@ -2959,8 +2959,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.7.2\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.7.2")) /**/ +#define PRIVLIB "c:\\perl\\5.7.3\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.7.3")) /**/ /* PTRSIZE: * This symbol contains the size of a pointer, so that the C preprocessor @@ -3063,7 +3063,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.7.2\\lib\\MSWin32-x86-multi-thread" /**/ +#define SITEARCH "c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3086,8 +3086,8 @@ * removed. The elements in inc_version_list (inc_version_list.U) can * be tacked onto this variable to generate a list of directories to search. */ -#define SITELIB "c:\\perl\\site\\5.7.2\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.7.2")) /**/ +#define SITELIB "c:\\perl\\site\\5.7.3\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.7.3")) /**/ #define SITELIB_STEM "" /**/ /* Size_t_size: @@ -3324,7 +3324,7 @@ /* PERL_XS_APIVERSION: * This variable contains the version of the oldest perl binary * compatible with the present perl. perl.c:incpush() and - * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.2\\lib\\MSWin32-x86-multi-thread for older + * lib/lib.pm will automatically search in c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread for older * directories across major versions back to xs_apiversion. * This is only useful if you have a perl library directory tree * structured like the default one. @@ -3343,7 +3343,7 @@ * compatible with the present perl. (That is, pure perl modules * written for pm_apiversion will still work for the current * version). perl.c:incpush() and lib/lib.pm will automatically - * search in c:\\perl\\site\\5.7.2\\lib for older directories across major versions + * search in c:\\perl\\site\\5.7.3\\lib for older directories across major versions * back to pm_apiversion. This is only useful if you have a perl * library directory tree structured like the default one. The * versioned site_perl library was introduced in 5.005, so that's diff --git a/wince/Makefile.ce b/wince/Makefile.ce index e5fefa9..f95c49c 100644 --- a/wince/Makefile.ce +++ b/wince/Makefile.ce @@ -4,7 +4,7 @@ SRCDIR = .. PV = 57 -INST_VER = 5.7.2 +INST_VER = 5.7.3 PERLCEDIR = H:\src\wince\perl\wince WCEROOT = N:\Windows CE Tools WCEROOT = D:\Windows CE Tools diff --git a/wince/config.h b/wince/config.h index 9f0710a..4962af7 100644 --- a/wince/config.h +++ b/wince/config.h @@ -1021,7 +1021,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 "5.7.2\\lib" /**/ +#define ARCHLIB "5.7.3\\lib" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -1052,8 +1052,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 "5.7.2\\bin" /**/ -#define BIN_EXP "5.7.2\\bin" /**/ +#define BIN "5.7.3\\bin" /**/ +#define BIN_EXP "5.7.3\\bin" /**/ /* PERL_BINCOMPAT_5005: * This symbol, if defined, indicates that this version of Perl should be @@ -2894,8 +2894,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 "5.7.2\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.7.2")) /**/ +#define PRIVLIB "5.7.3\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.7.3")) /**/ /* PTRSIZE: * This symbol contains the size of a pointer, so that the C preprocessor @@ -2998,7 +2998,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 "\\site5.7.2\\lib" /**/ +#define SITEARCH "\\site5.7.3\\lib" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -3021,8 +3021,8 @@ * removed. The elements in inc_version_list (inc_version_list.U) can * be tacked onto this variable to generate a list of directories to search. */ -#define SITELIB "\\site5.7.2\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.7.2")) /**/ +#define SITELIB "\\site5.7.3\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.7.3")) /**/ #define SITELIB_STEM "" /**/ /* Size_t_size: @@ -3259,7 +3259,7 @@ /* PERL_XS_APIVERSION: * This variable contains the version of the oldest perl binary * compatible with the present perl. perl.c:incpush() and - * lib/lib.pm will automatically search in \\site5.7.2\\lib for older + * lib/lib.pm will automatically search in \\site5.7.3\\lib for older * directories across major versions back to xs_apiversion. * This is only useful if you have a perl library directory tree * structured like the default one. @@ -3278,7 +3278,7 @@ * compatible with the present perl. (That is, pure perl modules * written for pm_apiversion will still work for the current * version). perl.c:incpush() and lib/lib.pm will automatically - * search in \\site5.7.2\\lib for older directories across major versions + * search in \\site5.7.3\\lib for older directories across major versions * back to pm_apiversion. This is only useful if you have a perl * library directory tree structured like the default one. The * versioned site_perl library was introduced in 5.005, so that's