From fc71c7c2fce04d50b5c1baa8306a02510bc30f73 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 6 Dec 2020 08:06:03 +0000
Subject: nmake builds: extract {TCL,TK}_RELEASE_SERIAL and patch letters from
 {tcl,tk}.h

---
 win/rules.vc | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/win/rules.vc b/win/rules.vc
index ab43909..c70effb 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 = 6
+RULES_VERSION_MINOR = 7
 
 # The PROJECT macro must be defined by parent makefile.
 !if "$(PROJECT)" == ""
@@ -907,10 +907,14 @@ WARNINGS		    = $(WARNINGS) -Wp64
 # Sets the following macros:
 # TCL_MAJOR_VERSION
 # TCL_MINOR_VERSION
+# TCL_RELEASE_SERIAL
 # TCL_PATCH_LEVEL
+# TCL_PATCH_LETTER
 # TCL_VERSION
 # TK_MAJOR_VERSION
 # TK_MINOR_VERSION
+# TK_RELEASE_SERIAL
+# TK_PATCH_LEVEL
 # TK_PATCH_LEVEL
 # TK_VERSION
 # DOTVERSION - set as (for example) 2.5
@@ -925,6 +929,9 @@ WARNINGS		    = $(WARNINGS) -Wp64
 !if [echo TCL_MINOR_VERSION = \>> versions.vc] \
    && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
 !endif
+!if [echo TCL_RELEASE_SERIAL = \>> versions.vc] \
+   && [nmakehlp -V "$(_TCL_H)" TCL_RELEASE_SERIAL >> versions.vc]
+!endif
 !if [echo TCL_PATCH_LEVEL = \>> versions.vc] \
    && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]
 !endif
@@ -936,6 +943,9 @@ WARNINGS		    = $(WARNINGS) -Wp64
 !if [echo TK_MINOR_VERSION = \>> versions.vc] \
    && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]
 !endif
+!if [echo TK_RELEASE_SERIAL = \>> versions.vc] \
+   && [nmakehlp -V "$(_TK_H)" TK_RELEASE_SERIAL >> versions.vc]
+!endif
 !if [echo TK_PATCH_LEVEL = \>> versions.vc] \
    && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]
 !endif
@@ -945,9 +955,26 @@ WARNINGS		    = $(WARNINGS) -Wp64
 
 TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
 TCL_DOTVERSION	= $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
+!if [nmakehlp -f $(TCL_PATCH_LEVEL) "a"]
+TCL_PATCH_LETTER = a
+!elseif [nmakehlp -f $(TCL_PATCH_LEVEL) "b"]
+TCL_PATCH_LETTER = b
+!else
+TCL_PATCH_LETTER = .
+!endif
+
 !if defined(_TK_H)
+
 TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)
 TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
+!if [nmakehlp -f $(TK_PATCH_LEVEL) "a"]
+TK_PATCH_LETTER = a
+!elseif [nmakehlp -f $(TK_PATCH_LEVEL) "b"]
+TK_PATCH_LETTER = b
+!else
+TK_PATCH_LETTER = .
+!endif
+
 !endif
 
 # Set DOTVERSION and VERSION
-- 
cgit v0.12