merge core-8-branch. Fully tested now, works fine.

1 files changed, 66 insertions, 21 deletions

diff --git a/win/rules.vc b/win/rules.vc
index 890618c..f22a2dc 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -256,8 +256,13 @@ _TCL_H = ..\generic\tcl.h
 

 TCLINSTALL = 0 # Tk always builds against Tcl source, not an installed Tcl

 !if "$(TCLDIR)" == ""

-TCLDIR  = ../../tcl

+!if [echo TCLDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]

+!error *** Could not locate Tcl source directory.

 !endif

+!include nmakehlp.out

+!endif # TCLDIR == ""

+

 _TCLDIR	= $(TCLDIR:/=\)

 _TCL_H  = $(_TCLDIR)\generic\tcl.h

 !if !exist("$(_TCL_H)")

@@ -285,21 +290,32 @@ TCLINSTALL	= 0
 _TCL_H          = $(_TCLDIR)\generic\tcl.h

 !endif

 

-!else  # TCLDIR is not defined

+!else  #  # Case 2(c) for extensions with TCLDIR undefined

+

+# Need to locate Tcl depending on whether it needs Tcl source or not.

+# If we don't, check the INSTALLDIR for an installed Tcl first

+

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

 

-!if exist("$(_INSTALLDIR)\include\tcl.h") # Case 2(c) for extensions with TCLDIR undefined

 TCLINSTALL	= 1

 TCLDIR          = $(_INSTALLDIR)\..

 # NOTE: we will be resetting _INSTALLDIR to _INSTALLDIR/lib for extensions

 # later so the \.. accounts for the /lib

 _TCLDIR		= $(_INSTALLDIR)\..

 _TCL_H          = $(_TCLDIR)\include\tcl.h

-!elseif exist("..\..\tcl\generic\tcl.h")

+

+!else # exist(...) && ! $(NEED_TCL_SOURCE)

+

+!if [echo _TCLDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]

+!error *** Could not locate Tcl source directory.

+!endif

+!include nmakehlp.out

 TCLINSTALL      = 0

-TCLDIR          = ..\..\tcl

-_TCLDIR         = $(TCLDIR)

+TCLDIR         = $(_TCLDIR)

 _TCL_H          = $(_TCLDIR)\generic\tcl.h

-!endif

+

+!endif # exist(...) && ! $(NEED_TCL_SOURCE)

 

 !endif # TCLDIR

 

@@ -325,17 +341,30 @@ _TK_H          = $(_TKDIR)\generic\tk.h
 

 !else # TKDIR not defined

 

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

+# Need to locate Tcl depending on whether it needs Tcl source or not.

+# If we don't, check the INSTALLDIR for an installed Tcl first

+

+!if exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)

+

 TKINSTALL      = 1

+# NOTE: we will be resetting _INSTALLDIR to _INSTALLDIR/lib for extensions

+# later so the \.. accounts for the /lib

 _TKDIR         = $(_INSTALLDIR)\..

 _TK_H          = $(_TKDIR)\include\tk.h

 TKDIR          = $(_TKDIR)

-!elseif exist("$(_TCLDIR)\include\tk.h")

-TKINSTALL      = 1

-_TKDIR         = $(_TCLDIR)

-_TK_H          = $(_TKDIR)\include\tk.h

-TKDIR          = $(_TKDIR)

+

+!else # exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)

+

+!if [echo _TKDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tk.h >> nmakehlp.out]

+!error *** Could not locate Tk source directory.

 !endif

+!include nmakehlp.out

+TKINSTALL      = 0

+TKDIR          = $(_TKDIR)

+_TK_H          = $(_TKDIR)\generic\tk.h

+

+!endif # exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)

 

 !endif # TKDIR

 

@@ -626,6 +655,7 @@ LINKERFLAGS     = $(LINKERFLAGS) -ltcg
 # The following macros are defined by this section based on OPTS

 # STATIC_BUILD - 0 -> Tcl is to be built as a shared library

 #                1 -> build as a static library and shell

+# TCL_THREADS - legacy but always 1 on Windows since winsock requires it.

 # DEBUG - 1 -> debug build, 0 -> release builds

 # SYMBOLS - 1 -> generate PDB's, 0 -> no PDB's

 # PROFILE - 1 -> generate profiling info, 0 -> no profiling

@@ -647,6 +677,7 @@ LINKERFLAGS     = $(LINKERFLAGS) -ltcg
 

 # Default values for all the above

 STATIC_BUILD	= 0

+TCL_THREADS	= 1

 DEBUG		= 0

 SYMBOLS		= 0

 PROFILE		= 0

@@ -926,6 +957,7 @@ VERSION         = $(DOTVERSION:.=)
 # different compilers, build configurations etc.,

 #

 # Naming convention (suffixes):

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

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

@@ -947,7 +979,7 @@ VERSION         = $(DOTVERSION:.=)
 # PRJSTUBLIB - output path of the generated project stubs library

 # RESFILE - output resource file (only if not static build)

 

-SUFX	    = sgx

+SUFX	    = tsgx

 

 !if $(DEBUG)

 BUILDDIRTOP = Debug

@@ -966,7 +998,7 @@ BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER)
 SUFX	    = $(SUFX:g=)

 !endif

 

-TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_DynamicStaticX

+TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX

 

 !if !$(STATIC_BUILD)

 TMP_DIRFULL = $(TMP_DIRFULL:Static=)

@@ -983,6 +1015,11 @@ SUFX	    = $(SUFX:x=)
 !endif

 !endif

 

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

+TMP_DIRFULL = $(TMP_DIRFULL:Threaded=)

+SUFX	    = $(SUFX:t=)

+!endif

+

 !ifndef TMP_DIR

 TMP_DIR	    = $(TMP_DIRFULL)

 !ifndef OUT_DIR

@@ -1176,8 +1213,11 @@ OPTDEFINES	= $(OPTDEFINES) -DTCL_MEM_DEBUG
 !if $(TCL_COMPILE_DEBUG)

 OPTDEFINES	= $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS

 !endif

-!if $(USE_THREAD_ALLOC)==0

-OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=0

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

+OPTDEFINES	= $(OPTDEFINES) -DTCL_THREADS=1

+!if $(USE_THREAD_ALLOC)

+OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=1

+!endif

 !endif

 !if $(STATIC_BUILD)

 OPTDEFINES	= $(OPTDEFINES) -DSTATIC_BUILD

@@ -1486,13 +1526,12 @@ default-clean:
 	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

 	@if exist $(WINDIR)\version.vc del $(WINDIR)\version.vc

 

-default-hose:

+default-hose: default-clean

 	@echo Hosing $(OUT_DIR)\* ...

 	@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)

 

+# Only for backward compatibility

 default-distclean: default-hose

-	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe

-	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj

 

 default-setup:

 	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)

@@ -1644,10 +1683,16 @@ TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"
 # Display stats being used.

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

 

+!if !$(DOING_TCL)

+!message *** Building against Tcl at '$(_TCLDIR)'

+!endif

+!if !$(DOING_TK) && $(NEED_TK)

+!message *** Building against Tk at '$(_TKDIR)'

+!endif

 !message *** Intermediate directory will be '$(TMP_DIR)'

 !message *** Output directory will be '$(OUT_DIR)'

+!message *** Installation, if selected, will be in '$(_INSTALLDIR)'

 !message *** Suffix for binaries will be '$(SUFX)'

-!message *** Optional defines are '$(OPTDEFINES)'

 !message *** Compiler version $(VCVER). Target machine is $(MACHINE)

 !message *** Host architecture is $(NATIVE_ARCH)