Add more win/*.in files to "make dist". Generate tclUuid.h (not used yet). With nmake build, install "zlib1.dll" in bin-directory (just as when using make)

2 files changed, 44 insertions, 17 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 41ab5b1..dbec774 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -207,18 +207,18 @@ SHELL		= @SHELL@
 RM		= rm -f
 COPY		= cp
 
-CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I"${ZLIB_DIR_NATIVE}" -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
--DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
+CC_SWITCHES = -I"${GENERIC_DIR_NATIVE}" -I"${TOMMATH_DIR_NATIVE}" \
+-I"${ZLIB_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" -DTCL_TOMMATH \
+${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} -DMP_PREC=4 \
 ${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS}
 
 CC_OBJNAME = @CC_OBJNAME@
 CC_EXENAME = @CC_EXENAME@
 
-STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" \
--I"${WIN_DIR_NATIVE}" ${AC_FLAGS} \
-${COMPILE_DEBUG_FLAGS}
+STUB_CC_SWITCHES = -I"${GENERIC_DIR_NATIVE}" -I"${TOMMATH_DIR_NATIVE}" \
+-I"${ZLIB_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" -DTCL_TOMMATH \
+${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} -DMP_PREC=4 \
+${AC_FLAGS} ${COMPILE_DEBUG_FLAGS}
 
 TCLTEST_OBJS = \
 	tclTest.$(OBJEXT) \
@@ -577,9 +577,14 @@ tclPkgConfig.${OBJEXT}: tclPkgConfig.c
 		-DBUILD_tcl \
 		@DEPARG@ $(CC_OBJNAME)
 
+tclEvent.${OBJEXT}: tclEvent.c tclUuid.h
+
 $(TOP_DIR)/manifest.uuid:
 	printf "git-" >$(TOP_DIR)/manifest.uuid
-	(cd $(TOP_DIR); git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid || printf "unknown" >$(TOP_DIR)/manifest.uuid)
+	(cd $(TOP_DIR); git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid || \
+	    (printf "svn-r" >$(TOP_DIR)/manifest.uuid ; \
+	    svn info --show-item last-changed-revision >>$(TOP_DIR)/manifest.uuid) || \
+	    printf "unknown" >$(TOP_DIR)/manifest.uuid)
 
 tclUuid.h:	$(TOP_DIR)/manifest.uuid
 	echo "#define TCL_VERSION_UUID \\" >$@
diff --git a/win/makefile.vc b/win/makefile.vc
index cffee03..22e0267 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -61,23 +61,23 @@
 #			    using libcmt(d) as the C runtime [by default] to

 #			    msvcrt(d). This is useful for static embedding

 #			    support.

+#		none      = Overrides all other options to nothing.

 #		nothreads = Turns off full multithreading support (default on).

-#		pbds      =  Produce separate debug symbol files.

-#		profile   =  Adds profiling hooks.  Map file is assumed.

+#		pdbs      = Produce separate debug symbol files.

+#		profile   = Adds profiling hooks.  Map file is assumed.

 #		static    = Builds a static library of the core instead of a

 #			    dll.  The shell will be static (and large), as well.

 #		staticpkg = Affects the static option only to switch

 #			    tclshXX.exe to have the dde and reg extension linked

 #			    inside it.

-#		symbols   =  Adds symbols for step debugging.

+#		symbols   = Adds symbols for step debugging.

 #		thrdalloc = Use the thread allocator (shared global free pool).

 #		time64bit = Forces a build using 64-bit time_t for 32-bit build

 #			    (CRT library should support this).

 #		unchecked = Allows a symbols build to not use the debug

 #			    enabled runtime (msvcrt.dll not msvcrtd.dll

 #			    or libcmt.lib not libcmtd.lib).

-#		utfmax    = Forces a build allowing 4-byte UTF-8 sequences

-#			    internally.

+#		utfmax    = Forces a build using UTF-32 representation internally.

 #

 #	STATS=compdbg,memdbg,none

 #		Sets optional memory and bytecode compiler debugging code added

@@ -171,7 +171,7 @@ VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
    && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]

 !endif

 !if [echo PKG_REG_VER =\>> versions.vc] \

-   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]

+   && [nmakehlp -V ..\library\reg\pkgIndex.tcl "registry " >> versions.vc]

 !endif

 

 !include versions.vc

@@ -303,6 +303,7 @@ COREOBJS = \
 	$(TMP_DIR)\tclVar.obj \

 	$(TMP_DIR)\tclZlib.obj

 

+!if $(STATIC_BUILD)

 ZLIBOBJS = \

 	$(TMP_DIR)\adler32.obj \

 	$(TMP_DIR)\compress.obj \

@@ -315,6 +316,9 @@ ZLIBOBJS = \
 	$(TMP_DIR)\trees.obj \

 	$(TMP_DIR)\uncompr.obj \

 	$(TMP_DIR)\zutil.obj

+!else

+ZLIBOBJS = $(OUT_DIR)\zdll.lib

+!endif

 

 TOMMATHOBJS = \

 	$(TMP_DIR)\bn_mp_add.obj \

@@ -438,7 +442,7 @@ TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
 release:    setup $(TCLSH) $(TCLSTUBLIB) dlls pkgs

 core:	    setup $(TCLLIB) $(TCLSTUBLIB)

 shell:	    setup $(TCLSH)

-dlls:	    setup $(TCLREGLIB) $(TCLDDELIB)

+dlls:	    setup $(TCLREGLIB) $(TCLDDELIB) $(OUT_DIR)\zlib1.dll

 all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls $(CAT32) pkgs

 tcltest:    setup $(TCLTEST) dlls $(CAT32)

 install:    install-binaries install-libraries install-docs install-pkgs

@@ -511,6 +515,18 @@ $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
 	$(_VC_MANIFEST_EMBED_DLL)

 !endif

 

+!if "$(MACHINE)" == "AMD64"

+$(OUT_DIR)\zlib1.dll:	$(COMPATDIR)\zlib\win64\zlib1.dll

+	$(COPY) $(COMPATDIR)\zlib\win64\zlib1.dll $(OUT_DIR)\zlib1.dll

+$(OUT_DIR)\zdll.lib:	$(COMPATDIR)\zlib\win64\zdll.lib

+	$(COPY) $(COMPATDIR)\zlib\win64\zdll.lib $(OUT_DIR)\zdll.lib

+!else

+$(OUT_DIR)\zlib1.dll:	$(COMPATDIR)\zlib\win32\zlib1.dll

+	$(COPY) $(COMPATDIR)\zlib\win32\zlib1.dll $(OUT_DIR)\zlib1.dll

+$(OUT_DIR)\zdll.lib:	$(COMPATDIR)\zlib\win32\zdll.lib

+	$(COPY) $(COMPATDIR)\zlib\win32\zdll.lib $(OUT_DIR)\zdll.lib

+!endif

+

 pkgs:

 	@for /d %d in ($(PKGSDIR)\*) do \

 	  @if exist "%~fd\win\makefile.vc" ( \

@@ -739,12 +755,16 @@ $(TMP_DIR)\tclMainW.obj: $(GENERICDIR)\tclMain.c
 	    -Fo$@ $?

 

 $(ROOT)\manifest.uuid:

-   copy $(WIN_DIR)\gitmanifest.in $(ROOT)\manifest.uuid

-   git rev-parse HEAD >>$(ROOT)\manifest.uuid

+	copy $(WIN_DIR)\gitmanifest.in $(ROOT)\manifest.uuid

+	git rev-parse HEAD >>$(ROOT)\manifest.uuid

 

 $(TMP_DIR)\tclUuid.h:	$(ROOT)\manifest.uuid

 	copy $(WIN_DIR)\tclUuid.h.in+$(ROOT)\manifest.uuid $(TMP_DIR)\tclUuid.h

 

+$(TMP_DIR)\tclEvent.obj: $(GENERICDIR)\tclEvent.c $(TMP_DIR)\tclUuid.h

+	$(cc32) $(pkgcflags) -I$(TMP_DIR) \

+	    -Fo$@ $(GENERICDIR)\tclEvent.c

+

 $(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c

 	$(cc32) $(appcflags) -Fo$@ $?

 

@@ -871,6 +891,7 @@ install-binaries:
 	@$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\"

 !endif

 	@$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\"

+	@$(CPY) "$(OUT_DIR)\zlib1.dll" "$(BIN_INSTALL_DIR)\"

 !if exist($(TCLSH))

 	@echo Installing $(TCLSHNAME)

 	@$(CPY) "$(TCLSH)" "$(BIN_INSTALL_DIR)\"

@@ -1006,6 +1027,7 @@ tidy:
 clean: default-clean clean-pkgs

 hose: default-hose

 realclean: hose

+.PHONY:

 

 # Local Variables:

 # mode: makefile