X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fmakefile.mk;h=d632b16a7fbf08fa5ea48d0bdbfe8320bcea1fa2;hb=25270bc0b7409c7dbdeef1a6ec0b548e2d3e51a1;hp=9159f1d38654fc2a9a6b2239a180cbeae00f1e11;hpb=bdb4cb8840ea1c52d93df2ca4ff3757a85e58737;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/makefile.mk b/win32/makefile.mk index 9159f1d..d632b16 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1,9 +1,9 @@ # # Makefile to build perl on Windows NT using DMAKE. # Supported compilers: -# Visual C++ 2.0 through 6.0 (and possibly newer versions) -# Borland C++ 5.02 -# Mingw32 with gcc-2.95.2 or better **experimental** +# Visual C++ 2.0 or later +# Borland C++ 5.02 or later +# MinGW with gcc-2.95.2 or later # MS Platform SDK 64-bit compiler and tools **experimental** # # This is set up to build a perl.exe that runs off a shared library @@ -34,7 +34,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.9.2 +#INST_VER *= \5.9.5 # # Comment this out if you DON'T want your perl installation to have @@ -48,6 +48,14 @@ INST_TOP *= $(INST_DRV)\perl #INST_ARCH *= \$(ARCHNAME) # +# Uncomment this if you want perl to run +# $Config{sitelibexp}\sitecustomize.pl +# before anything else. This script can then be set up, for example, +# to add additional entries to @INC. +# +#USE_SITECUST *= define + +# # uncomment to enable multiple interpreters. This is need for fork() # emulation and for thread support. # @@ -88,8 +96,16 @@ USE_LARGE_FILES *= define #CCTYPE *= MSVC20 # Visual C++ > 2.x and < 6.x #CCTYPE *= MSVC -# Visual C++ >= 6.x +# Visual C++ 6.x (aka Visual C++ 98) #CCTYPE *= MSVC60 +# Visual C++ Toolkit 2003 (aka Visual C++ 7.x) (free command-line tools) +#CCTYPE *= MSVC70FREE +# Visual C++ .NET 2003 (aka Visual C++ 7.x) (full version) +#CCTYPE *= MSVC70 +# Visual C++ 2005 Express Edition (aka Visual C++ 8.x) (free version) +#CCTYPE *= MSVC80FREE +# Visual C++ 2005 (aka Visual C++ 8.x) (full version) +#CCTYPE *= MSVC80 # Borland 5.02 or later #CCTYPE *= BORLAND # MinGW with gcc-2.95.2 or later @@ -165,6 +181,15 @@ CRYPT_SRC *= fcrypt.c #DEBUG_MSTATS *= define # +# set this to additionally provide a statically linked perl-static.exe. +# Note that dynamic loading will not work with this perl, so you must +# include required modules statically using STATIC_EXT variable below. +# A static library perl59s.lib will also be created. +# Ordinary perl.exe is not affected by this option. +# +#BUILD_STATIC *= 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, @@ -172,7 +197,7 @@ CRYPT_SRC *= fcrypt.c # not be quoted) # .IF "$(CCTYPE)" == "BORLAND" -CCHOME *= C:\borland\bcc55 +CCHOME *= C:\Borland\BCC55 .ELIF "$(CCTYPE)" == "GCC" CCHOME *= C:\MinGW .ELSE @@ -184,6 +209,17 @@ CCLIBDIR *= $(CCHOME)\lib # # Additional compiler flags can be specified here. # +BUILDOPT *= $(BUILDOPTEXTRA) + +# +# Adding -DPERL_HASH_SEED_EXPLICIT will disable randomization of Perl's +# internal hash function unless the PERL_HASH_SEED environment variable is set. +# Alternatively, adding -DNO_HASH_SEED will completely disable the +# randomization feature. +# The latter is required to maintain binary compatibility with Perl 5.8.0. +# +#BUILDOPT += -DPERL_HASH_SEED_EXPLICIT +#BUILDOPT += -DNO_HASH_SEED # # This should normally be disabled. Adding -DPERL_POLLUTE enables support @@ -241,6 +277,7 @@ CRYPT_FLAG = -DHAVE_DES_FCRYPT PERL_MALLOC *= undef DEBUG_MSTATS *= undef +USE_SITECUST *= undef USE_MULTI *= undef USE_ITHREADS *= undef USE_IMP_SYS *= undef @@ -268,6 +305,10 @@ USE_MULTI != define USE_MULTI != define .ENDIF +.IF "$(USE_SITECUST)" == "define" +BUILDOPT += -DUSE_SITECUSTOMIZE +.ENDIF + .IF "$(USE_MULTI)" != "undef" BUILDOPT += -DPERL_IMPLICIT_CONTEXT .ENDIF @@ -281,44 +322,59 @@ BUILDOPT += -DPERL_IMPLICIT_SYS PROCESSOR_ARCHITECTURE *= x86 .IF "$(WIN64)" == "" +# When we are running from a 32bit cmd.exe on AMD64 then +# PROCESSOR_ARCHITECTURE is set to x86 and PROCESSOR_ARCHITEW6432 +# is set to AMD64 .IF "$(PROCESSOR_ARCHITEW6432)" != "" PROCESSOR_ARCHITECTURE != $(PROCESSOR_ARCHITEW6432) WIN64 = define -.ELIF "$(PROCESSOR_ARCHITECTURE)" == "IA64" +.ELIF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" || "$(PROCESSOR_ARCHITECTURE)" == "IA64" WIN64 = define .ELSE WIN64 = undef .ENDIF .ENDIF +ARCHITECTURE = $(PROCESSOR_ARCHITECTURE) +.IF "$(ARCHITECTURE)" == "AMD64" +ARCHITECTURE = x64 +.ENDIF +.IF "$(ARCHITECTURE)" == "IA64" +ARCHITECTURE = ia64 +.ENDIF + .IF "$(USE_MULTI)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi +ARCHNAME = MSWin32-$(ARCHITECTURE)-multi .ELSE .IF "$(USE_PERLIO)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-perlio +ARCHNAME = MSWin32-$(ARCHITECTURE)-perlio .ELSE -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE) +ARCHNAME = MSWin32-$(ARCHITECTURE) .ENDIF -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE) .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. +# Visual C++ 98, .NET 2003 and 2005 specific. +# VC++ 6.x, 7.x and 8.x can load DLL's on demand. Makes the test suite run in +# about 10% less time. (The free version of 7.x can't do this, but the free +# version of 8.x can.) +.IF "$(CCTYPE)" == "MSVC60" || "$(CCTYPE)" == "MSVC70" \ + "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" DELAYLOAD *= -DELAYLOAD:ws2_32.dll -DELAYLOAD:shell32.dll delayimp.lib - -.IF "$(CFG)" == "Debug" -.ELSE -# VC 6.0 seems capable of compiling perl correctly with optimizations -# enabled. Anything earlier fails tests. -CFG *= Optimize .ENDIF + +# Visual C++ 2005 (VC++ 8.x) creates manifest files for EXEs and DLLs. These +# either need copying everywhere with the binaries, or else need embedding in +# them otherwise MSVCR80.dll won't be found. Embed them for simplicity, and +# delete them afterwards so that they don't get installed too. +.IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" +EMBED_EXE_MANI = mt -nologo -manifest $@.manifest -outputresource:$@;1 && \ + del $@.manifest +EMBED_DLL_MANI = mt -nologo -manifest $@.manifest -outputresource:$@;2 && \ + del $@.manifest .ENDIF ARCHDIR = ..\lib\$(ARCHNAME) @@ -328,6 +384,7 @@ LIBDIR = ..\lib EXTDIR = ..\ext PODDIR = ..\pod EXTUTILSDIR = $(LIBDIR)\ExtUtils +HTMLDIR = .\html # INST_SCRIPT = $(INST_TOP)$(INST_VER)\bin @@ -335,7 +392,6 @@ 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 # @@ -352,9 +408,9 @@ LINK32 = ilink32 .ELSE LINK32 = tlink32 .ENDIF -LIB32 = tlib /P128 +LIB32 = tlib /a /P128 IMPLIB = implib -c -RSC = rc +RSC = brcc32 # # Options @@ -367,7 +423,14 @@ SUBSYS = console CXX_FLAG = -P LIBC = cw32mti.lib -LIBFILES = $(CRYPT_LIB) import32.lib $(LIBC) + +# same libs as MSVC, except Borland doesn't have oldnames.lib +LIBFILES = $(CRYPT_LIB) \ + kernel32.lib user32.lib gdi32.lib winspool.lib \ + comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ + netapi32.lib uuid.lib ws2_32.lib mpr.lib winmm.lib \ + version.lib odbc32.lib odbccp32.lib \ + import32.lib $(LIBC) .IF "$(CFG)" == "Debug" OPTIMIZE = -v -D_RTLDLL -DDEBUGGING @@ -377,9 +440,11 @@ OPTIMIZE = -O2 -D_RTLDLL LINK_DBG = .ENDIF +EXTRACFLAGS = CFLAGS = -w -g0 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \ $(PCHFLAGS) $(OPTIMIZE) -LINK_FLAGS = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)" +LINK_FLAGS = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)" \ + -L"$(CCLIBDIR)\PSDK" OBJOUT_FLAG = -o EXEOUT_FLAG = -e LIBOUT_FLAG = @@ -422,7 +487,7 @@ LIBFILES = $(CRYPT_LIB) $(LIBC) \ -lmoldname -lkernel32 -luser32 -lgdi32 \ -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 \ -loleaut32 -lnetapi32 -luuid -lws2_32 -lmpr \ - -lwinmm -lversion -lodbc32 + -lwinmm -lversion -lodbc32 -lodbccp32 .IF "$(CFG)" == "Debug" OPTIMIZE = -g -O2 -DDEBUGGING @@ -432,6 +497,7 @@ OPTIMIZE = -s -O2 LINK_DBG = -s .ENDIF +EXTRACFLAGS = CFLAGS = $(INCLUDES) $(DEFINES) $(LOCDEFS) $(OPTIMIZE) LINK_FLAGS = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)" OBJOUT_FLAG = -o @@ -439,6 +505,7 @@ EXEOUT_FLAG = -o LIBOUT_FLAG = # NOTE: we assume that GCC uses MSVCRT.DLL +# See comments about PERL_MSVCRT_READFIX in the "cl" compiler section below. BUILDOPT += -fno-strict-aliasing -DPERL_MSVCRT_READFIX .ELSE @@ -457,7 +524,7 @@ INCLUDES = -I$(COREDIR) -I.\include -I. -I.. DEFINES = -DWIN32 -D_CONSOLE -DNO_STRICT $(CRYPT_FLAG) LOCDEFS = -DPERLDLL -DPERL_CORE SUBSYS = console -CXX_FLAG = -TP -GX +CXX_FLAG = -TP -EHsc .IF "$(USE_PERLCRT)" != "define" LIBC = msvcrt.lib @@ -495,32 +562,48 @@ OPTIMIZE += -O1 .IF "$(WIN64)" == "define" DEFINES += -DWIN64 -DCONSERVATIVE -OPTIMIZE += -Wp64 -Op +OPTIMIZE += -Wp64 -fp:precise +.ENDIF + +# For now, silence VC++ 8.x's warnings about "unsafe" CRT functions and POSIX +# CRT function names being deprecated. +.IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" +DEFINES += -D_CRT_SECURE_NO_DEPRECATE -wd4996 .ENDIF +# Use the MSVCRT read() fix if the PerlCRT was not chosen, but only when using +# VC++ 6.x or earlier. Later versions use MSVCR70.dll, MSVCR71.dll, etc, which +# do not require the fix. +.IF "$(CCTYPE)" == "MSVC20" || "$(CCTYPE)" == "MSVC" || "$(CCTYPE)" == "MSVC60" .IF "$(USE_PERLCRT)" != "define" BUILDOPT += -DPERL_MSVCRT_READFIX .ENDIF +.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 ws2_32.lib mpr.lib winmm.lib \ - version.lib + version.lib odbc32.lib odbccp32.lib -# win64 doesn't have some libs -.IF "$(WIN64)" != "define" -LIBBASEFILES += odbc32.lib odbccp32.lib +# The 64 bit Platform SDK compilers contain a runtime library that doesn't +# include the buffer overrun verification code used by the /GS switch. +# Since the code links against libraries that are compiled with /GS, this +# "security cookie verification" must be included via bufferoverlow.lib. +.IF "$(WIN64)" == "define" +LIBBASEFILES = $(LIBBASEFILES) bufferoverflowU.lib .ENDIF # we add LIBC here, since we may be using PerlCRT.dll LIBFILES = $(LIBBASEFILES) $(LIBC) -CFLAGS = -nologo -Gf -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \ +EXTRACFLAGS = -nologo -GF -W3 +CFLAGS = $(EXTRACFLAGS) $(INCLUDES) $(DEFINES) $(LOCDEFS) \ $(PCHFLAGS) $(OPTIMIZE) LINK_FLAGS = -nologo -nodefaultlib $(LINK_DBG) \ -libpath:"$(INST_COREDIR)" \ -machine:$(PROCESSOR_ARCHITECTURE) +LIB_FLAGS = -nologo OBJOUT_FLAG = -Fo EXEOUT_FLAG = -Fe LIBOUT_FLAG = /out: @@ -543,12 +626,23 @@ BLINK_FLAGS = $(PRIV_LINK_FLAGS) $(LINK_FLAGS) # require backslashes to be doubled-up when written to $(mktmp) files. # Other dmake's do not require this and would actually output a double # backslash if they were doubled-up. -.IF "$(shell type $(mktmp \\))"=="\\" +.IF "$(shell @type $(mktmp \\))"=="\\" B=\\ .ELSE B=\\\ .ENDIF +# There is a related issue with other escape sequences: Sarathy's old +# dmake automatically maps escape sequences like \n to their ASCII values +# when used in macros, while other dmake's only do so if this behaviour +# is explicitly requested with the :m modifier. +DONTUSETHIS=\n +.IF "$(shell @type $(mktmp \n))"=="\n" +N=$(DONTUSETHIS:m) +.ELSE +N=$(DONTUSETHIS) +.ENDIF + o *= .obj a *= .lib @@ -580,11 +674,12 @@ $(o).dll: .ELSE $(LINK32) -dll -subsystem:windows -implib:$(*B).lib -def:$(*B).def \ -out:$@ $(BLINK_FLAGS) $(LIBFILES) $< $(LIBPERL) + $(EMBED_DLL_MANI) .ENDIF .rc.res: .IF "$(CCTYPE)" == "GCC" - $(RSC) --use-temp-file -i $< -o $@ + $(RSC) --use-temp-file -I . -I .. -O COFF -i $< -o $@ .ELSE $(RSC) -i.. $< .ENDIF @@ -595,10 +690,16 @@ MINIPERL = ..\miniperl.exe MINIDIR = .\mini PERLEXE = ..\perl.exe WPERLEXE = ..\wperl.exe +PERLEXESTATIC = ..\perl-static.exe GLOBEXE = ..\perlglob.exe CONFIGPM = ..\lib\Config.pm ..\lib\Config_heavy.pl MINIMOD = ..\lib\ExtUtils\Miniperl.pm X2P = ..\x2p\a2p.exe +.IF "$(BUILD_STATIC)" == "define" +PERLSTATIC = static +.ELSE +PERLSTATIC = +.ENDIF # Unicode data files generated by mktables UNIDATAFILES = ..\lib\unicore\Canonical.pl ..\lib\unicore\Exact.pl \ @@ -634,15 +735,21 @@ UTILS = \ ..\utils\pstruct \ ..\utils\h2xs \ ..\utils\perldoc \ - ..\utils\perlcc \ ..\utils\perlivp \ ..\utils\libnetcfg \ ..\utils\enc2xs \ ..\utils\piconv \ + ..\utils\config_data \ ..\utils\corelist \ ..\utils\cpan \ ..\utils\xsubpp \ ..\utils\prove \ + ..\utils\ptar \ + ..\utils\ptardiff \ + ..\utils\cpanp-run-perl \ + ..\utils\cpanp \ + ..\utils\cpan2dist \ + ..\utils\shasum \ ..\utils\instmodsh \ ..\pod\checkpods \ ..\pod\pod2html \ @@ -671,6 +778,7 @@ CFGH_TMPL = config_H.bc CFGSH_TMPL = config.gc CFGH_TMPL = config_H.gc PERLIMPLIB = ..\libperl59$(a) +PERLSTATICLIB = ..\libperl59s$(a) .ELSE @@ -687,10 +795,11 @@ CFGH_TMPL = config_H.vc # makedef.pl must be updated if this changes, and this should normally # only change when there is an incompatible revision of the public API. PERLIMPLIB *= ..\perl59$(a) +PERLSTATICLIB *= ..\perl59s$(a) PERLDLL = ..\perl59.dll -XCOPY = xcopy /f /r /i /d -RCOPY = xcopy /f /r /i /e /d +XCOPY = xcopy /f /r /i /d /y +RCOPY = xcopy /f /r /i /e /d /y NOOP = @rem # @@ -707,8 +816,10 @@ MICROCORE_SRC = \ ..\dump.c \ ..\globals.c \ ..\gv.c \ + ..\mro.c \ ..\hv.c \ ..\locale.c \ + ..\mathoms.c \ ..\mg.c \ ..\numeric.c \ ..\op.c \ @@ -821,6 +932,7 @@ X2P_OBJ = $(X2P_SRC:db:+$(o)) PERLDLL_OBJ = $(CORE_OBJ) PERLEXE_OBJ = perlmain$(o) +PERLEXEST_OBJ = perlmainst$(o) PERLDLL_OBJ += $(WIN32_OBJ) $(DLL_OBJ) @@ -828,21 +940,12 @@ PERLDLL_OBJ += $(WIN32_OBJ) $(DLL_OBJ) SETARGV_OBJ = setargv$(o) .ENDIF -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/Call Encode \ - Digest/MD5 PerlIO/scalar MIME/Base64 Time/HiRes \ - Unicode/Normalize Win32 -STATIC_EXT = -NONXS_EXT = Errno +# specify static extensions here +#STATIC_EXT = Cwd Compress/Raw/Zlib +STATIC_EXT = Win32CORE DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader -POD2HTML = $(PODDIR)\pod2html -POD2MAN = $(PODDIR)\pod2man -POD2LATEX = $(PODDIR)\pod2latex -POD2TEXT = $(PODDIR)\pod2text - # vars must be separated by "\t+~\t+", since we're using the tempfile # version of config_sh.pl (we were overflowing someone's buffer by # trying to fit them all on the command line) @@ -855,7 +958,7 @@ CFG_VARS = \ archname=$(ARCHNAME) ~ \ cc=$(CC) ~ \ ld=$(LINK32) ~ \ - ccflags=$(OPTIMIZE) $(DEFINES) $(BUILDOPT) ~ \ + ccflags=$(EXTRACFLAGS) $(OPTIMIZE) $(DEFINES) $(BUILDOPT) ~ \ cf_email=$(EMAIL) ~ \ d_crypt=$(D_CRYPT) ~ \ d_mymalloc=$(PERL_MALLOC) ~ \ @@ -875,6 +978,7 @@ CFG_VARS = \ usemultiplicity=$(USE_MULTI) ~ \ useperlio=$(USE_PERLIO) ~ \ uselargefiles=$(USE_LARGE_FILES) ~ \ + usesitecustomize=$(USE_SITECUST) ~ \ LINK_FLAGS=$(LINK_FLAGS:s,\,$B,) ~ \ optimize=$(OPTIMIZE) @@ -890,16 +994,38 @@ MK2 = __not_needed RIGHTMAKE = .ENDIF +.IMPORT .IGNORE : SystemRoot windir + +# Don't just .IMPORT OS from the environment because dmake sets OS itself. +ENV_OS=$(subst,OS=, $(shell @set OS)) + +.IF "$(ENV_OS)" == "Windows_NT" +ODBCCP32_DLL = $(SystemRoot)\system32\odbccp32.dll +.ELSE +ODBCCP32_DLL = $(windir)\system\odbccp32.dll +.ENDIF + # # Top targets # all : .\config.h $(GLOBEXE) $(MINIPERL) $(MK2) \ $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \ - $(X2P) Extensions + $(X2P) MakePPPort Extensions $(PERLSTATIC) + +..\regnodes.h : ..\regcomp.sym + cd .. && regcomp.pl && cd win32 + +regnodes : ..\regnodes.h + +reonly : regnodes .\config.h $(GLOBEXE) $(MINIPERL) $(MK2) \ + $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \ + $(X2P) Extensions_reonly $(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c +static: $(PERLEXESTATIC) + #---------------------------------------------------------------- #-------------------- BEGIN Win95 SPECIFIC ---------------------- @@ -958,6 +1084,7 @@ $(GLOBEXE) : perlglob$(o) .ELSE $(LINK32) $(BLINK_FLAGS) $(LIBFILES) -out:$@ -subsystem:$(SUBSYS) \ perlglob$(o) setargv$(o) + $(EMBED_EXE_MANI) .ENDIF perlglob$(o) : perlglob.c @@ -999,14 +1126,17 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl $(MINIPERL) : $(MINIDIR) $(MINI_OBJ) $(CRTIPMLIBS) .IF "$(CCTYPE)" == "BORLAND" + if not exist $(CCLIBDIR)\PSDK\odbccp32.lib \ + cd $(CCLIBDIR)\PSDK && implib odbccp32.lib $(ODBCCP32_DLL) $(LINK32) -Tpe -ap $(BLINK_FLAGS) \ @$(mktmp c0x32$(o) $(MINI_OBJ:s,\,$B,),$(@:s,\,$B,),,$(LIBFILES),) .ELIF "$(CCTYPE)" == "GCC" $(LINK32) -v -mconsole -o $@ $(BLINK_FLAGS) \ $(mktmp $(LKPRE) $(MINI_OBJ:s,\,$B,) $(LIBFILES) $(LKPOST)) .ELSE - $(LINK32) -subsystem:console -out:$@ \ - @$(mktmp $(BLINK_FLAGS) $(LIBFILES) $(MINI_OBJ:s,\,$B,)) + $(LINK32) -subsystem:console -out:$@ $(BLINK_FLAGS) \ + @$(mktmp $(LIBFILES) $(MINI_OBJ:s,\,$B,)) + $(EMBED_EXE_MANI) .ENDIF $(MINIDIR) : @@ -1025,9 +1155,9 @@ $(MINIWIN32_OBJ) : $(CORE_NOCFG_H) perllib$(o) : perllib.c .\perlhost.h .\vdir.h .\vmem.h .IF "$(USE_IMP_SYS)" == "define" - $(CC) -c -I. -DWITH_STATIC $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c + $(CC) -c -I. $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c .ELSE - $(CC) -c -I. -DWITH_STATIC $(CFLAGS_O) $(OBJOUT_FLAG)$@ perllib.c + $(CC) -c -I. $(CFLAGS_O) $(OBJOUT_FLAG)$@ perllib.c .ENDIF # 1. we don't want to rebuild miniperl.exe when config.h changes @@ -1050,15 +1180,15 @@ perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static .IF "$(CCTYPE)" == "BORLAND" $(LINK32) -Tpd -ap $(BLINK_FLAGS) \ - @$(mktmp c0d32$(o) $(PERLDLL_OBJ:s,\,$B,)\n \ - $@,\n \ - $(LIBFILES)\n \ - perldll.def\n) + @$(mktmp c0d32$(o) $(PERLDLL_OBJ:s,\,$B,)$N \ + $(@:s,\,$B,),$N \ + $(subst,\,$B $(shell @type Extensions_static)) $(LIBFILES)$N \ + perldll.def$N) $(IMPLIB) $*.lib $@ .ELIF "$(CCTYPE)" == "GCC" $(LINK32) -mdll -o $@ -Wl,--base-file -Wl,perl.base $(BLINK_FLAGS) \ $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,$B,) \ - $(shell $(MINIPERL) -I..\lib buildext.pl --list-static-libs|tr \\\\ /) \ + $(subst,\,$B $(shell @type Extensions_static)) \ $(LIBFILES) $(LKPOST)) dlltool --output-lib $(PERLIMPLIB) \ --dllname $(PERLDLL:b).dll \ @@ -1067,19 +1197,39 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static --output-exp perl.exp $(LINK32) -mdll -o $@ $(BLINK_FLAGS) \ $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,$B,) \ - $(shell $(MINIPERL) -I..\lib buildext.pl --list-static-libs|tr \\\\ /) \ + $(subst,\,$B $(shell @type Extensions_static)) \ $(LIBFILES) perl.exp $(LKPOST)) .ELSE - $(LINK32) -dll -def:perldll.def -out:$@ \ - $(shell $(MINIPERL) -I..\lib buildext.pl --list-static-libs) \ - @$(mktmp -base:0x28000000 $(BLINK_FLAGS) $(DELAYLOAD) $(LIBFILES) \ - $(PERLDLL_RES) $(PERLDLL_OBJ:s,\,$B,)) + $(LINK32) -dll -def:perldll.def -out:$@ $(BLINK_FLAGS) \ + @Extensions_static \ + @$(mktmp -base:0x28000000 $(DELAYLOAD) $(LIBFILES) \ + $(PERLDLL_RES:s,\,$B,) $(PERLDLL_OBJ:s,\,$B,)) + $(EMBED_DLL_MANI) .ENDIF $(XCOPY) $(PERLIMPLIB) $(COREDIR) +$(PERLSTATICLIB): Extensions_static +.IF "$(CCTYPE)" == "BORLAND" + $(LIB32) $(LIB_FLAGS) $@ \ + @$(mktmp $(subst,\,$B $(shell @type Extensions_static)) \ + $(PERLDLL_OBJ:s,\,$B,)) +.ELIF "$(CCTYPE)" == "GCC" +# XXX: It would be nice if MinGW's ar accepted a temporary file, but this +# doesn't seem to work: +# $(LIB32) $(LIB_FLAGS) $@ \ +# $(mktmp $(LKPRE) $(subst,\,$B $(shell @type Extensions_static)) \ +# $(PERLDLL_OBJ:s,\,$B,) $(LKPOST)) + $(LIB32) $(LIB_FLAGS) $@ \ + $(subst,\,$B $(shell @type Extensions_static)) \ + $(PERLDLL_OBJ:s,\,$B,) +.ELSE + $(LIB32) $(LIB_FLAGS) -out:$@ @Extensions_static \ + @$(mktmp $(PERLDLL_OBJ:s,\,$B,)) +.ENDIF + $(XCOPY) $(PERLSTATICLIB) $(COREDIR) -$(PERLEXE_ICO): $(MINIPERL) makeico.pl - $(MINIPERL) makeico.pl > $@ +$(PERLEXE_ICO): $(MINIPERL) ..\uupacktool.pl $(PERLEXE_ICO).packd + $(MINIPERL) -I..\lib ..\uupacktool.pl -u $(PERLEXE_ICO).packd $(PERLEXE_ICO) $(PERLEXE_RES): perlexe.rc $(PERLEXE_ICO) @@ -1111,8 +1261,9 @@ $(X2P) : $(MINIPERL) $(X2P_OBJ) $(LINK32) -v -o $@ $(BLINK_FLAGS) \ $(mktmp $(LKPRE) $(X2P_OBJ:s,\,$B,) $(LIBFILES) $(LKPOST)) .ELSE - $(LINK32) -subsystem:console -out:$@ \ - @$(mktmp $(BLINK_FLAGS) $(LIBFILES) $(X2P_OBJ:s,\,$B,)) + $(LINK32) -subsystem:console -out:$@ $(BLINK_FLAGS) \ + @$(mktmp $(LIBFILES) $(X2P_OBJ:s,\,$B,)) + $(EMBED_EXE_MANI) .ENDIF perlmain.c : runperl.c @@ -1121,24 +1272,52 @@ perlmain.c : runperl.c perlmain$(o) : perlmain.c $(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c +perlmainst.c : runperl.c + copy runperl.c perlmainst.c + +perlmainst$(o) : perlmainst.c + $(CC) $(CFLAGS_O) -DPERLDLL $(OBJOUT_FLAG)$@ -c perlmainst.c + $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) .IF "$(CCTYPE)" == "BORLAND" $(LINK32) -Tpe -ap $(BLINK_FLAGS) \ - @$(mktmp c0x32$(o) $(PERLEXE_OBJ:s,\,$B,)\n \ - $(@:s,\,$B,),\n \ - $(PERLIMPLIB) $(LIBFILES)\n) + @$(mktmp c0x32$(o) $(PERLEXE_OBJ:s,\,$B,)$N \ + $(@:s,\,$B,),$N \ + $(PERLIMPLIB:s,\,$B,) $(LIBFILES),$N \ + $(PERLEXE_RES:s,\,$B,)$N) .ELIF "$(CCTYPE)" == "GCC" $(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \ - $(PERLEXE_OBJ) $(PERLIMPLIB) $(LIBFILES) + $(PERLEXE_OBJ) $(PERLEXE_RES) $(PERLIMPLIB) $(LIBFILES) .ELSE $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(BLINK_FLAGS) \ $(LIBFILES) $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES) + $(EMBED_EXE_MANI) .ENDIF copy $(PERLEXE) $(WPERLEXE) $(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS copy splittree.pl .. $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR) +$(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES) +.IF "$(CCTYPE)" == "BORLAND" + $(LINK32) -Tpe -ap $(BLINK_FLAGS) \ + @$(mktmp c0x32$(o) $(PERLEXEST_OBJ:s,\,$B,)$N \ + $(@:s,\,$B,),$N \ + $(subst,\,$B $(shell @type Extensions_static)) \ + $(PERLSTATICLIB:s,\,$B,) $(LIBFILES),$N \ + $(PERLEXE_RES:s,\,$B,)$N) +.ELIF "$(CCTYPE)" == "GCC" + $(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \ + $(mktmp $(LKPRE) $(subst,\,$B $(shell @type Extensions_static)) \ + $(PERLSTATICLIB:s,\,$B,) $(LIBFILES) $(PERLEXEST_OBJ) \ + $(PERLEXE_RES:s,\,$B,) $(LKPOST)) +.ELSE + $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(BLINK_FLAGS) \ + @Extensions_static $(PERLSTATICLIB) \ + $(LIBFILES) $(PERLEXEST_OBJ) $(SETARGV_OBJ) $(PERLEXE_RES) + $(EMBED_EXE_MANI) +.ENDIF + $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) if not exist $(AUTODIR) mkdir $(AUTODIR) cd $(EXTDIR)\$(*B) && ..\$(MINIPERL) -I..\..\lib $(*B)_pm.PL @@ -1151,33 +1330,42 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs -#---------------------------------------------------------------------------------- +MakePPPort: $(MINIPERL) $(CONFIGPM) + $(MINIPERL) -I..\lib ..\mkppport + +MakePPPort_clean: + -if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\mkppport --clean + +#------------------------------------------------------------------------------- Extensions : buildext.pl $(PERLDEP) $(CONFIGPM) + $(XCOPY) ..\*.h $(COREDIR)\*.* $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --dynamic - $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic + -if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic -Extensions_static : buildext.pl - $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static - $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --static +Extensions_reonly : buildext.pl $(PERLDEP) $(CONFIGPM) + $(XCOPY) ..\*.h $(COREDIR)\*.* + $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --dynamic +re + -if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic +re -# Note: The next two targets explicitly remove a "blibdirs.exists" file that -# currerntly gets left behind, until CPAN RT Ticket #5616 is resolved. +Extensions_static : buildext.pl $(PERLDEP) $(CONFIGPM) + $(XCOPY) ..\*.h $(COREDIR)\*.* + $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --static + -if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static + $(MINIPERL) -I..\lib buildext.pl --list-static-libs > Extensions_static Extensions_clean : -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean - -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext clean - -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists + -if exist $(MINIPERL) if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext clean Extensions_realclean : -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean - -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext realclean - -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists + -if exist $(MINIPERL) if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext realclean -#---------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- doc: $(PERLEXE) - $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \ + $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \ --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\ --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse @@ -1203,18 +1391,22 @@ utils: $(PERLEXE) $(X2P) copy ..\README.irix ..\pod\perlirix.pod copy ..\README.jp ..\pod\perljp.pod copy ..\README.ko ..\pod\perlko.pod + copy ..\README.linux ..\pod\perllinux.pod copy ..\README.machten ..\pod\perlmachten.pod copy ..\README.macos ..\pod\perlmacos.pod copy ..\README.macosx ..\pod\perlmacosx.pod copy ..\README.mint ..\pod\perlmint.pod copy ..\README.mpeix ..\pod\perlmpeix.pod copy ..\README.netware ..\pod\perlnetware.pod + copy ..\README.openbsd ..\pod\perlopenbsd.pod copy ..\README.os2 ..\pod\perlos2.pod copy ..\README.os390 ..\pod\perlos390.pod copy ..\README.os400 ..\pod\perlos400.pod copy ..\README.plan9 ..\pod\perlplan9.pod copy ..\README.qnx ..\pod\perlqnx.pod + copy ..\README.riscos ..\pod\perlriscos.pod copy ..\README.solaris ..\pod\perlsolaris.pod + copy ..\README.symbian ..\pod\perlsymbian.pod copy ..\README.tru64 ..\pod\perltru64.pod copy ..\README.tw ..\pod\perltw.pod copy ..\README.uts ..\pod\perluts.pod @@ -1222,7 +1414,7 @@ utils: $(PERLEXE) $(X2P) copy ..\README.vms ..\pod\perlvms.pod copy ..\README.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod - copy ..\pod\perl592delta.pod ..\pod\perldelta.pod + copy ..\pod\perl595delta.pod ..\pod\perldelta.pod cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters cd ..\lib && $(PERLEXE) lib_pm.PL $(PERLEXE) $(PL2BAT) $(UTILS) @@ -1230,11 +1422,10 @@ utils: $(PERLEXE) $(X2P) # Note that the pod cleanup in this next section is parsed (and regenerated # by pod/buildtoc so please check that script before making changes here -# the doubled rmdir calls are needed because older cmd shells -# don't understand /q distclean: realclean -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \ - $(PERLIMPLIB) ..\miniperl$(a) $(MINIMOD) + $(PERLIMPLIB) ..\miniperl$(a) $(MINIMOD) \ + $(PERLEXESTATIC) $(PERLSTATICLIB) -del /f *.def *.map -del /f $(DYNALOADER).c -del /f $(EXTDIR)\DynaLoader\dl_win32.xs @@ -1248,12 +1439,12 @@ distclean: realclean -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)\ByteLoader.pm -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm -del /f $(LIBDIR)\Devel\PPPort.pm -del /f $(LIBDIR)\File\Glob.pm -del /f $(LIBDIR)\Storable.pm -del /f $(LIBDIR)\Digest\MD5.pm + -del /f $(LIBDIR)\Digest\SHA.pm -del /f $(LIBDIR)\PerlIO\encoding.pm -del /f $(LIBDIR)\PerlIO\scalar.pm -del /f $(LIBDIR)\PerlIO\via.pm @@ -1262,70 +1453,77 @@ distclean: realclean -del /f $(LIBDIR)\threads\shared.pm -del /f $(LIBDIR)\Time\HiRes.pm -del /f $(LIBDIR)\Unicode\Normalize.pm + -del /f $(LIBDIR)\Math\BigInt\FastCalc.pm -del /f $(LIBDIR)\Win32.pm - -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO - -if exist $(LIBDIR)\IO rmdir /s $(LIBDIR)\IO + -del /f $(LIBDIR)\Win32CORE.pm + -del /f $(LIBDIR)\Win32API\File.pm + -del /f $(LIBDIR)\Win32API\File\cFile.pc -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B - -if exist $(LIBDIR)\B rmdir /s $(LIBDIR)\B + -if exist $(LIBDIR)\Compress rmdir /s /q $(LIBDIR)\Compress -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data - -if exist $(LIBDIR)\Data rmdir /s $(LIBDIR)\Data -if exist $(LIBDIR)\Encode rmdir /s /q $(LIBDIR)\Encode - -if exist $(LIBDIR)\Encode rmdir /s $(LIBDIR)\Encode -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util - -if exist $(LIBDIR)\Filter\Util rmdir /s $(LIBDIR)\Filter\Util - -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME - -if exist $(LIBDIR)\MIME rmdir /s $(LIBDIR)\MIME + -if exist $(LIBDIR)\Hash rmdir /s /q $(LIBDIR)\Hash + -if exist $(LIBDIR)\IO\Compress rmdir /s /q $(LIBDIR)\IO\Compress + -if exist $(LIBDIR)\IO\Socket rmdir /s /q $(LIBDIR)\IO\Socket + -if exist $(LIBDIR)\IO\Uncompress rmdir /s /q $(LIBDIR)\IO\Uncompress -if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List - -if exist $(LIBDIR)\List rmdir /s $(LIBDIR)\List + -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME + -if exist $(LIBDIR)\re rmdir /s /q $(LIBDIR)\re -if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar - -if exist $(LIBDIR)\Scalar rmdir /s $(LIBDIR)\Scalar -if exist $(LIBDIR)\Sys rmdir /s /q $(LIBDIR)\Sys - -if exist $(LIBDIR)\Sys rmdir /s $(LIBDIR)\Sys -if exist $(LIBDIR)\threads rmdir /s /q $(LIBDIR)\threads - -if exist $(LIBDIR)\threads rmdir /s $(LIBDIR)\threads -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS - -if exist $(LIBDIR)\XS rmdir /s $(LIBDIR)\XS + -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -cd $(PODDIR) && del /f *.html *.bat checkpods \ perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \ perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \ perldelta.pod perldgux.pod perldos.pod perlepoc.pod \ perlfreebsd.pod perlhpux.pod perlhurd.pod perlirix.pod \ - perljp.pod perlko.pod perlmachten.pod perlmacos.pod \ - perlmacosx.pod perlmint.pod perlmpeix.pod perlnetware.pod \ - perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \ - perlqnx.pod perlsolaris.pod perltru64.pod perltw.pod \ + perljp.pod perlko.pod perllinux.pod perlmachten.pod \ + perlmacos.pod perlmacosx.pod perlmint.pod perlmpeix.pod \ + perlnetware.pod perlopenbsd.pod perlos2.pod perlos390.pod \ + perlos400.pod perlplan9.pod perlqnx.pod perlriscos.pod \ + perlsolaris.pod perlsymbian.pod perltru64.pod perltw.pod \ perluts.pod perlvmesa.pod perlvms.pod perlvms.pod perlvos.pod \ perlwin32.pod \ pod2html pod2latex pod2man pod2text pod2usage \ podchecker podselect -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ - perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat \ - xsubpp instmodsh prove corelist + perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \ + xsubpp instmodsh prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum corelist config_data -cd ..\x2p && del /f find2perl s2p psed *.bat - -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new + -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new \ + perlmainst.c -del /f $(CONFIGPM) -del /f bin\*.bat -del /f perllibst.h -del /f $(PERLEXE_ICO) perl.base - -cd .. && del /s *$(a) *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib + ren ..\lib\Net\Changes.libnet Changes.tenbil + ren ..\lib\Net\README.libnet README.tenbil + -cd .. && del /s *$(a) *.map *.pdb *.ilk *.tds *.bs *$(o) .exists pm_to_blib + ren ..\lib\Net\Changes.tenbil Changes.libnet + ren ..\lib\Net\README.tenbil README.libnet -cd $(EXTDIR) && del /s *.def Makefile Makefile.old -if exist $(AUTODIR) rmdir /s /q $(AUTODIR) - -if exist $(AUTODIR) rmdir /s $(AUTODIR) -if exist $(COREDIR) rmdir /s /q $(COREDIR) - -if exist $(COREDIR) rmdir /s $(COREDIR) + -if exist pod2htmd.tmp del pod2htmd.tmp + -if exist pod2htmi.tmp del pod2htmi.tmp + -if exist $(HTMLDIR) rmdir /s /q $(HTMLDIR) install : all installbare installhtml installbare : $(RIGHTMAKE) utils $(PERLEXE) ..\installperl if exist $(WPERLEXE) $(XCOPY) $(WPERLEXE) $(INST_BIN)\*.* + if exist $(PERLEXESTATIC) $(XCOPY) $(PERLEXESTATIC) $(INST_BIN)\*.* $(XCOPY) $(GLOBEXE) $(INST_BIN)\*.* if exist ..\perl*.pdb $(XCOPY) ..\perl*.pdb $(INST_BIN)\*.* if exist ..\x2p\a2p.pdb $(XCOPY) ..\x2p\a2p.pdb $(INST_BIN)\*.* $(XCOPY) bin\*.bat $(INST_SCRIPT)\*.* installhtml : doc - $(RCOPY) html\*.* $(INST_HTML)\*.* + $(RCOPY) $(HTMLDIR)\*.* $(INST_HTML)\*.* inst_lib : $(CONFIGPM) copy splittree.pl .. @@ -1349,7 +1547,13 @@ minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils cd ..\t && \ $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t -test-prep : all utils +unpack_files: + $(MINIPERL) -I..\lib ..\uupacktool.pl -u -d .. -m + +cleanup_unpacked_files: + -if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\uupacktool.pl -c -d .. -m + +test-prep : all utils unpack_files $(XCOPY) $(PERLEXE) ..\t\$(NULL) $(XCOPY) $(PERLDLL) ..\t\$(NULL) .IF "$(CCTYPE)" == "BORLAND" @@ -1361,6 +1565,17 @@ test-prep : all utils test : $(RIGHTMAKE) test-prep cd ..\t && $(PERLEXE) -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES) +test-reonly : reonly utils + $(XCOPY) $(PERLEXE) ..\t\$(NULL) + $(XCOPY) $(PERLDLL) ..\t\$(NULL) + $(XCOPY) $(GLOBEXE) ..\t\$(NULL) + cd ..\t && \ + $(PERLEXE) -I..\lib harness $(OPT) -re \bpat\b \breg \bre\b \bsubst \brxcode $(EXTRA) && \ + cd ..\win32 + +regen : + cd .. && regen.pl && cd win32 + test-notty : test-prep set PERL_SKIP_TTY_TEST=1 && \ cd ..\t && $(PERLEXE) -I.\lib harness $(TEST_SWITCHES) $(TEST_FILES) @@ -1375,39 +1590,47 @@ _test : $(RIGHTMAKE) .ENDIF cd ..\t && $(PERLEXE) -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES) -# the doubled rmdir calls are needed because older cmd shells -# don't understand /q _clean : -@erase miniperlmain$(o) -@erase $(MINIPERL) -@erase perlglob$(o) -@erase perlmain$(o) + -@erase perlmainst$(o) -@erase config.w32 -@erase /f config.h -@erase $(GLOBEXE) -@erase $(PERLEXE) -@erase $(WPERLEXE) + -@erase $(PERLEXESTATIC) + -@erase $(PERLSTATICLIB) -@erase $(PERLDLL) -@erase $(CORE_OBJ) -if exist $(MINIDIR) rmdir /s /q $(MINIDIR) - -if exist $(MINIDIR) rmdir /s $(MINIDIR) -if exist $(UNIDATADIR1) rmdir /s /q $(UNIDATADIR1) - -if exist $(UNIDATADIR1) rmdir /s $(UNIDATADIR1) -if exist $(UNIDATADIR2) rmdir /s /q $(UNIDATADIR2) - -if exist $(UNIDATADIR2) rmdir /s $(UNIDATADIR2) -@erase $(UNIDATAFILES) -@erase $(WIN32_OBJ) -@erase $(DLL_OBJ) -@erase $(X2P_OBJ) + ren ..\lib\Net\Changes.libnet Changes.tenbil + ren ..\lib\Net\README.libnet README.tenbil -@erase ..\*$(o) ..\*$(a) ..\*.exp *$(o) *$(a) *.exp *.res + ren ..\lib\Net\Changes.tenbil Changes.libnet + ren ..\lib\Net\README.tenbil README.libnet -@erase ..\t\*.exe ..\t\*.dll ..\t\*.bat -@erase ..\x2p\*.exe ..\x2p\*.bat -@erase *.ilk -@erase *.pdb + -@erase *.tds + -@erase Extensions_static + + -clean : Extensions_clean _clean +_preclean : cleanup_unpacked_files + +clean : _preclean Extensions_clean _clean -realclean : Extensions_realclean _clean +realclean : _preclean Extensions_realclean MakePPPort_clean _clean # 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.