Fix commits 93ab6a and 606df1. msvcrt time64bit - TCL_{MAJOR,MINOR}_VERSION checks.

msvcrt and time64bit OPTS checks were using Tcl versions before definition.
Moved Tcl version retrieval to earlier in the build as a fix.
Also, < cannot be used with strings, so made the checks numerics.

1 files changed, 127 insertions, 125 deletions

diff --git a/win/rules.vc b/win/rules.vc
index 909799c..a076edc 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -652,8 +652,130 @@ LINKERFLAGS     = $(LINKERFLAGS) -ltcg
 !endif

 !endif

 

+

+################################################################

+# 6. Extract various version numbers from headers

+# For Tcl and Tk, version numbers are extracted from tcl.h and tk.h

+# respectively. For extensions, versions are extracted from the

+# configure.in or configure.ac from the TEA configuration if it

+# exists, and unset otherwise.

+# 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_LETTER

+# TK_VERSION

+# DOTVERSION - set as (for example) 2.5

+# VERSION - set as (for example 25)

+#--------------------------------------------------------------

+

+!if [echo REM = This file is generated from rules.vc > versions.vc]

+!endif

+!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]

+!endif

+!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

+

+!if defined(_TK_H)

+!if [echo TK_MAJOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]

+!endif

+!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

+!endif # _TK_H

+

+!include versions.vc

+

+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

+!if $(DOING_TCL)

+

+DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

+VERSION = $(TCL_VERSION)

+

+!elseif $(DOING_TK)

+

+DOTVERSION = $(TK_DOTVERSION)

+VERSION = $(TK_VERSION)

+

+!else # Doing a non-Tk extension

+

+# If parent makefile has not defined DOTVERSION, try to get it from TEA

+# first from a configure.in file, and then from configure.ac

+!ifndef DOTVERSION

+!if [echo DOTVERSION = \> versions.vc] \

+   || [nmakehlp -V $(ROOT)\configure.in ^[$(PROJECT)^] >> versions.vc]

+!if [echo DOTVERSION = \> versions.vc] \

+   || [nmakehlp -V $(ROOT)\configure.ac ^[$(PROJECT)^] >> versions.vc]

+!error *** Could not figure out extension version. Please define DOTVERSION in parent makefile before including rules.vc.

+!endif

+!endif

+!include versions.vc

+!endif # DOTVERSION

+VERSION         = $(DOTVERSION:.=)

+

+!endif # $(DOING_TCL) ... etc.

+

+# Windows RC files have 3 version components. Ensure this irrespective

+# of how many components the package has specified. Basically, ensure

+# minimum 4 components by appending 4 0's and then pick out the first 4.

+# Also take care of the fact that DOTVERSION may have "a" or "b" instead

+# of "." separating the version components.

+DOTSEPARATED=$(DOTVERSION:a=.)

+DOTSEPARATED=$(DOTSEPARATED:b=.)

+!if [echo RCCOMMAVERSION = \> versions.vc] \

+  || [for /f "tokens=1,2,3,4,5* delims=." %a in ("$(DOTSEPARATED).0.0.0.0") do echo %a,%b,%c,%d >> versions.vc]

+!error *** Could not generate RCCOMMAVERSION ***

+!endif

+!include versions.vc

+

 ########################################################################

-# 6. Parse the OPTS macro to work out the requested build configuration.

+# 7. Parse the OPTS macro to work out the requested build configuration.

 # Based on this, we will construct the actual switches to be passed to the

 # compiler and linker using the macros defined in the previous section.

 # The following macros are defined by this section based on OPTS

@@ -725,7 +847,7 @@ MSVCRT		= 0
 !if [nmakehlp -f $(OPTS) "msvcrt"]

 !message *** Doing msvcrt

 !else

-!if "$(TCL_MAJOR_VERSION)" == "8" && "$(TCL_MINOR_VERSION)" < "7" && $(STATIC_BUILD)

+!if $(TCL_MAJOR_VERSION) == 8 && $(TCL_MINOR_VERSION) < 7 && $(STATIC_BUILD)

 MSVCRT		= 0

 !endif

 !endif

@@ -742,7 +864,7 @@ TCL_THREADS = 0
 USE_THREAD_ALLOC= 0

 !endif

 

-!if "$(TCL_MAJOR_VERSION)" == "8"

+!if $(TCL_MAJOR_VERSION) == 8

 !if [nmakehlp -f $(OPTS) "time64bit"]

 !message *** Force 64-bit time_t

 _USE_64BIT_TIME_T = 1

@@ -837,7 +959,7 @@ This compiler does not support profile guided optimization.
 !endif

 

 ################################################################

-# 7. Parse the STATS macro to configure code instrumentation

+# 8. Parse the STATS macro to configure code instrumentation

 # The following macros are set by this section:

 # TCL_MEM_DEBUG - 1 -> enables memory allocation instrumentation

 #                 0 -> disables

@@ -867,7 +989,7 @@ TCL_COMPILE_DEBUG   = 0
 !endif

 

 ####################################################################

-# 8. Parse the CHECKS macro to configure additional compiler checks

+# 9. Parse the CHECKS macro to configure additional compiler checks

 # The following macros are set by this section:

 # WARNINGS - compiler switches that control the warnings level

 # TCL_NO_DEPRECATED - 1 -> disable support for deprecated functions

@@ -899,126 +1021,6 @@ WARNINGS		    = $(WARNINGS) -Wp64
 

 !endif

 

-################################################################

-# 9. Extract various version numbers

-# For Tcl and Tk, version numbers are extracted from tcl.h and tk.h

-# respectively. For extensions, versions are extracted from the

-# configure.in or configure.ac from the TEA configuration if it

-# exists, and unset otherwise.

-# 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

-# VERSION - set as (for example 25)

-#--------------------------------------------------------------

-

-!if [echo REM = This file is generated from rules.vc > versions.vc]

-!endif

-!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]

-!endif

-!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

-

-!if defined(_TK_H)

-!if [echo TK_MAJOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]

-!endif

-!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

-!endif # _TK_H

-

-!include versions.vc

-

-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

-!if $(DOING_TCL)

-

-DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

-VERSION = $(TCL_VERSION)

-

-!elseif $(DOING_TK)

-

-DOTVERSION = $(TK_DOTVERSION)

-VERSION = $(TK_VERSION)

-

-!else # Doing a non-Tk extension

-

-# If parent makefile has not defined DOTVERSION, try to get it from TEA

-# first from a configure.in file, and then from configure.ac

-!ifndef DOTVERSION

-!if [echo DOTVERSION = \> versions.vc] \

-   || [nmakehlp -V $(ROOT)\configure.in ^[$(PROJECT)^] >> versions.vc]

-!if [echo DOTVERSION = \> versions.vc] \

-   || [nmakehlp -V $(ROOT)\configure.ac ^[$(PROJECT)^] >> versions.vc]

-!error *** Could not figure out extension version. Please define DOTVERSION in parent makefile before including rules.vc.

-!endif

-!endif

-!include versions.vc

-!endif # DOTVERSION

-VERSION         = $(DOTVERSION:.=)

-

-!endif # $(DOING_TCL) ... etc.

-

-# Windows RC files have 3 version components. Ensure this irrespective

-# of how many components the package has specified. Basically, ensure

-# minimum 4 components by appending 4 0's and then pick out the first 4.

-# Also take care of the fact that DOTVERSION may have "a" or "b" instead

-# of "." separating the version components.

-DOTSEPARATED=$(DOTVERSION:a=.)

-DOTSEPARATED=$(DOTSEPARATED:b=.)

-!if [echo RCCOMMAVERSION = \> versions.vc] \

-  || [for /f "tokens=1,2,3,4,5* delims=." %a in ("$(DOTSEPARATED).0.0.0.0") do echo %a,%b,%c,%d >> versions.vc]

-!error *** Could not generate RCCOMMAVERSION ***

-!endif

-!include versions.vc

 

 ################################################################

 # 10. Construct output directory and file paths