merge trunk

2 files changed, 43 insertions, 41 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 7bacfd3..8557923 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -42,17 +42,17 @@ the build instructions.
 #     turn on the 64-bit compiler, if your SDK has it.
 #
 # 3)  Targets are:
-#	release  -- builds the core, the shell. (default)
+#	release  -- Builds the core, the shell. (default)
 #	core     -- Only builds the core.
-#	all      -- builds everything.
-#	test     -- builds and runs the test suite.
-#	tktest   -- just builds the binaries for the test suite.
-#	install  -- installs the built binaries and libraries to $(INSTALLDIR)
+#	all      -- Builds everything.
+#	test     -- Builds and runs the test suite.
+#	tktest   -- Just builds the binaries for the test suite.
+#	install  -- Installs the built binaries and libraries to $(INSTALLDIR)
 #		    as the root of the install tree.
-#	cwish    -- builds a console version of wish.
-#	clean    -- removes the contents of $(TMP_DIR)
-#	hose     -- removes the contents of $(TMP_DIR) and $(OUT_DIR)
-#	genstubs -- rebuilds the Stubs table and support files (dev only).
+#	cwish    -- Builds a console version of wish.
+#	clean    -- Removes the contents of $(TMP_DIR)
+#	hose     -- Removes the contents of $(TMP_DIR) and $(OUT_DIR)
+#	genstubs -- Rebuilds the Stubs table and support files (dev only).
 #	depend   -- Generates an accurate set of source dependancies for this
 #		    makefile.  Helpful to avoid problems when the sources are
 #		    refreshed and you rebuild, but can "overbuild" when common
@@ -71,34 +71,36 @@ the build instructions.
 #		Sets where to install Tcl from the built binaries.
 #		C:\Progra~1\Tcl is assumed when not specified.
 #
-#	OPTS=static,msvcrt,linkexten,threads,symbols,profile,unchecked,none
+#	OPTS=loimpact,msvcrt,nothreads,noxp,pdbs,profile,square,static,staticpkg,symbols,unchecked,none
 #		Sets special options for the core.  The default is for none.
 #		Any combination of the above may be used (comma separated).
 #		'none' will over-ride everything to nothing.
 #
-#		static   = Builds a static library of the core instead of a
-#			   dll.  The shell will be static (and large), as well.
-#		msvcrt   = Effects the static option only to switch it from
+#		loimpact = Adds a flag for how NT treats the heap to keep memory
+#			   in use, low.  This is said to impact alloc performance.
+#		msvcrt  =  Affects the static option only to switch it from
 #			   using libcmt(d) as the C runtime [by default] to
 #			   msvcrt(d). This is useful for static embedding
 #			   support.
-#		staticpkg= Affects the static option only to switch wishXX.exe
-#			   to have the dde and reg extension linked inside it.
-#		threads  = Turns on full multithreading support.
+#		nothreads = Turns off full multithreading support.
+#		noxp     = If you do not have the uxtheme.h header then you
+#                          cannot include support for XP themeing.
+#		square   = Include the demo square widget.
+#		static  =  Builds a static library of the core instead of a
+#			   dll.  The shell will be static (and large), as well.
+#		staticpkg = Affects the static option only to switch
+#			   wishXX.exe to have the dde and reg extension linked
+#			   inside it.
+#		pdbs     = Build detached symbols for release builds.
+#		profile  = Adds profiling hooks.  Map file is assumed.
 #		thrdalloc = Use the thread allocator (shared global free pool)
 #			   This is the default on threaded builds.
-#		tclalloc  = Use the old non-thread allocator
-#		symbols  = Adds symbols for step debugging.
-#		profile  = Adds profiling hooks.  Map file is assumed.
-#		loimpact = Adds a flag for how NT treats the heap to keep
-#			   memory in use, low.  This is said to impact alloc
-#			   performance.
-#		unchecked= Allows a symbols build to not use the debug
+#		tclalloc = Use the old non-thread allocator
+#		symbols  = Debug build. Links to the debug C runtime, disables
+#			   optimizations and creates pdb symbols files.
+#		unchecked = Allows a symbols build to not use the debug
 #			   enabled runtime (msvcrt.dll not msvcrtd.dll
 #			   or libcmt.lib not libcmtd.lib).
-#               noxp     = If you do not have the uxtheme.h header then you
-#                          cannot include support for XP themeing.
-#		square   = Include the demo square widget.
 #
 #	STATS=memdbg,compdbg,none
 #		Sets optional memory and bytecode compiler debugging code added
@@ -109,15 +111,16 @@ the build instructions.
 #		memdbg   = Enables the debugging memory allocator.
 #		compdbg  = Enables byte compilation logging.
 #
-#	CHECKS=nodep,fullwarn,none
+#	CHECKS=nodep,fullwarn,64bit,none
 #		Sets special macros for checking compatability.
 #
 #		nodep	 = Turns off compatability macros to ensure Tk isn't
 #			    being built with deprecated functions.
 #		fullwarn = Builds with full compiler and link warnings enabled.
 #			    Very verbose.
+#		64bit    = Enable 64bit portability warnings (if available)
 #
-#	MACHINE=(IX86|IA64|AMD64|ALPHA)
+#	MACHINE=(ALPHA|AMD64|IA64|IX86)
 #		Set the machine type used for the compiler, linker, and
 #		resource compiler.  This hook is needed to tell the tools
 #		when alternate platforms are requested.  IX86 is the default
@@ -205,8 +208,8 @@ TTK_SQUARE_WIDGET   = 0
 STUBPREFIX = $(PROJECT)stub
 WISHNAMEPREFIX = wish
 
-BINROOT		= .
-ROOT		= ..
+BINROOT		= $(MAKEDIR)     # originally .
+ROOT		= $(MAKEDIR)\..  # originally ..
 
 TK_LIBRARY	= $(ROOT)\library
 
@@ -664,9 +667,8 @@ $(CAT32): $(_TCLDIR)\win\cat.c
 	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMP_DIR)\cat.obj $(baselibs)
 	$(_VC_MANIFEST_EMBED_EXE)
 
-
 #---------------------------------------------------------------------
-# Regenerate the stubs files.
+# Regenerate the stubs files.  [Development use only]
 #---------------------------------------------------------------------
 
 genstubs:
@@ -731,8 +733,8 @@ CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))
 CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
 <<
 	cd $(MAKEDIR)
-	$(CPY) "$(DOCTMP_DIR)\$(@B).hlp" "$(OUT_DIR)"
-	$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
+	@$(CPY) "$(DOCTMP_DIR)\$(@B).hlp" "$(OUT_DIR)"
+	@$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
 
 $(MAN2TCL): $(TCLTOOLSDIR)\$$(@B).c
 	$(cc32) $(TK_CFLAGS) -Fo$(@D)\ $(TCLTOOLSDIR)\$(@B).c
@@ -831,7 +833,7 @@ $(TKOBJS)
 
 
 #---------------------------------------------------------------------
-# Dedependency rules
+# Dependency rules
 #---------------------------------------------------------------------
 
 $(TMP_DIR)\tk.res: \
@@ -841,7 +843,7 @@ $(TMP_DIR)\tk.res: \
 
 !if exist("$(OUT_DIR)\depend.mk")
 !include "$(OUT_DIR)\depend.mk"
-!message *** Dependency rules in effect.
+!message *** Dependency rules in use.
 !else
 !message *** Dependency rules are not being used.
 !endif
diff --git a/win/rules.vc b/win/rules.vc
index f2ee135..f09e2ea 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -8,7 +8,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 # Copyright (c) 2001-2003 David Gravereaux.
-# Copyright (c) 2003-2007 Patrick Thoyts
+# Copyright (c) 2003-2008 Patrick Thoyts
 #------------------------------------------------------------------------------
 
 !ifndef _RULES_VC
@@ -243,9 +243,9 @@ TCL_USE_STATIC_PACKAGES	= 1
 TCL_USE_STATIC_PACKAGES	= 0
 !endif
 !if [nmakehlp -f $(OPTS) "nothreads"]
+!message *** Compile explicitly for non-threaded tcl
 TCL_THREADS	= 0
 !else
-!message *** Doing threads
 TCL_THREADS	= 1
 USE_THREAD_ALLOC= 1
 !endif
@@ -287,7 +287,7 @@ LOIMPACT	= 0
 USE_THREAD_ALLOC = 1
 !endif
 !if [nmakehlp -f $(OPTS) "tclalloc"]
-!message *** Doing thrdalloc
+!message *** Doing tclalloc
 USE_THREAD_ALLOC = 0
 !endif
 !if [nmakehlp -f $(OPTS) "unchecked"]
@@ -598,7 +598,7 @@ TCLSTUBLIB	= "$(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib"
 TCLIMPLIB	= "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib"
 TCL_LIBRARY	= $(_TCLDIR)\lib
 TCLREGLIB	= "$(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib"
-TCLDDELIB	= "$(_TCLDIR)\lib\tcldde13$(SUFX:t=).lib"
+TCLDDELIB	= "$(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib"
 COFFBASE	= \must\have\tcl\sources\to\build\this\target
 TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target
 TCL_INCLUDES    = -I"$(_TCLDIR)\include"
@@ -611,7 +611,7 @@ TCLSTUBLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib"
 TCLIMPLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib"
 TCL_LIBRARY	= $(_TCLDIR)\library
 TCLREGLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib"
-TCLDDELIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde13$(SUFX:t=).lib"
+TCLDDELIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib"
 COFFBASE	= "$(_TCLDIR)\win\coffbase.txt"
 TCLTOOLSDIR	= $(_TCLDIR)\tools
 TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"