nmake: build nmakehlp with -DNDEBUG, sync rules.vc for 8.7

2 files changed, 31 insertions, 5 deletions

diff --git a/win/rules-ext.vc b/win/rules-ext.vc
index 531e070..6da5689 100644
--- a/win/rules-ext.vc
+++ b/win/rules-ext.vc
@@ -31,7 +31,7 @@ macro to the name of the project makefile.
 # We extract version numbers using the nmakehlp program. For now use

 # the local copy of nmakehlp. Once we locate Tcl, we will use that

 # one if it is newer.

-!if [$(CC) -nologo "nmakehlp.c" -link -subsystem:console > nul]

+!if [$(CC) -nologo -DNDEBUG "nmakehlp.c" -link -subsystem:console > nul]

 !endif

 

 # First locate the Tcl directory that we are working with.

diff --git a/win/rules.vc b/win/rules.vc
index 76d93cd..909799c 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change

 # the major version.

 RULES_VERSION_MAJOR = 1

-RULES_VERSION_MINOR = 7

+RULES_VERSION_MINOR = 8

 

 # The PROJECT macro must be defined by parent makefile.

 !if "$(PROJECT)" == ""

@@ -1115,14 +1115,29 @@ OUT_DIR	    = $(TMP_DIR)
 # The name of the stubs library for the project being built

 STUBPREFIX      = $(PROJECT)stub

 

+#

 # Set up paths to various Tcl executables and libraries needed by extensions

-!if $(DOING_TCL)

+#

+

+# TIP 430. Unused for 8.6 but no harm defining it to allow a common rules.vc

+!if "$(TCL_PATCH_LETTER)" == "."

+TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_RELEASE_SERIAL).zip

+!else

+TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_PATCH_LETTER)$(TCL_RELEASE_SERIAL).zip

+!endif

+!if "$(TK_PATCH_LETTER)" == "."

+TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_RELEASE_SERIAL).zip

+!else

+TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_PATCH_LETTER)$(TK_RELEASE_SERIAL).zip

+!endif

 

+!if $(DOING_TCL)

 TCLSHNAME       = $(PROJECT)sh$(VERSION)$(SUFX).exe

 TCLSH		= $(OUT_DIR)\$(TCLSHNAME)

 TCLIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

 TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

 TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)

+TCLSCRIPTZIP    = $(OUT_DIR)\$(TCLSCRIPTZIPNAME)

 

 TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

 TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

@@ -1150,6 +1165,7 @@ TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)t$(SUFX:t=).lib
 TCL_LIBRARY	= $(_TCLDIR)\lib

 TCLREGLIB	= $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib

 TCLDDELIB	= $(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib

+TCLSCRIPTZIP	= $(_TCLDIR)\lib\$(TCLSCRIPTZIPNAME)

 TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target

 TCL_INCLUDES    = -I"$(_TCLDIR)\include"

 

@@ -1169,6 +1185,7 @@ TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)t$(SUFX:t=).lib
 TCL_LIBRARY	= $(_TCLDIR)\library

 TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib

 TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib

+TCLSCRIPTZIP	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLSCRIPTZIPNAME)

 TCLTOOLSDIR	= $(_TCLDIR)\tools

 TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"

 

@@ -1201,7 +1218,8 @@ WISH 		= $(OUT_DIR)\$(WISHNAME)
 TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(OUT_DIR)\$(TKIMPLIBNAME)

 TKLIB		= $(OUT_DIR)\$(TKLIBNAME)

-TK_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

+TK_INCLUDES     = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

+TKSCRIPTZIP     = $(OUT_DIR)\$(TKSCRIPTZIPNAME)

 

 !else # effectively NEED_TK

 

@@ -1216,7 +1234,10 @@ TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib
 TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)

 !endif

 TK_INCLUDES     = -I"$(_TKDIR)\include"

+TKSCRIPTZIP     = $(_TKDIR)\lib\$(TKSCRIPTZIPNAME)

+

 !else # Building against Tk sources

+

 WISH		= $(_TKDIR)\win\$(BUILDDIRTOP)\$(WISHNAME)

 TKSTUBLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

@@ -1227,7 +1248,10 @@ TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib
 TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

 !endif

 TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"

+TKSCRIPTZIP     = $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSCRIPTZIPNAME)

+

 !endif # TKINSTALL

+

 tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"

 

 !endif # $(DOING_TK)

@@ -1616,6 +1640,8 @@ default-install-pdbs:
 	@if not exist "$(LIB_INSTALL_DIR)" mkdir "$(LIB_INSTALL_DIR)"

 	@$(CPY) "$(OUT_DIR)\*.pdb" "$(LIB_INSTALL_DIR)\"

 

+# "emacs font-lock highlighting fix

+

 default-install-docs-html:

 	@echo Installing documentation files to '$(DOC_INSTALL_DIR)'

 	@if not exist "$(DOC_INSTALL_DIR)" mkdir "$(DOC_INSTALL_DIR)"

@@ -1781,7 +1807,7 @@ TCLNMAKECONFIG = "$(_TCLDIR)\lib\nmake\tcl.nmake"
 !endif

 !else # !$(TCLINSTALL) - building against Tcl source

 !if exist("$(OUT_DIR)\tcl.nmake")

-TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"

+TCLNMAKECONFIG	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl.nmake""

 !endif

 !endif # TCLINSTALL