Update rules.vc to version 1.4 (synced with Tcl)

1 files changed, 83 insertions, 34 deletions

diff --git a/win/rules.vc b/win/rules.vc
index 86a09d0..c766427 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 = 1

+RULES_VERSION_MINOR = 4

 

 # The PROJECT macro must be defined by parent makefile.

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

@@ -391,7 +391,7 @@ MSG = ^
 !endif

 

 

-# If INSTALLDIR set to tcl installation root dir then reset to the

+# If INSTALLDIR set to Tcl installation root dir then reset to the

 # lib dir for installing extensions

 !if exist("$(_INSTALLDIR)\include\tcl.h")

 _INSTALLDIR=$(_INSTALLDIR)\lib

@@ -473,6 +473,21 @@ MACHINE = AMD64
 MACHINE=$(ARCH)

 !endif

 

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

+# The PLATFORM_IDENTIFY macro matches the values returned by

+# the Tcl platform::identify command

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

+PLATFORM_IDENTIFY = win32-x86_64

+!else

+PLATFORM_IDENTIFY = win32-ix86

+!endif

+

+# The MULTIPLATFORM macro controls whether binary extensions are installed

+# in platform-specific directories. Intended to be set/used by extensions.

+!ifndef MULTIPLATFORM_INSTALL

+MULTIPLATFORM_INSTALL = 0

+!endif

+

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

 # Figure out the *host* architecture by reading the registry

 

@@ -669,6 +684,8 @@ LINKERFLAGS     = $(LINKERFLAGS) -ltcg
 # USE_STUBS - 1 -> compile to use stubs interfaces, 0 -> direct linking

 # CONFIG_CHECK - 1 -> check current build configuration against Tcl

 #           configuration (ignored for Tcl itself)

+# _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build

+#           (CRT library should support this)

 # Further, LINKERFLAGS are modified based on above.

 

 # Default values for all the above

@@ -730,13 +747,20 @@ TCL_USE_STATIC_PACKAGES	= 0
 

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

 !message *** Compile explicitly for non-threaded tcl

-TCL_THREADS	= 0

+TCL_THREADS = 0

 USE_THREAD_ALLOC= 0

 !else

 TCL_THREADS	= 1

 USE_THREAD_ALLOC= 1

 !endif

 

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

+!message *** Force 64-bit time_t

+_USE_64BIT_TIME_T = 1

+!endif

+

+# Yes, it's weird that the "symbols" option controls DEBUG and

+# the "pdbs" option controls SYMBOLS. That's historical.

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

 !message *** Doing symbols

 DEBUG		= 1

@@ -968,7 +992,7 @@ VERSION         = $(DOTVERSION:.=)
 # different compilers, build configurations etc.,

 #

 # Naming convention (suffixes):

-#   t = full thread support.

+#   t = full thread support. (Not used for Tcl >= 8.7)

 #   s = static library (as opposed to an import library)

 #   g = linked to the debug enabled C run-time.

 #   x = special static build when it links to the dynamic C run-time.

@@ -1026,7 +1050,7 @@ SUFX	    = $(SUFX:x=)
 !endif

 !endif

 

-!if !$(TCL_THREADS)

+!if !$(TCL_THREADS) || $(TCL_VERSION) > 86

 TMP_DIRFULL = $(TMP_DIRFULL:Threaded=)

 SUFX	    = $(SUFX:t=)

 !endif

@@ -1059,7 +1083,7 @@ STUBPREFIX      = $(PROJECT)stub
 # Set up paths to various Tcl executables and libraries needed by extensions

 !if $(DOING_TCL)

 

-TCLSHNAME       = $(PROJECT)sh$(TCL_VERSION)$(SUFX).exe

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

 TCLSH		= $(OUT_DIR)\$(TCLSHNAME)

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

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

@@ -1076,20 +1100,17 @@ TCL_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"
 # When building extensions, we need to locate tclsh. Depending on version

 # of Tcl we are building against, this may or may not have a "t" suffix.

 # Try various possibilities in turn.

-TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe

-!if !exist("$(TCLSH)") && $(TCL_THREADS)

-TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe

-!endif

+TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe

 !if !exist("$(TCLSH)")

-TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe

+TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe

 !endif

 

 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib

-TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib

+TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib

 # When building extensions, may be linking against Tcl that does not add

 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

 !if !exist("$(TCLIMPLIB)")

-TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib

+TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)t$(SUFX:t=).lib

 !endif

 TCL_LIBRARY	= $(_TCLDIR)\lib

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

@@ -1099,19 +1120,16 @@ TCL_INCLUDES    = -I"$(_TCLDIR)\include"
 

 !else # Building against Tcl sources

 

-TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe

-!if !exist($(TCLSH)) && $(TCL_THREADS)

-TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe

-!endif

-!if !exist($(TCLSH))

 TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe

+!if !exist($(TCLSH))

+TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe

 !endif

 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib

-TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib

+TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib

 # When building extensions, may be linking against Tcl that does not add

 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

 !if !exist("$(TCLIMPLIB)")

-TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib

+TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)t$(SUFX:t=).lib

 !endif

 TCL_LIBRARY	= $(_TCLDIR)\library

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

@@ -1207,7 +1225,7 @@ RESFILE = $(TMP_DIR)\$(PROJECT).res
 # SCRIPT_INSTALL_DIR - where scripts should be installed

 # INCLUDE_INSTALL_DIR - where C include files should be installed

 # DEMO_INSTALL_DIR - where demos should be installed

-# PRJ_INSTALL_DIR - where package will be installed (not set for tcl and tk)

+# PRJ_INSTALL_DIR - where package will be installed (not set for Tcl and Tk)

 

 !if $(DOING_TCL) || $(DOING_TK)

 LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib

@@ -1224,12 +1242,17 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include
 !else # extension other than Tk

 

 PRJ_INSTALL_DIR         = $(_INSTALLDIR)\$(PROJECT)$(DOTVERSION)

+!if $(MULTIPLATFORM_INSTALL)

+LIB_INSTALL_DIR		= $(PRJ_INSTALL_DIR)\$(PLATFORM_IDENTIFY)

+BIN_INSTALL_DIR		= $(PRJ_INSTALL_DIR)\$(PLATFORM_IDENTIFY)

+!else

 LIB_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

 BIN_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

+!endif

 DOC_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

 SCRIPT_INSTALL_DIR	= $(PRJ_INSTALL_DIR)

 DEMO_INSTALL_DIR	= $(PRJ_INSTALL_DIR)\demos

-INCLUDE_INSTALL_DIR	= $(_TCLDIR)\include

+INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include

 

 !endif

 

@@ -1262,9 +1285,9 @@ OPTDEFINES	= $(OPTDEFINES) -DTCL_MEM_DEBUG
 !if $(TCL_COMPILE_DEBUG)

 OPTDEFINES	= $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS

 !endif

-!if $(TCL_THREADS)

+!if $(TCL_THREADS) && $(TCL_VERSION) < 87

 OPTDEFINES	= $(OPTDEFINES) -DTCL_THREADS=1

-!if $(USE_THREAD_ALLOC)

+!if $(USE_THREAD_ALLOC) && $(TCL_VERSION) < 87

 OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=1

 !endif

 !endif

@@ -1302,6 +1325,10 @@ OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DO64BIT
 OPTDEFINES	= $(OPTDEFINES) -DNO_STRTOI64

 !endif

 

+!if "$(_USE_64BIT_TIME_T)" == "1"

+OPTDEFINES	= $(OPTDEFINES) -D_USE_64BIT_TIME_T

+!endif

+

 # _ATL_XP_TARGETING - Newer SDK's need this to build for XP

 COMPILERFLAGS  = /D_ATL_XP_TARGETING

 

@@ -1404,8 +1431,8 @@ cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug)
 # BUILD_$(PROJECT) macro which should be defined only for the shared

 # library *implementation* and not for its caller interface

 

-appcflags = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES) $(USE_STUBS_DEFS)

 appcflags_nostubs = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES)

+appcflags = $(appcflags_nostubs) $(USE_STUBS_DEFS)

 pkgcflags = $(appcflags) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)

 pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)

 

@@ -1420,7 +1447,7 @@ pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
 # so we do not remove it from cflags. -GL may prevent extensions

 # compiled with one VC version to fail to link against stubs library

 # compiled with another VC version. Check for this and fix accordingly.

-stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES)

+stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES) $(USE_STUBS_DEFS)

 

 # Link flags

 

@@ -1502,8 +1529,8 @@ RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
 	    -DDOTVERSION=\"$(DOTVERSION)\" \

 	    -DVERSION=\"$(VERSION)\" \

 	    -DSUFX=\"$(SUFX)\" \

-            -DPROJECT=\"$(PROJECT)\" \

-            -DPRJLIBNAME=\"$(PRJLIBNAME)\"

+	    -DPROJECT=\"$(PROJECT)\" \

+	    -DPRJLIBNAME=\"$(PRJLIBNAME)\"

 

 !ifndef DEFAULT_BUILD_TARGET

 DEFAULT_BUILD_TARGET = $(PROJECT)

@@ -1511,9 +1538,15 @@ DEFAULT_BUILD_TARGET = $(PROJECT)
 

 default-target: $(DEFAULT_BUILD_TARGET)

 

+!if $(MULTIPLATFORM_INSTALL)

+default-pkgindex:

+	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \

+	    [list load [file join $$dir $(PLATFORM_IDENTIFY) $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl

+!else

 default-pkgindex:

 	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \

 	    [list load [file join $$dir $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl

+!endif

 

 default-pkgindex-tea:

 	@if exist $(ROOT)\pkgIndex.tcl.in nmakehlp -s << $(ROOT)\pkgIndex.tcl.in > $(OUT_DIR)\pkgIndex.tcl

@@ -1523,15 +1556,26 @@ default-pkgindex-tea:
 @PKG_LIB_FILE@       $(PRJLIBNAME)

 <<

 

-

 default-install: default-install-binaries default-install-libraries

+!if $(SYMBOLS)

+default-install: default-install-pdbs

+!endif

 

+# Again to deal with historical brokenness, there is some confusion

+# in terminlogy. For extensions, the "install-binaries" was used to

+# locate target directory for *binary shared libraries* and thus

+# the appropriate macro is LIB_INSTALL_DIR since BIN_INSTALL_DIR is

+# for executables (exes). On the other hand the "install-libraries"

+# target is for *scripts* and should have been called "install-scripts".

 default-install-binaries: $(PRJLIB)

-	@echo Installing binaries to '$(SCRIPT_INSTALL_DIR)'

-	@if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)"

-	@$(CPY) $(PRJLIB) "$(SCRIPT_INSTALL_DIR)" >NUL

+	@echo Installing binaries to '$(LIB_INSTALL_DIR)'

+	@if not exist "$(LIB_INSTALL_DIR)" mkdir "$(LIB_INSTALL_DIR)"

+	@$(CPY) $(PRJLIB) "$(LIB_INSTALL_DIR)" >NUL

+

+# Alias for default-install-scripts

+default-install-libraries: default-install-scripts

 

-default-install-libraries: $(OUT_DIR)\pkgIndex.tcl

+default-install-scripts: $(OUT_DIR)\pkgIndex.tcl

 	@echo Installing libraries to '$(SCRIPT_INSTALL_DIR)'

 	@if exist $(LIBDIR) $(CPY) $(LIBDIR)\*.tcl "$(SCRIPT_INSTALL_DIR)"

 	@echo Installing package index in '$(SCRIPT_INSTALL_DIR)'

@@ -1542,6 +1586,11 @@ default-install-stubs:
 	@if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)"

 	@$(CPY) $(PRJSTUBLIB) "$(SCRIPT_INSTALL_DIR)" >NUL

 

+default-install-pdbs:

+	@echo Installing PDBs to '$(LIB_INSTALL_DIR)'

+	@if not exist "$(LIB_INSTALL_DIR)" mkdir "$(LIB_INSTALL_DIR)"

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

+

 default-install-docs-html:

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

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

@@ -1718,7 +1767,7 @@ TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"
 !if defined(CORE_MACHINE) && "$(CORE_MACHINE)" != "$(MACHINE)"

 !error ERROR: Build target ($(MACHINE)) does not match the Tcl library architecture ($(CORE_MACHINE)).

 !endif

-!if defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) != $(USE_THREAD_ALLOC)

+!if $(TCL_VERSION) < 87 && defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) != $(USE_THREAD_ALLOC)

 !message WARNING: Value of USE_THREAD_ALLOC ($(USE_THREAD_ALLOC)) does not match its Tcl core value ($(CORE_USE_THREAD_ALLOC)).

 !endif

 !if defined(CORE_DEBUG) && $(CORE_DEBUG) != $(DEBUG)