# versioned installation can be obtained by setting INST_TOP above to a
# path that includes an arbitrary version string.
#
-#INST_VER = \5.9.4
+#INST_VER = \5.9.5
#
# Comment this out if you DON'T want your perl installation to have
#CCTYPE = MSVC20
# Visual C++ > 2.x and < 6.x
#CCTYPE = MSVC
-# Visual C++ 6.x (aka Visual Studio 98)
+# Visual C++ 6.x (aka Visual C++ 98)
CCTYPE = MSVC60
-# Visual C++ Toolkit 2003 (free version of Visual C++ 7.x command-line tools)
+# Visual C++ Toolkit 2003 (aka Visual C++ 7.x) (free command-line tools)
#CCTYPE = MSVC70FREE
-# Visual C++ 7.x (aka Visual Studio .NET 2003) (full version)
+# Visual C++ .NET 2003 (aka Visual C++ 7.x) (full version)
#CCTYPE = MSVC70
-# Visual C++ Toolkit 2005 (free version of Visual C++ 8.x command-line tools)
+# Visual C++ 2005 Express Edition (aka Visual C++ 8.x) (free version)
#CCTYPE = MSVC80FREE
-# Visual C++ 8.x (aka Visual Studio 2005) (full version)
+# Visual C++ 2005 (aka Visual C++ 8.x) (full version)
#CCTYPE = MSVC80
#
#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.
ARCHNAME = $(ARCHNAME)-thread
!ENDIF
-# Visual Studio 98 and .NET 2003 specific
-# VC++ 6.x and 7.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, however.)
-# The addition of VC++ 8.x is currently an educated guess.
-!IF "$(CCTYPE)" == "MSVC60" || "$(CCTYPE)" == "MSVC70" || "$(CCTYPE)" == "MSVC80"
+# 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
!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)
COREDIR = ..\lib\CORE
AUTODIR = ..\lib\auto
OPTIMIZE = $(OPTIMIZE) -Wp64 -fp:precise
!ENDIF
-!IF "$(USE_PERLCRT)" != "define"
+# 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 = $(BUILDOPT) -DPERL_MSVCRT_READFIX
+! ENDIF
!ENDIF
LIBBASEFILES = $(CRYPT_LIB) \
# we add LIBC here, since we may be using PerlCRT.dll
LIBFILES = $(LIBBASEFILES) $(LIBC)
+#EXTRACFLAGS = -nologo -GF -W4 -wd4127 -wd4706
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
$(o).dll:
$(LINK32) -dll -subsystem:windows -implib:$(*B).lib -def:$(*B).def \
-out:$@ $(LINK_FLAGS) $(LIBFILES) $< $(LIBPERL)
+ $(EMBED_DLL_MANI)
.rc.res:
$(RSC) -i.. $<
+
#
# various targets
# 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.lib
+PERLSTATICLIB = ..\perl59s.lib
PERLDLL = ..\perl59.dll
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
-
-# With the .NET 2.0 SDK, setargs.obj is not available with the .NET SDK. It
-# only comes with Visual Studio 2005.
-!IF "$(CCTYPE)" != "MSVC80FREE"
-GLOBEXEBUILD =
+!IF "$(BUILD_STATIC)" == "define"
+PERLSTATIC = static
+!ELSE
+PERLSTATIC =
!ENDIF
-
+
# Unicode data files generated by mktables
+FIRSTUNIFILE = ..\lib\unicore\Canonical.pl
UNIDATAFILES = ..\lib\unicore\Canonical.pl ..\lib\unicore\Exact.pl \
..\lib\unicore\Properties ..\lib\unicore\Decomposition.pl \
..\lib\unicore\CombiningClass.pl ..\lib\unicore\Name.pl \
..\utils\pstruct \
..\utils\h2xs \
..\utils\perldoc \
- ..\utils\perlcc \
..\utils\perlivp \
..\utils\libnetcfg \
..\utils\enc2xs \
PERLDLL_OBJ = $(CORE_OBJ)
PERLEXE_OBJ = perlmain$(o)
+PERLEXEST_OBJ = perlmainst$(o)
PERLDLL_OBJ = $(PERLDLL_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
-#PERLEXE_OBJ = $(PERLEXE_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
!IF "$(USE_SETARGV)" != ""
SETARGV_OBJ = setargv$(o)
!ENDIF
# specify static extensions here
-#STATIC_EXT = Cwd Compress/Zlib
+#STATIC_EXT = Cwd Compress/Raw/Zlib
STATIC_EXT =
DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader
MATHBIGINTFASTCALC = $(EXTDIR)\Math\BigInt\FastCalc\FastCalc
COMPRESSZLIB = $(EXTDIR)\Compress\Zlib\Zlib
WIN32_DIR = ext\Win32
+WIN32APIFILE = ext\Win32API\File\File
SOCKET_DLL = $(AUTODIR)\Socket\Socket.dll
FCNTL_DLL = $(AUTODIR)\Fcntl\Fcntl.dll
MATHBIGINTFASTCALC_DLL = $(AUTODIR)\Math\BigInt\FastCalc\FastCalc.dll
COMPRESSZLIB_DLL = $(AUTODIR)\Compress\Zlib\Zlib.dll
WIN32_DLL = $(AUTODIR)\Win32\Win32.dll
+WIN32APIFILE_DLL = $(AUTODIR)\Win32API\File\File.dll
EXTENSION_C = \
$(SOCKET).c \
$(UNICODENORMALIZE).c \
$(MATHBIGINTFASTCALC).c \
$(COMPRESSZLIB).c \
- $(WIN32_DIR).c
+ $(WIN32_DIR).c \
+ $(WIN32APIFILE).c
EXTENSION_DLL = \
$(SOCKET_DLL) \
$(UNICODENORMALIZE_DLL) \
$(MATHBIGINTFASTCALC_DLL) \
$(COMPRESSZLIB_DLL) \
- $(WIN32_DLL)
+ $(WIN32_DLL) \
+ $(WIN32APIFILE_DLL)
CFG_VARS = \
"INST_DRV=$(INST_DRV)" \
#
all : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
- $(X2P) Extensions
+ $(X2P) MakePPPort Extensions $(PERLSTATIC)
@echo Everything is up to date. '$(MAKE_BARE) test' to run test suite.
-reonly : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
+..\regnodes.h : ..\regcomp.sym
+ cd ..
+ regcomp.pl
+ cd win32
+
+regnodes : ..\regnodes.h
+
+reonly : regnodes .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
$(X2P) Extensions_reonly
@echo Perl and 're' are up to date.
$(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
+static: $(PERLEXESTATIC)
+
#------------------------------------------------------------
$(GLOBEXE) : perlglob$(o)
-!ifdef GLOBEXEBUILD
$(LINK32) $(LINK_FLAGS) $(LIBFILES) -out:$@ -subsystem:$(SUBSYS) \
perlglob$(o) setargv$(o)
-!else
- echo Skipping $(GLOBEXE)
-!endif
+ $(EMBED_EXE_MANI)
perlglob$(o) : perlglob.c
$(LINK32) -subsystem:console -out:$@ @<<
$(LINK_FLAGS) $(LIBFILES) $(MINI_OBJ)
<<
+ $(EMBED_EXE_MANI)
$(MINIDIR) :
if not exist "$(MINIDIR)" mkdir "$(MINIDIR)"
$(LINK32) -dll -def:perldll.def -base:0x28000000 -out:$@ @Extensions_static @<<
$(LINK_FLAGS) $(DELAYLOAD) $(LIBFILES) $(PERLDLL_OBJ) $(PERLDLL_RES)
<<
+ $(EMBED_DLL_MANI)
$(XCOPY) $(PERLIMPLIB) $(COREDIR)
+$(PERLSTATICLIB): Extensions_static
+ $(LIB32) $(LIB_FLAGS) -out:$@ @Extensions_static @<<
+ $(PERLDLL_OBJ)
+<<
+ $(XCOPY) $(PERLSTATICLIB) $(COREDIR)
+
$(PERLEXE_ICO): $(MINIPERL) makeico.pl
$(MINIPERL) makeico.pl > $@
$(LINK32) -subsystem:console -out:$@ @<<
$(LINK_FLAGS) $(LIBFILES) $(X2P_OBJ)
<<
+ $(EMBED_EXE_MANI)
perlmain.c : runperl.c
copy runperl.c perlmain.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)
$(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(LINK_FLAGS) \
$(LIBFILES) $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES)
+ $(EMBED_EXE_MANI)
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)
+ $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(LINK_FLAGS) \
+ @Extensions_static $(PERLSTATICLIB) \
+ $(LIBFILES) $(PERLEXEST_OBJ) $(SETARGV_OBJ) $(PERLEXE_RES)
+ $(EMBED_EXE_MANI)
+
$(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
if not exist $(AUTODIR) mkdir $(AUTODIR)
cd $(EXTDIR)\$(*B)
$(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
Extensions_reonly: buildext.pl $(PERLDEP) $(CONFIGPM)
+ $(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --dynamic +re
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic +re
-Extensions_static : buildext.pl
+Extensions_static : buildext.pl $(PERLDEP) $(CONFIGPM)
+ $(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --static
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static
$(MINIPERL) -I..\lib buildext.pl --list-static-libs > Extensions_static
copy ..\README.vms ..\pod\perlvms.pod
copy ..\README.vos ..\pod\perlvos.pod
copy ..\README.win32 ..\pod\perlwin32.pod
- copy ..\pod\perl594delta.pod ..\pod\perldelta.pod
+ copy ..\pod\perl595delta.pod ..\pod\perldelta.pod
$(MAKE) -f ..\win32\pod.mak converters
cd ..\lib
$(PERLEXE) lib_pm.PL
distclean: realclean
-del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \
- $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
+ $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD) \
+ $(PERLEXESTATIC) $(PERLSTATICLIB)
-del /f *.def *.map
-del /f $(EXTENSION_DLL)
-del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm
-del /f $(LIBDIR)\Unicode\Normalize.pm
-del /f $(LIBDIR)\Math\BigInt\FastCalc.pm
-del /f $(LIBDIR)\Win32.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)\Compress rmdir /s /q $(LIBDIR)\Compress
-if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data
-if exist $(LIBDIR)\Sys rmdir /s /q $(LIBDIR)\Sys
-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 \
perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \
perlbs2000.pod perlce.pod perlcn.pod perlcygwin.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 \
+ perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \
xsubpp instmodsh prove ptar ptardiff 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
$(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables
cd ..\lib\unicore && \
- ..\$(MINIPERL) -I.. mktables
+ ..\$(MINIPERL) -I.. mktables -check $@ $(FIRSTUNIFILE)
minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils $(UNIDATAFILES)
$(XCOPY) $(MINIPERL) ..\t\$(NULL)
$(PERLEXE) -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES)
cd ..\win32
+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 $(EXTRA)
+ cd ..\win32
+
+regen :
+ cd ..
+ regen.pl
+ cd win32
+
test-notty : test-prep
set PERL_SKIP_TTY_TEST=1
cd ..\t
-@$(DEL) $(MINIPERL)
-@$(DEL) perlglob$(o)
-@$(DEL) perlmain$(o)
+ -@$(DEL) perlmainst$(o)
-@$(DEL) config.w32
-@$(DEL) config.h
-@$(DEL) $(GLOBEXE)
-@$(DEL) $(PERLEXE)
-@$(DEL) $(WPERLEXE)
+ -@$(DEL) $(PERLEXESTATIC)
+ -@$(DEL) $(PERLSTATICLIB)
-@$(DEL) $(PERLDLL)
-@$(DEL) $(CORE_OBJ)
-if exist $(MINIDIR) rmdir /s /q $(MINIDIR)
clean : Extensions_clean _clean
-realclean : Extensions_realclean _clean
+realclean : 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.
https://perl5.git.perl.org / perl5.git / blobdiff