X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fmakefile.mk;h=eac3619afb7846592b6eea71c9a8e3027eed69b9;hb=3e2a970dfeb55332005c7648ee670aa10bb9b414;hp=60688d9c8f8770b03969dc84c61b71804ac949bc;hpb=26a6faa8c051ae454ebc29802780673024f05cbd;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/makefile.mk b/win32/makefile.mk index 60688d9..eac3619 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -7,7 +7,7 @@ # MS Platform SDK 64-bit compiler and tools **experimental** # # This is set up to build a perl.exe that runs off a shared library -# (perl59.dll). Also makes individual DLLs for the XS extensions. +# (perl511.dll). Also makes individual DLLs for the XS extensions. # ## @@ -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.5 +#INST_VER *= \5.11.0 # # Comment this out if you DON'T want your perl installation to have @@ -106,6 +106,10 @@ USE_LARGE_FILES *= define #CCTYPE *= MSVC80FREE # Visual C++ 2005 (aka Visual C++ 8.x) (full version) #CCTYPE *= MSVC80 +# Visual C++ 2008 Express Edition (aka Visual C++ 9.x) (free version) +#CCTYPE *= MSVC90FREE +# Visual C++ 2008 (aka Visual C++ 9.x) (full version) +#CCTYPE *= MSVC90 # Borland 5.02 or later #CCTYPE *= BORLAND # MinGW with gcc-2.95.2 or later @@ -183,13 +187,22 @@ CRYPT_SRC *= fcrypt.c # # 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. +# include required modules statically using the STATIC_EXT or ALL_STATIC +# variables below. A static library perl511s.lib will also be created. # Ordinary perl.exe is not affected by this option. # #BUILD_STATIC *= define # +# in addition to BUILD_STATIC the option ALL_STATIC makes *every* +# extension get statically built +# This will result in a very large perl executable, but the main purpose +# is to have proper linking set so as to be able to create miscellaneous +# executables with different built-in extensions +# +#ALL_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, @@ -357,24 +370,27 @@ ARCHNAME = MSWin32-$(ARCHITECTURE) ARCHNAME !:= $(ARCHNAME)-thread .ENDIF -# 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" +# Visual C++ 98, .NET 2003, 2005 and 2008 specific. +# VC++ 6.x, 7.x, 8.x and 9.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 +# versions of 8.x and 9.x can.) +.IF "$(CCTYPE)" == "MSVC60" || "$(CCTYPE)" == "MSVC70" || \ + "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || + "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" DELAYLOAD *= -DELAYLOAD:ws2_32.dll delayimp.lib .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 +# Visual C++ 2005 and 2008 (VC++ 8.x and 9.x) create manifest files for EXEs and +# DLLs. These either need copying everywhere with the binaries, or else need +# embedding in them otherwise MSVCR80.dll or MSVCR90.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" || \ + "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" +EMBED_EXE_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1 && \ + if exist $@.manifest del $@.manifest +EMBED_DLL_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 && \ + if exist $@.manifest del $@.manifest .ENDIF ARCHDIR = ..\lib\$(ARCHNAME) @@ -506,7 +522,7 @@ 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 +BUILDOPT += -fno-strict-aliasing -mms-bitfields -DPERL_MSVCRT_READFIX .ELSE @@ -565,9 +581,10 @@ DEFINES += -DWIN64 -DCONSERVATIVE 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" +# For now, silence VC++ 8.x's and 9.x's warnings about "unsafe" CRT functions +# and POSIX CRT function names being deprecated. +.IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \ + "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" DEFINES += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE .ENDIF @@ -741,7 +758,6 @@ UTILS = \ ..\utils\cpan2dist \ ..\utils\shasum \ ..\utils\instmodsh \ - ..\pod\checkpods \ ..\pod\pod2html \ ..\pod\pod2latex \ ..\pod\pod2man \ @@ -767,8 +783,8 @@ CFGH_TMPL = config_H.bc CFGSH_TMPL = config.gc CFGH_TMPL = config_H.gc -PERLIMPLIB = ..\libperl59$(a) -PERLSTATICLIB = ..\libperl59s$(a) +PERLIMPLIB = ..\libperl511$(a) +PERLSTATICLIB = ..\libperl511s$(a) .ELSE @@ -784,9 +800,9 @@ 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 +PERLIMPLIB *= ..\perl511$(a) +PERLSTATICLIB *= ..\perl511s$(a) +PERLDLL = ..\perl511.dll XCOPY = xcopy /f /r /i /d /y RCOPY = xcopy /f /r /i /e /d /y @@ -932,9 +948,17 @@ PERLDLL_OBJ += $(WIN32_OBJ) $(DLL_OBJ) SETARGV_OBJ = setargv$(o) .ENDIF -# specify static extensions here +.IF "$(ALL_STATIC)" == "define" +# some exclusions, unfortunately, until fixed: +# - Win32 extension contains overlapped symbols with win32.c (BUG!) +# - MakeMaker isn't capable enough for SDBM_File (smaller bug) +# - Encode (encoding search algorithm relies on shared library?) +STATIC_EXT = * !Win32 !SDBM_File !Encode +.ELSE +# specify static extensions here, for example: #STATIC_EXT = Cwd Compress/Raw/Zlib STATIC_EXT = Win32CORE +.ENDIF DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader @@ -1002,14 +1026,11 @@ ODBCCP32_DLL = $(windir)\system\odbccp32.dll # all : CHECKDMAKE .\config.h $(GLOBEXE) $(MINIPERL) $(MK2) \ - $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \ - $(X2P) MakePPPort Extensions $(PERLSTATIC) - -..\regnodes.h : ..\regcomp.sym ..\regcomp.pl ..\regexp.h - cd .. && regcomp.pl && cd win32 + $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) MakePPPort \ + $(PERLEXE) $(X2P) Extensions $(PERLSTATIC) ..\regcharclass.h : ..\Porting\regcharclass.pl - cd .. && Porting\regcharclass.pl && cd win32 + cd .. && miniperl Porting\regcharclass.pl && cd win32 regnodes : ..\regnodes.h @@ -1108,18 +1129,20 @@ config.w32 : $(CFGSH_TMPL) $(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file \ $(mktmp $(CFG_VARS)) config.w32 > ..\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. `dmake CCTYPE=BORLAND regen_config_h`) +# this target is for when changes to the main config.sh happen. +# edit config.gc, then make perl using GCC in a minimal configuration (i.e. +# with MULTI, ITHREADS, IMP_SYS, LARGE_FILES, PERLIO and CRYPT off), then make +# this target to regenerate config_H.gc. +# unfortunately, some further manual editing is also then required to restore all +# the special _MSC_VER handling that is otherwise lost. +# repeat for config.bc and config_H.bc (using BORLAND), except that there is no +# _MSC_VER stuff in that case. regen_config_h: - perl config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \ + $(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \ $(CFGSH_TMPL) > ..\config.sh - -cd .. && del /f perl.exe - -cd .. && del /f perl*.dll - cd .. && perl configpm + cd .. && miniperl configpm -del /f $(CFGH_TMPL) - -mkdir $(COREDIR) - -perl config_h.PL "INST_VER=$(INST_VER)" + -$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)" rename config.h $(CFGH_TMPL) $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl @@ -1333,7 +1356,7 @@ $(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES) $(PERLEXE_RES) $(LKPOST)) .ELSE $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(BLINK_FLAGS) \ - @Extensions_static $(PERLSTATICLIB) \ + @Extensions_static $(PERLSTATICLIB) /PDB:NONE \ $(LIBFILES) $(PERLEXEST_OBJ) $(SETARGV_OBJ) $(PERLEXE_RES) $(EMBED_EXE_MANI) .ENDIF @@ -1406,6 +1429,7 @@ utils: $(PERLEXE) $(X2P) copy ..\README.dos ..\pod\perldos.pod copy ..\README.epoc ..\pod\perlepoc.pod copy ..\README.freebsd ..\pod\perlfreebsd.pod + copy ..\README.haiku ..\pod\perlhaiku.pod copy ..\README.hpux ..\pod\perlhpux.pod copy ..\README.hurd ..\pod\perlhurd.pod copy ..\README.irix ..\pod\perlirix.pod @@ -1434,7 +1458,7 @@ utils: $(PERLEXE) $(X2P) copy ..\README.vms ..\pod\perlvms.pod copy ..\README.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod - copy ..\pod\perl595delta.pod ..\pod\perldelta.pod + copy ..\pod\perl5110delta.pod ..\pod\perldelta.pod cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters cd ..\lib && $(PERLEXE) lib_pm.PL $(PERLEXE) $(PL2BAT) $(UTILS) @@ -1483,6 +1507,10 @@ distclean: realclean -if exist $(LIBDIR)\Encode rmdir /s /q $(LIBDIR)\Encode -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util -if exist $(LIBDIR)\Hash rmdir /s /q $(LIBDIR)\Hash + -if exist $(LIBDIR)\App rmdir /s /q $(LIBDIR)\App + -if exist $(LIBDIR)\Module\Pluggable rmdir /s /q $(LIBDIR)\Module\Pluggable + -if exist $(LIBDIR)\TAP rmdir /s /q $(LIBDIR)\TAP + -if exist $(LIBDIR)\mro rmdir /s /q $(LIBDIR)\mro -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 @@ -1494,20 +1522,20 @@ distclean: realclean -if exist $(LIBDIR)\threads rmdir /s /q $(LIBDIR)\threads -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API - -cd $(PODDIR) && del /f *.html *.bat checkpods \ + -cd $(PODDIR) && del /f *.html *.bat podchecker \ 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 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 \ + perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \ + perlirix.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 + podselect -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \ xsubpp instmodsh prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum corelist config_data @@ -1525,6 +1553,7 @@ distclean: realclean -if exist pod2htmd.tmp del pod2htmd.tmp -if exist pod2htmi.tmp del pod2htmi.tmp -if exist $(HTMLDIR) rmdir /s /q $(HTMLDIR) + -del /f ..\t\test_state install : all installbare installhtml