merge trunk

50 files changed, 2152 insertions, 3591 deletions

diff --git a/.fossil-settings/crlf-glob b/.fossil-settings/crlf-glob
index 2041cb6..56f3a03 100644
--- a/.fossil-settings/crlf-glob
+++ b/.fossil-settings/crlf-glob
@@ -12,6 +12,8 @@ win/buildall.vc.bat
 win/coffbase.txt
 win/makefile.vc
 win/rules.vc
+win/rules-ext.vc
+win/targets.vc
 win/tcl.dsp
 win/tcl.dsw
 win/tcl.hpj.in
\ No newline at end of file
diff --git a/.fossil-settings/crnl-glob b/.fossil-settings/crnl-glob
index 2041cb6..56f3a03 100644
--- a/.fossil-settings/crnl-glob
+++ b/.fossil-settings/crnl-glob
@@ -12,6 +12,8 @@ win/buildall.vc.bat
 win/coffbase.txt
 win/makefile.vc
 win/rules.vc
+win/rules-ext.vc
+win/targets.vc
 win/tcl.dsp
 win/tcl.dsw
 win/tcl.hpj.in
\ No newline at end of file
diff --git a/compat/opendir.c b/compat/opendir.c
index 7a49566..07d265e 100644
--- a/compat/opendir.c
+++ b/compat/opendir.c
@@ -28,7 +28,7 @@ opendir(
     if ((fd = open(myname, 0, 0)) == -1) {
 	return NULL;
     }
-    dirp = (DIR *) ckalloc(sizeof(DIR));
+    dirp = (DIR *) Tcl_Alloc(sizeof(DIR));
     if (dirp == NULL) {
 	/* unreachable? */
 	close(fd);
diff --git a/compat/waitpid.c b/compat/waitpid.c
index d4473a8..127e10f 100644
--- a/compat/waitpid.c
+++ b/compat/waitpid.c
@@ -156,7 +156,7 @@ waitpid(
 		goto waitAgain;
 	    }
 	}
-	waitPtr = (WaitInfo *) ckalloc(sizeof(WaitInfo));
+	waitPtr = (WaitInfo *) Tcl_Alloc(sizeof(WaitInfo));
 	waitPtr->pid = result;
 	waitPtr->status = status;
 	waitPtr->nextPtr = deadList;
diff --git a/doc/PrintDbl.3 b/doc/PrintDbl.3
index 896b6eb..42b258c 100644
--- a/doc/PrintDbl.3
+++ b/doc/PrintDbl.3
@@ -18,10 +18,7 @@ Tcl_PrintDouble \- Convert floating value to string
 .SH ARGUMENTS
 .AS Tcl_Interp *interp out
 .AP Tcl_Interp *interp in
-Before Tcl 8.0, the \fBtcl_precision\fR variable in this interpreter
-controlled the conversion.  As of Tcl 8.0, this argument is ignored and
-the conversion is controlled by the \fBtcl_precision\fR variable
-that is now shared by all interpreters.
+This argument is ignored.
 .AP double value in
 Floating-point value to be converted.
 .AP char *dst out
@@ -41,9 +38,7 @@ so that it does not look like an integer.  Where \fB%g\fR would
 generate an integer with no decimal point, \fBTcl_PrintDouble\fR adds
 .QW .0 .
 .PP
-If the \fBtcl_precision\fR value is non-zero, the result will have
-precisely that many digits of significance.  If the value is zero
-(the default), the result will have the fewest digits needed to
+The result will have the fewest digits needed to
 represent the number in such a way that \fBTcl_NewDoubleObj\fR
 will generate the same number when presented with the given string.
 IEEE semantics of rounding to even apply to the conversion.
diff --git a/doc/tclvars.n b/doc/tclvars.n
index adefe40..42e9212 100644
--- a/doc/tclvars.n
+++ b/doc/tclvars.n
@@ -10,7 +10,7 @@
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
-argc, argv, argv0, auto_path, env, errorCode, errorInfo, tcl_interactive, tcl_library, tcl_nonwordchars, tcl_patchLevel, tcl_pkgPath, tcl_platform, tcl_precision, tcl_rcFileName, tcl_traceCompile, tcl_traceExec, tcl_wordchars, tcl_version \- Variables used by Tcl
+argc, argv, argv0, auto_path, env, errorCode, errorInfo, tcl_interactive, tcl_library, tcl_nonwordchars, tcl_patchLevel, tcl_pkgPath, tcl_platform, tcl_rcFileName, tcl_traceCompile, tcl_traceExec, tcl_wordchars, tcl_version \- Variables used by Tcl
 .BE
 .SH DESCRIPTION
 .PP
@@ -356,70 +356,6 @@ This gives the size of the native-machine word in bytes (strictly, it
 is same as the result of evaluating \fIsizeof(long)\fR in C.)
 .RE
 .TP
-\fBtcl_precision\fR
-.
-This variable controls the number of digits to generate
-when converting floating-point values to strings.  It defaults
-to 0.  \fIApplications should not change this value;\fR it is
-provided for compatibility with legacy code.
-.PP
-.RS
-The default value of 0 is special, meaning that Tcl should
-convert numbers using as few digits as possible while still
-distinguishing any floating point number from its nearest
-neighbours.  It differs from using an arbitrarily high value
-for \fItcl_precision\fR in that an inexact number like \fI1.4\fR
-will convert as \fI1.4\fR rather than \fI1.3999999999999999\fR
-even though the latter is nearer to the exact value of the
-binary number.
-.RE
-.PP
-.RS
-If \fBtcl_precision\fR is not zero, then when Tcl converts a floating
-point number, it creates a decimal representation of at most
-\fBtcl_precision\fR significant digits; the result may be shorter if
-the shorter result represents the original number exactly. If no
-result of at most \fBtcl_precision\fR digits is an exact representation
-of the original number, the one that is closest to the original
-number is chosen.
-If the original number lies precisely between two equally accurate
-decimal representations, then the one with an even value for the least
-significant digit is chosen; for instance, if \fBtcl_precision\fR is 3, then
-0.3125 will convert to 0.312, not 0.313, while 0.6875 will convert to
-0.688, not 0.687. Any string of trailing zeroes that remains is trimmed.
-.RE
-.PP
-.RS
-a \fBtcl_precision\fR value of 17 digits is
-.QW perfect
-for IEEE floating-point in that it allows
-double-precision values to be converted to strings and back to
-binary with no loss of information. For this reason, you will often
-see it as a value in legacy code that must run on Tcl versions before
-8.5. It is no longer recommended; as noted above, a zero value is the
-preferred method.
-.RE
-.PP
-.RS
-All interpreters in a thread share a single \fBtcl_precision\fR value:
-changing it in one interpreter will affect all other interpreters as
-well.  Safe interpreters are not allowed to modify the
-variable.
-.RE
-.PP
-.RS
-Valid values for \fBtcl_precision\fR range from 0 to 17.
-.RE
-.TP
-\fBtcl_rcFileName\fR
-.
-This variable is used during initialization to indicate the name of a
-user-specific startup file.  If it is set by application-specific
-initialization, then the Tcl startup code will check for the existence
-of this file and \fBsource\fR it if it exists.  For example, for \fBwish\fR
-the variable is set to \fB~/.wishrc\fR for Unix and \fB~/wishrc.tcl\fR
-for Windows.
-.TP
 \fBtcl_traceCompile\fR
 .
 The value of this variable can be set to control
diff --git a/generic/regcustom.h b/generic/regcustom.h
index c4dbc73..ae1c503 100644
--- a/generic/regcustom.h
+++ b/generic/regcustom.h
@@ -36,9 +36,9 @@
  * Overrides for regguts.h definitions, if any.
  */
 
-#define	MALLOC(n)		(void*)(attemptckalloc(n))
-#define	FREE(p)			ckfree((void*)(p))
-#define	REALLOC(p,n)		(void*)(attemptckrealloc((void*)(p),n))
+#define	MALLOC(n)		Tcl_AttemptAlloc(n)
+#define	FREE(p)			Tcl_Free(p)
+#define	REALLOC(p,n)		Tcl_AttemptRealloc(p,n)
 
 /*
  * Do not insert extras between the "begin" and "end" lines - this chunk is
diff --git a/generic/tcl.h b/generic/tcl.h
index 02c07a1..f4719df 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -764,7 +764,7 @@ typedef struct Tcl_Obj {
 				 * must be followed by a null byte (i.e., at
 				 * offset length) but may also contain
 				 * embedded null characters. The array's
-				 * storage is allocated by ckalloc. NULL means
+				 * storage is allocated by Tcl_Alloc. NULL means
 				 * the string rep is invalid and must be
 				 * regenerated from the internal rep.  Clients
 				 * should use Tcl_GetStringFromObj or
@@ -948,8 +948,8 @@ typedef struct Tcl_DString {
 
 /*
  * Definitions for the maximum number of digits of precision that may be
- * specified in the "tcl_precision" variable, and the number of bytes of
- * buffer space required by Tcl_PrintDouble.
+ * produced by Tcl_PrintDouble, and the number of bytes of buffer space
+ * required by Tcl_PrintDouble.
  */
 
 #define TCL_MAX_PREC		17
@@ -2411,28 +2411,30 @@ EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
 
 /*
  *----------------------------------------------------------------------------
- * The following declarations either map ckalloc and ckfree to malloc and
+ * The following declarations either map Tcl_Alloc and Tcl_Free to malloc and
  * free, or they map them to functions with all sorts of debugging hooks
  * defined in tclCkalloc.c.
  */
 
-#define Tcl_Alloc ckalloc
-#define Tcl_Free ckfree
-#define Tcl_Realloc ckrealloc
-#define Tcl_AttemptAlloc attemptckalloc
-#define Tcl_AttemptRealloc attemptckrealloc
+#if !defined(TCL_NO_DEPRECATED) || defined(BUILD_tcl)
+#   define ckalloc Tcl_Alloc
+#   define ckfree Tcl_Free
+#   define ckrealloc Tcl_Realloc
+#   define attemptckalloc Tcl_AttemptAlloc
+#   define attemptckrealloc Tcl_AttemptRealloc
+#endif
 
 #ifdef TCL_MEM_DEBUG
 
-#   define ckalloc(x) \
+#   define Tcl_Alloc(x) \
     (Tcl_DbCkalloc((x), __FILE__, __LINE__))
-#   define ckfree(x) \
+#   define Tcl_Free(x) \
     Tcl_DbCkfree((x), __FILE__, __LINE__)
-#   define ckrealloc(x,y) \
+#   define Tcl_Realloc(x,y) \
     (Tcl_DbCkrealloc((x), (y), __FILE__, __LINE__))
-#   define attemptckalloc(x) \
+#   define Tcl_AttemptAlloc(x) \
     (Tcl_AttemptDbCkalloc((x), __FILE__, __LINE__))
-#   define attemptckrealloc(x,y) \
+#   define Tcl_AttemptRealloc(x,y) \
     (Tcl_AttemptDbCkrealloc((x), (y), __FILE__, __LINE__))
 
 #else /* !TCL_MEM_DEBUG */
@@ -2443,15 +2445,15 @@ EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
  * memory allocator both inside and outside of the Tcl library.
  */
 
-#   define ckalloc \
+#   define Tcl_Alloc \
     Tcl_MemAlloc
-#   define ckfree \
+#   define Tcl_Free \
     Tcl_MemFree
-#   define ckrealloc \
+#   define Tcl_Realloc \
     Tcl_MemRealloc
-#   define attemptckalloc \
+#   define Tcl_AttemptAlloc \
     Tcl_AttemptMemAlloc
-#   define attemptckrealloc \
+#   define Tcl_AttemptRealloc \
     Tcl_AttemptMemRealloc
 #   undef  Tcl_InitMemory
 #   define Tcl_InitMemory(x)
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 67e5490..703fd86 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -937,9 +937,6 @@ Tcl_CreateInterp(void)
 
     Tcl_SetVar2(interp, "tcl_patchLevel", NULL, TCL_PATCH_LEVEL, TCL_GLOBAL_ONLY);
     Tcl_SetVar2(interp, "tcl_version", NULL, TCL_VERSION, TCL_GLOBAL_ONLY);
-    Tcl_TraceVar2(interp, "tcl_precision", NULL,
-	    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-	    TclPrecTraceProc, NULL);
     TclpSetVariables(interp);
 
 #ifdef TCL_THREADS
@@ -3120,6 +3117,7 @@ Tcl_DeleteCommandFromToken(
      * traces.
      */
 
+    cmdPtr->nsPtr->refCount++;
     if (cmdPtr->tracePtr != NULL) {
 	CommandTrace *tracePtr;
 	CallCommandTraces(iPtr,cmdPtr,NULL,NULL,TCL_TRACE_DELETE);
@@ -3147,6 +3145,7 @@ Tcl_DeleteCommandFromToken(
      */
 
     TclInvalidateNsCmdLookup(cmdPtr->nsPtr);
+    TclNsDecrRefCount(cmdPtr->nsPtr);
 
     /*
      * If the command being deleted has a compile function, increment the
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index af5e6b5..8098f30 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3882,7 +3882,7 @@ extern const TclStubs *tclStubsPtr;
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(__result, -1)); \
 	    if (__result != NULL && __freeProc != NULL && __freeProc != TCL_VOLATILE) { \
 		if (__freeProc == TCL_DYNAMIC) { \
-		    ckfree(__result); \
+		    Tcl_Free(__result); \
 		} else { \
 		    (*__freeProc)(__result); \
 		} \
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 59b1f40..b7223ec 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -2109,8 +2109,8 @@ TclSpellFix(
     Interp *iPtr = (Interp *) interp;
     Tcl_Obj *const *search;
     Tcl_Obj **store;
-    int idx;
-    int size;
+    size_t idx;
+    size_t size;
 
     if (iPtr->ensembleRewrite.sourceObjs == NULL) {
 	iPtr->ensembleRewrite.sourceObjs = objv;
@@ -2433,13 +2433,31 @@ MakeCachedEnsembleCommand(
  */
 
 static void
+ClearTable(
+    EnsembleConfig *ensemblePtr)
+{
+    Tcl_HashTable *hash = &ensemblePtr->subcommandTable;
+
+    if (hash->numEntries != 0) {
+        Tcl_HashSearch search;
+        Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(hash, &search);
+
+        while (hPtr != NULL) {
+            Tcl_Obj *prefixObj = Tcl_GetHashValue(hPtr);
+            Tcl_DecrRefCount(prefixObj);
+            hPtr = Tcl_NextHashEntry(&search);
+        }
+        ckfree(ensemblePtr->subcommandArrayPtr);
+    }
+    Tcl_DeleteHashTable(hash);
+}
+
+static void
 DeleteEnsembleConfig(
     ClientData clientData)
 {
     EnsembleConfig *ensemblePtr = clientData;
     Namespace *nsPtr = ensemblePtr->nsPtr;
-    Tcl_HashSearch search;
-    Tcl_HashEntry *hEnt;
 
     /*
      * Unlink from the ensemble chain if it has not been marked as having been
@@ -2473,17 +2491,7 @@ DeleteEnsembleConfig(
      * Kill the pointer-containing fields.
      */
 
-    if (ensemblePtr->subcommandTable.numEntries != 0) {
-	ckfree(ensemblePtr->subcommandArrayPtr);
-    }
-    hEnt = Tcl_FirstHashEntry(&ensemblePtr->subcommandTable, &search);
-    while (hEnt != NULL) {
-	Tcl_Obj *prefixObj = Tcl_GetHashValue(hEnt);
-
-	Tcl_DecrRefCount(prefixObj);
-	hEnt = Tcl_NextHashEntry(&search);
-    }
-    Tcl_DeleteHashTable(&ensemblePtr->subcommandTable);
+    ClearTable(ensemblePtr);
     if (ensemblePtr->subcmdList != NULL) {
 	Tcl_DecrRefCount(ensemblePtr->subcmdList);
     }
@@ -2540,107 +2548,101 @@ BuildEnsembleConfig(
     int isNew;
     Tcl_HashTable *hash = &ensemblePtr->subcommandTable;
     Tcl_HashEntry *hPtr;
-    Tcl_Obj *subcmdDictCopy = NULL ;
-
-    if (hash->numEntries != 0) {
-	/*
-	 * Remove pre-existing table.
-	 */
-
-	ckfree(ensemblePtr->subcommandArrayPtr);
-	hPtr = Tcl_FirstHashEntry(hash, &search);
-	while (hPtr != NULL) {
-	    Tcl_Obj *prefixObj = Tcl_GetHashValue(hPtr);
-
-	    Tcl_DecrRefCount(prefixObj);
-	    hPtr = Tcl_NextHashEntry(&search);
-	}
-	Tcl_DeleteHashTable(hash);
-	Tcl_InitHashTable(hash, TCL_STRING_KEYS);
-    }
-
-    /*
-     * See if we've got an export list. If so, we will only export exactly
-     * those commands, which may be either implemented by the prefix in the
-     * subcommandDict or mapped directly onto the namespace's commands.
-     */
-
-    if (ensemblePtr->subcmdList != NULL) {
-	Tcl_Obj **subcmdv, *target, *cmdObj, *cmdPrefixObj;
-	int subcmdc;
-
-	TclListObjGetElements(NULL, ensemblePtr->subcmdList, &subcmdc,
-		&subcmdv);
-	for (i=0 ; (int)i<subcmdc ; i++) {
-	    const char *name = TclGetString(subcmdv[i]);
-
-	    hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
-
-	    /*
-	     * Skip non-unique cases.
-	     */
-
-	    if (!isNew) {
-		continue;
-	    }
-
-	    /*
-	     * Look in our dictionary (if present) for the command.
-	     */
-
-	    if (ensemblePtr->subcommandDict != NULL) {
-		if (subcmdDictCopy == NULL) {
-		    if (ensemblePtr->subcmdList == ensemblePtr->subcommandDict) {
-			subcmdDictCopy = Tcl_DuplicateObj(ensemblePtr->subcommandDict);
-		    } else {
-			subcmdDictCopy = ensemblePtr->subcommandDict;
-		    }
-		    Tcl_IncrRefCount(subcmdDictCopy);
-		}
-		Tcl_DictObjGet(NULL, subcmdDictCopy, subcmdv[i],
-			&target);
-		if (target != NULL) {
-		    Tcl_SetHashValue(hPtr, target);
-		    Tcl_IncrRefCount(target);
-		    continue;
-		}
-	    }
-
-	    /*
-	     * Not there, so map onto the namespace. Note in this case that we
-	     * do not guarantee that the command is actually there; that is
-	     * the programmer's responsibility (or [::unknown] of course).
-	     */
-
-	    cmdObj = Tcl_NewStringObj(name, -1);
-	    cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
-	    Tcl_SetHashValue(hPtr, cmdPrefixObj);
-	    Tcl_IncrRefCount(cmdPrefixObj);
-	}
-	if (subcmdDictCopy != NULL) {
-	    Tcl_DecrRefCount(subcmdDictCopy);
-	}
-    } else if (ensemblePtr->subcommandDict != NULL) {
-	/*
-	 * No subcmd list, but we do have a mapping dictionary so we should
-	 * use the keys of that. Convert the dictionary's contents into the
-	 * form required for the ensemble's internal hashtable.
-	 */
-
-	Tcl_DictSearch dictSearch;
-	Tcl_Obj *keyObj, *valueObj;
-	int done;
-
-	Tcl_DictObjFirst(NULL, ensemblePtr->subcommandDict, &dictSearch,
-		&keyObj, &valueObj, &done);
-	while (!done) {
-	    const char *name = TclGetString(keyObj);
-
-	    hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
-	    Tcl_SetHashValue(hPtr, valueObj);
-	    Tcl_IncrRefCount(valueObj);
-	    Tcl_DictObjNext(&dictSearch, &keyObj, &valueObj, &done);
-	}
+    Tcl_Obj *mapDict = ensemblePtr->subcommandDict;
+    Tcl_Obj *subList = ensemblePtr->subcmdList;
+
+    ClearTable(ensemblePtr);
+    Tcl_InitHashTable(hash, TCL_STRING_KEYS);
+
+    if (subList) {
+        int subc;
+        Tcl_Obj **subv, *target, *cmdObj, *cmdPrefixObj;
+        char *name;
+
+        /*
+         * There is a list of exactly what subcommands go in the table.
+         * Must determine the target for each.
+         */
+
+        Tcl_ListObjGetElements(NULL, subList, &subc, &subv);
+        if (subList == mapDict) {
+            /*
+             * Strange case where explicit list of subcommands is same value
+             * as the dict mapping to targets.
+             */
+
+            for (i = 0; i < (size_t)subc; i += 2) {
+                name = TclGetString(subv[i]);
+                hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
+                if (!isNew) {
+                    cmdObj = (Tcl_Obj *)Tcl_GetHashValue(hPtr);
+                    Tcl_DecrRefCount(cmdObj);
+                }
+                Tcl_SetHashValue(hPtr, subv[i+1]);
+                Tcl_IncrRefCount(subv[i+1]);
+
+                name = TclGetString(subv[i+1]);
+                hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
+                if (isNew) {
+                    cmdObj = Tcl_NewStringObj(name, -1);
+                    cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
+                    Tcl_SetHashValue(hPtr, cmdPrefixObj);
+                    Tcl_IncrRefCount(cmdPrefixObj);
+                }
+            }
+        } else {
+            /* Usual case where we can freely act on the list and dict. */
+
+            for (i = 0; i < (size_t)subc; i++) {
+                name = TclGetString(subv[i]);
+                hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
+                if (!isNew) {
+                    continue;
+                }
+
+                /* Lookup target in the dictionary */
+                if (mapDict) {
+                    Tcl_DictObjGet(NULL, mapDict, subv[i], &target);
+                    if (target) {
+                        Tcl_SetHashValue(hPtr, target);
+                        Tcl_IncrRefCount(target);
+                        continue;
+                    }
+                }
+
+                /*
+                 * target was not in the dictionary so map onto the namespace.
+                 * Note in this case that we do not guarantee that the
+                 * command is actually there; that is the programmer's
+                 * responsibility (or [::unknown] of course).
+                 */
+                cmdObj = Tcl_NewStringObj(name, -1);
+                cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
+                Tcl_SetHashValue(hPtr, cmdPrefixObj);
+                Tcl_IncrRefCount(cmdPrefixObj);
+            }
+        }
+    } else if (mapDict) {
+        /*
+         * No subcmd list, but we do have a mapping dictionary so we should
+         * use the keys of that. Convert the dictionary's contents into the
+         * form required for the ensemble's internal hashtable.
+         */
+
+        Tcl_DictSearch dictSearch;
+        Tcl_Obj *keyObj, *valueObj;
+        int done;
+
+        Tcl_DictObjFirst(NULL, ensemblePtr->subcommandDict, &dictSearch,
+                &keyObj, &valueObj, &done);
+        while (!done) {
+            char *name = TclGetString(keyObj);
+
+            hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
+            Tcl_SetHashValue(hPtr, valueObj);
+            Tcl_IncrRefCount(valueObj);
+            Tcl_DictObjNext(&dictSearch, &keyObj, &valueObj, &done);
+        }
     } else {
 	/*
 	 * Discover what commands are actually exported by the namespace.
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 337b72f..9ee376c 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -358,10 +358,11 @@ declare 81 {
 #  declare 87 {
 #      void TclPlatformInit(Tcl_Interp *interp)
 #  }
-declare 88 {
-    char *TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp,
-	    const char *name1, const char *name2, int flags)
-}
+# Removed in 9.0:
+#declare 88 {
+#    char *TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp,
+#	    const char *name1, const char *name2, int flags)
+#}
 declare 89 {
     int TclPreventAliasLoop(Tcl_Interp *interp, Tcl_Interp *cmdInterp,
 	    Tcl_Command cmd)
@@ -1103,9 +1104,10 @@ declare 5 win {
 declare 8 win {
     int TclpGetPid(Tcl_Pid pid)
 }
-declare 9 win {
-    int TclWinGetPlatformId(void)
-}
+# Removed in 9.0:
+#declare 9 win {
+#    int TclWinGetPlatformId(void)
+#}
 # Removed in 9.0:
 #declare 10 win {
 #    Tcl_DirEntry *TclpReaddir(DIR *dir)
diff --git a/generic/tclInt.h b/generic/tclInt.h
index f1f38de..3ed0485 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -609,7 +609,7 @@ typedef struct Var {
 	TclVarHashTable *tablePtr;/* For array variables, this points to
 				 * information about the hash table used to
 				 * implement the associative array. Points to
-				 * ckalloc-ed data. */
+				 * Tcl_Alloc-ed data. */
 	struct Var *linkPtr;	/* If this is a global variable being referred
 				 * to in a procedure, or a variable created by
 				 * "upvar", this field points to the
@@ -4092,7 +4092,7 @@ typedef const char *TclDTraceStr;
 	    TCL_DTRACE_OBJ_FREE(objPtr); \
 	    if ((objPtr)->bytes \
 		    && ((objPtr)->bytes != &tclEmptyString)) { \
-		ckfree((objPtr)->bytes); \
+		Tcl_Free((objPtr)->bytes); \
 	    } \
 	    (objPtr)->length = (size_t)-1; \
 	    TclFreeObjStorage(objPtr); \
@@ -4112,10 +4112,10 @@ typedef const char *TclDTraceStr;
  */
 
 #  define TclAllocObjStorageEx(interp, objPtr) \
-	(objPtr) = (Tcl_Obj *) ckalloc(sizeof(Tcl_Obj))
+	(objPtr) = (Tcl_Obj *) Tcl_Alloc(sizeof(Tcl_Obj))
 
 #  define TclFreeObjStorageEx(interp, objPtr) \
-	ckfree(objPtr)
+	Tcl_Free(objPtr)
 
 #undef USE_THREAD_ALLOC
 #undef USE_TCLALLOC
@@ -4255,7 +4255,7 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
 	(objPtr)->bytes	 = &tclEmptyString; \
 	(objPtr)->length = 0; \
     } else { \
-	(objPtr)->bytes = ckalloc((len) + 1); \
+	(objPtr)->bytes = Tcl_Alloc((len) + 1); \
 	memcpy((objPtr)->bytes, (bytePtr), (len)); \
 	(objPtr)->bytes[len] = '\0'; \
 	(objPtr)->length = (len); \
@@ -4311,7 +4311,7 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
 #define TclInvalidateStringRep(objPtr) \
     if ((objPtr)->bytes != NULL) { \
 	if ((objPtr)->bytes != &tclEmptyString) { \
-	    ckfree((objPtr)->bytes); \
+	    Tcl_Free((objPtr)->bytes); \
 	} \
 	(objPtr)->bytes = NULL; \
     }
@@ -4363,14 +4363,14 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
 	    if (allocated > TCL_MAX_TOKENS) {				\
 		allocated = TCL_MAX_TOKENS;				\
 	    }								\
-	    newPtr = (Tcl_Token *) attemptckrealloc((char *) oldPtr,	\
+	    newPtr = (Tcl_Token *) Tcl_AttemptRealloc((char *) oldPtr,	\
 		    (unsigned int) (allocated * sizeof(Tcl_Token)));	\
 	    if (newPtr == NULL) {					\
 		allocated = _needed + (append) + TCL_MIN_TOKEN_GROWTH;	\
 		if (allocated > TCL_MAX_TOKENS) {			\
 		    allocated = TCL_MAX_TOKENS;				\
 		}							\
-		newPtr = (Tcl_Token *) ckrealloc((char *) oldPtr,	\
+		newPtr = (Tcl_Token *) Tcl_Realloc((char *) oldPtr,	\
 			(unsigned int) (allocated * sizeof(Tcl_Token))); \
 	    }								\
 	    (available) = allocated;					\
@@ -4690,7 +4690,7 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
 
 #define TclCleanupCommandMacro(cmdPtr) \
     if ((cmdPtr)->refCount-- <= 1) { \
-	ckfree(cmdPtr);\
+	Tcl_Free(cmdPtr);\
     }
 
 /*
@@ -4847,8 +4847,8 @@ typedef struct NRE_callback {
 #define TCLNR_FREE(interp, ptr)  TclSmallFreeEx((interp), (ptr))
 #else
 #define TCLNR_ALLOC(interp, ptr) \
-    (ptr = (ckalloc(sizeof(NRE_callback))))
-#define TCLNR_FREE(interp, ptr)  ckfree(ptr)
+    (ptr = (Tcl_Alloc(sizeof(NRE_callback))))
+#define TCLNR_FREE(interp, ptr)  Tcl_Free(ptr)
 #endif
 
 #if NRE_ENABLE_ASSERTS
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 9c9f0e6..ed50e85 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -210,10 +210,7 @@ EXTERN void *		TclpRealloc(void *ptr, size_t size);
 /* Slot 85 is reserved */
 /* Slot 86 is reserved */
 /* Slot 87 is reserved */
-/* 88 */
-EXTERN char *		TclPrecTraceProc(ClientData clientData,
-				Tcl_Interp *interp, const char *name1,
-				const char *name2, int flags);
+/* Slot 88 is reserved */
 /* 89 */
 EXTERN int		TclPreventAliasLoop(Tcl_Interp *interp,
 				Tcl_Interp *cmdInterp, Tcl_Command cmd);
@@ -677,7 +674,7 @@ typedef struct TclIntStubs {
     void (*reserved85)(void);
     void (*reserved86)(void);
     void (*reserved87)(void);
-    char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags); /* 88 */
+    void (*reserved88)(void);
     int (*tclPreventAliasLoop) (Tcl_Interp *interp, Tcl_Interp *cmdInterp, Tcl_Command cmd); /* 89 */
     void (*reserved90)(void);
     void (*tclProcCleanupProc) (Proc *procPtr); /* 91 */
@@ -991,8 +988,7 @@ extern const TclIntStubs *tclIntStubsPtr;
 /* Slot 85 is reserved */
 /* Slot 86 is reserved */
 /* Slot 87 is reserved */
-#define TclPrecTraceProc \
-	(tclIntStubsPtr->tclPrecTraceProc) /* 88 */
+/* Slot 88 is reserved */
 #define TclPreventAliasLoop \
 	(tclIntStubsPtr->tclPreventAliasLoop) /* 89 */
 /* Slot 90 is reserved */
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 6da74f9..ff336e6 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -114,8 +114,7 @@ EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
 /* Slot 7 is reserved */
 /* 8 */
 EXTERN int		TclpGetPid(Tcl_Pid pid);
-/* 9 */
-EXTERN int		TclWinGetPlatformId(void);
+/* Slot 9 is reserved */
 /* Slot 10 is reserved */
 /* 11 */
 EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
@@ -282,7 +281,7 @@ typedef struct TclIntPlatStubs {
     void (*reserved6)(void);
     void (*reserved7)(void);
     int (*tclpGetPid) (Tcl_Pid pid); /* 8 */
-    int (*tclWinGetPlatformId) (void); /* 9 */
+    void (*reserved9)(void);
     void (*reserved10)(void);
     void (*tclGetAndDetachPids) (Tcl_Interp *interp, Tcl_Channel chan); /* 11 */
     int (*tclpCloseFile) (TclFile file); /* 12 */
@@ -411,8 +410,7 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 /* Slot 7 is reserved */
 #define TclpGetPid \
 	(tclIntPlatStubsPtr->tclpGetPid) /* 8 */
-#define TclWinGetPlatformId \
-	(tclIntPlatStubsPtr->tclWinGetPlatformId) /* 9 */
+/* Slot 9 is reserved */
 /* Slot 10 is reserved */
 #define TclGetAndDetachPids \
 	(tclIntPlatStubsPtr->tclGetAndDetachPids) /* 11 */
@@ -508,6 +506,7 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
+#define TclWinGetPlatformId() (2) /* VER_PLATFORM_WIN32_NT */
 #define TclWinConvertWSAError TclWinConvertError
 
 #if !defined(_WIN32)
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 9f18837..25e775c 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -984,11 +984,7 @@ Tcl_ListObjReplace(
 		if (listRepPtr == NULL) {
 		    for (i = 0;  i < objc;  i++) {
 			/* See bug 3598580 */
-#if TCL_MAJOR_VERSION > 8
 			Tcl_DecrRefCount(objv[i]);
-#else
-			objv[i]->refCount--;
-#endif
 		    }
 		    return TCL_ERROR;
 		}
diff --git a/generic/tclOO.c b/generic/tclOO.c
index e9b673b..0160f99 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -656,6 +656,9 @@ AllocObject(
     if (!nameStr) {
 	nameStr = oPtr->namespacePtr->name;
 	nsPtr = (Namespace *)oPtr->namespacePtr;
+	if (nsPtr->parentPtr != NULL) {
+	    nsPtr = nsPtr->parentPtr;
+	}
     }
     oPtr->command = TclCreateObjCommandInNs(interp, nameStr,
 	(Tcl_Namespace *)nsPtr, PublicObjectCmd, oPtr, NULL);
diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index 0d6ebe4..bfae623 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -586,7 +586,7 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
     do { \
 	register unsigned len = sizeof(type) * ((target).num=(source).num);\
 	if (len != 0) { \
-	    memcpy(((target).list=(type*)ckalloc(len)), (source).list, len); \
+	    memcpy(((target).list=(type*)Tcl_Alloc(len)), (source).list, len); \
 	} else { \
 	    (target).list = NULL; \
 	} \
@@ -599,7 +599,7 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
 #define AddRef(ptr) ((ptr)->refCount++)
 #define DelRef(ptr) do {			\
 	if ((ptr)->refCount-- <= 1) {		\
-	    ckfree(ptr);			\
+	    Tcl_Free(ptr);			\
 	}					\
     } while(0)
 
diff --git a/generic/tclObj.c b/generic/tclObj.c
index a288d69..a97f48c 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2349,8 +2349,7 @@ SetDoubleFromAny(
  * UpdateStringOfDouble --
  *
  *	Update the string representation for a double-precision floating point
- *	object. This must obey the current tcl_precision value for
- *	double-to-string conversions. Note: This function does not free an
+ *	object. Note: This function does not free an
  *	existing old string rep so storage will be lost if this has not
  *	already been done.
  *
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index d2364ac..56c2c11 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -1809,7 +1809,6 @@ Tcl_FSGetNormalizedPath(
 	 */
 
 	(void) TclGetStringFromObj(dir, &cwdLen);
-	cwdLen += (Tcl_GetString(copy)[cwdLen] == '/');
 
 	/* Normalize the combined string. */
 
@@ -1831,12 +1830,12 @@ Tcl_FSGetNormalizedPath(
 	     * normalized head, we can more efficiently normalize the combined
 	     * path by passing over only the unnormalized tail portion. When
 	     * this is sufficient, prior developers claim this should be much
-	     * faster. We use 'cwdLen-1' so that we are already pointing at
+	     * faster. We use 'cwdLen' so that we are already pointing at
 	     * the dir-separator that we know about. The normalization code
 	     * will actually start off directly after that separator.
 	     */
 
-	    TclFSNormalizeToUniquePath(interp, copy, cwdLen-1);
+	    TclFSNormalizeToUniquePath(interp, copy, cwdLen);
 	}
 
 	/* Now we need to construct the new path object. */
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 3db3a1e..20d0db9 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -503,6 +503,8 @@ PkgRequireCore(
 		     * The version of the package sought is better than the
 		     * currently selected version.
 		     */
+		    ckfree(bestVersion);
+		    bestVersion = NULL;
 		    goto newbest;
 		}
 	    } else {
@@ -531,6 +533,8 @@ PkgRequireCore(
 		     * This stable version of the package sought is better
 		     * than the currently selected stable version.
 		     */
+		    ckfree(bestStableVersion);
+		    bestStableVersion = NULL;
 		    goto newstable;
 		}
 	    } else {
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 6502733..a26c361 100755
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -3996,8 +3996,8 @@ StrictBignumConversion(
  * This function is a service routine that produces the string of digits for
  * floating-point-to-decimal conversion. It can do a number of things
  * according to the 'flags' argument. Valid values for 'flags' include:
- *	TCL_DD_SHORTEST - This is the default for floating point conversion if
- *		::tcl_precision is 0. It constructs the shortest string of
+ *	TCL_DD_SHORTEST - This is the default for floating point conversion.
+ *		It constructs the shortest string of
  *		digits that will reconvert to the given number when scanned.
  *		For floating point numbers that are exactly between two
  *		decimal numbers, it resolves using the 'round to even' rule.
@@ -4012,8 +4012,7 @@ StrictBignumConversion(
  *		subsequent input conversion is 'round up' or 'round down'
  *		rather than 'round to nearest', but is surprising otherwise.
  *	TCL_DD_E_FORMAT - This value is used to prepare numbers for %e format
- *		conversion (or for default floating->string if tcl_precision
- *		is not 0). It constructs a string of at most 'ndigits' digits,
+ *		conversion. It constructs a string of at most 'ndigits' digits,
  *		choosing the one that is closest to the given number (and
  *		resolving ties with 'round to even').  It is allowed to return
  *		fewer than 'ndigits' if the number converts exactly; if the
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 269131a..3e6f179 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -421,13 +421,14 @@ Tcl_GetCharLength(
      * Optimize the case where we're really dealing with a bytearray object;
      * we don't need to convert to a string to perform the get-length operation.
      *
-     * NOTE that we do not need the bytearray to be "pure".  A ByteArray value
-     * with a string rep cannot be trusted to represent the same value as the
-     * string rep, but it *can* be trusted to have the same character length
-     * as the string rep, which is all this routine cares about.
+     * Starting in Tcl 8.7, we check for a "pure" bytearray, because the
+     * machinery behind that test is using a proper bytearray ObjType.  We
+     * could also compute length of an improper bytearray without shimmering
+     * but there's no value in that. We *want* to shimmer an improper bytearray
+     * because improper bytearrays have worthless internal reps.
      */
 
-    if (objPtr->typePtr == &tclByteArrayType) {
+    if (TclIsPureByteArray(objPtr)) {
 	int length;
 
 	(void) Tcl_GetByteArrayFromObj(objPtr, &length);
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index 0ee1a14..0ab8829 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -76,13 +76,13 @@ typedef struct {
 	}								\
     } while (0)
 #define stringAttemptAlloc(numChars) \
-    (String *) attemptckalloc(STRING_SIZE(numChars))
+    (String *) Tcl_AttemptAlloc(STRING_SIZE(numChars))
 #define stringAlloc(numChars) \
-    (String *) ckalloc(STRING_SIZE(numChars))
+    (String *) Tcl_Alloc(STRING_SIZE(numChars))
 #define stringRealloc(ptr, numChars) \
-    (String *) ckrealloc((ptr), STRING_SIZE(numChars))
+    (String *) Tcl_Realloc((ptr), STRING_SIZE(numChars))
 #define stringAttemptRealloc(ptr, numChars) \
-    (String *) attemptckrealloc((ptr), STRING_SIZE(numChars))
+    (String *) Tcl_AttemptRealloc((ptr), STRING_SIZE(numChars))
 #define GET_STRING(objPtr) \
     ((String *) (objPtr)->internalRep.twoPtrValue.ptr1)
 #define SET_STRING(objPtr, stringPtr) \
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 04ee066..5168110 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -43,16 +43,6 @@
 #undef TclSockMinimumBuffers
 #undef Tcl_SetIntObj
 
-#if defined(TCL_NO_DEPRECATED)
-#   define TclBNInitBignumFromWideUInt 0
-#   define TclBNInitBignumFromWideInt 0
-#   define TclBNInitBignumFromLong 0
-#else
-#   define TclBNInitBignumFromWideUInt TclInitBignumFromWideUInt
-#   define TclBNInitBignumFromWideInt TclInitBignumFromWideInt
-#   define TclBNInitBignumFromLong TclInitBignumFromLong
-#endif /* TCL_NO_DEPRECATED */
-
 #ifdef _WIN32
 #   define TclUnixWaitForFile 0
 #   define TclUnixCopyFile 0
@@ -72,15 +62,6 @@ TclpIsAtty(int fd)
     return isatty(fd);
 }
 
-#define TclWinGetPlatformId winGetPlatformId
-static int
-TclWinGetPlatformId()
-{
-    /* Don't bother to determine the real platform on cygwin,
-     * because VER_PLATFORM_WIN32_NT is the only supported platform */
-    return 2; /* VER_PLATFORM_WIN32_NT */;
-}
-
 void *TclWinGetTclInstance()
 {
     void *hInstance = NULL;
@@ -226,7 +207,7 @@ static int formatInt(char *buffer, int n){
 
 #endif /* __CYGWIN__ */
 
-#ifdef TCL_NO_DEPRECATED
+#if defined(TCL_NO_DEPRECATED)
 #   undef Tcl_SetBooleanObj
 #   define Tcl_SetBooleanObj 0
 #   undef Tcl_PkgPresent
@@ -376,7 +357,7 @@ static const TclIntStubs tclIntStubs = {
     0, /* 85 */
     0, /* 86 */
     0, /* 87 */
-    TclPrecTraceProc, /* 88 */
+    0, /* 88 */
     TclPreventAliasLoop, /* 89 */
     0, /* 90 */
     TclProcCleanupProc, /* 91 */
@@ -593,7 +574,7 @@ static const TclIntPlatStubs tclIntPlatStubs = {
     0, /* 6 */
     0, /* 7 */
     TclpGetPid, /* 8 */
-    TclWinGetPlatformId, /* 9 */
+    0, /* 9 */
     0, /* 10 */
     TclGetAndDetachPids, /* 11 */
     TclpCloseFile, /* 12 */
@@ -731,9 +712,9 @@ const TclTomMathStubs tclTomMathStubs = {
     TclBN_mp_init_set_int, /* 61 */
     TclBN_mp_set_int, /* 62 */
     TclBN_mp_cnt_lsb, /* 63 */
-    TclBNInitBignumFromLong, /* 64 */
-    TclBNInitBignumFromWideInt, /* 65 */
-    TclBNInitBignumFromWideUInt, /* 66 */
+    0, /* 64 */
+    0, /* 65 */
+    0, /* 66 */
     TclBN_mp_expt_d_ex, /* 67 */
     TclBN_mp_set_long_long, /* 68 */
     TclBN_mp_get_long_long, /* 69 */
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index 10df919..f6c1de1 100644
--- a/generic/tclTomMath.decls
+++ b/generic/tclTomMath.decls
@@ -223,15 +223,18 @@ declare 63 {
 
 # Formerly internal API to allow initialisation of bignums without knowing the
 # typedefs of how a bignum works internally.
-declare 64 {deprecated {Use mp_init() + mp_set_long_long()}} {
-    void TclBNInitBignumFromLong(mp_int *bignum, long initVal)
-}
-declare 65 {deprecated {Use mp_init() + mp_set_long_long()}} {
-    void TclBNInitBignumFromWideInt(mp_int *bignum, Tcl_WideInt initVal)
-}
-declare 66 {deprecated {Use mp_init() + mp_set_long_long()}} {
-    void TclBNInitBignumFromWideUInt(mp_int *bignum, Tcl_WideUInt initVal)
-}
+# Removed in 9.0
+#declare 64 {
+#    void TclBNInitBignumFromLong(mp_int *bignum, long initVal)
+#}
+# Removed in 9.0
+#declare 65 {
+#    void TclBNInitBignumFromWideInt(mp_int *bignum, Tcl_WideInt initVal)
+#}
+# Removed in 9.0
+#declare 66 {
+#    void TclBNInitBignumFromWideUInt(mp_int *bignum, Tcl_WideUInt initVal)
+#}
 
 # Added in libtommath 1.0
 declare 67 {
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index f3145d7..2827ab2 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -31,11 +31,11 @@
 /* Define custom memory allocation for libtommath */
 
 /* MODULE_SCOPE void* TclBNAlloc( size_t ); */
-#define TclBNAlloc(s) ((void*)ckalloc((size_t)(s)))
+#define TclBNAlloc(s) ((void*)Tcl_Alloc((size_t)(s)))
 /* MODULE_SCOPE void* TclBNRealloc( void*, size_t ); */
-#define TclBNRealloc(x,s) ((void*)ckrealloc((char*)(x),(size_t)(s)))
+#define TclBNRealloc(x,s) ((void*)Tcl_Realloc((char*)(x),(size_t)(s)))
 /* MODULE_SCOPE void  TclBNFree( void* ); */
-#define TclBNFree(x) (ckfree((char*)(x)))
+#define TclBNFree(x) (Tcl_Free((char*)(x)))
 /* MODULE_SCOPE void* TclBNCalloc( size_t, size_t ); */
 /* unused - no macro */
 
@@ -302,17 +302,9 @@ EXTERN int		TclBN_mp_init_set_int(mp_int *a, unsigned long i);
 EXTERN int		TclBN_mp_set_int(mp_int *a, unsigned long i);
 /* 63 */
 EXTERN int		TclBN_mp_cnt_lsb(const mp_int *a);
-/* 64 */
-TCL_DEPRECATED("Use mp_init() + mp_set_long_long()")
-void			TclBNInitBignumFromLong(mp_int *bignum, long initVal);
-/* 65 */
-TCL_DEPRECATED("Use mp_init() + mp_set_long_long()")
-void			TclBNInitBignumFromWideInt(mp_int *bignum,
-				Tcl_WideInt initVal);
-/* 66 */
-TCL_DEPRECATED("Use mp_init() + mp_set_long_long()")
-void			TclBNInitBignumFromWideUInt(mp_int *bignum,
-				Tcl_WideUInt initVal);
+/* Slot 64 is reserved */
+/* Slot 65 is reserved */
+/* Slot 66 is reserved */
 /* 67 */
 EXTERN int		TclBN_mp_expt_d_ex(const mp_int *a, mp_digit b,
 				mp_int *c, int fast);
@@ -393,9 +385,9 @@ typedef struct TclTomMathStubs {
     int (*tclBN_mp_init_set_int) (mp_int *a, unsigned long i); /* 61 */
     int (*tclBN_mp_set_int) (mp_int *a, unsigned long i); /* 62 */
     int (*tclBN_mp_cnt_lsb) (const mp_int *a); /* 63 */
-    TCL_DEPRECATED_API("Use mp_init() + mp_set_long_long()") void (*tclBNInitBignumFromLong) (mp_int *bignum, long initVal); /* 64 */
-    TCL_DEPRECATED_API("Use mp_init() + mp_set_long_long()") void (*tclBNInitBignumFromWideInt) (mp_int *bignum, Tcl_WideInt initVal); /* 65 */
-    TCL_DEPRECATED_API("Use mp_init() + mp_set_long_long()") void (*tclBNInitBignumFromWideUInt) (mp_int *bignum, Tcl_WideUInt initVal); /* 66 */
+    void (*reserved64)(void);
+    void (*reserved65)(void);
+    void (*reserved66)(void);
     int (*tclBN_mp_expt_d_ex) (const mp_int *a, mp_digit b, mp_int *c, int fast); /* 67 */
     int (*tclBN_mp_set_long_long) (mp_int *a, Tcl_WideUInt i); /* 68 */
     Tcl_WideUInt (*tclBN_mp_get_long_long) (const mp_int *a); /* 69 */
@@ -543,12 +535,9 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 	(tclTomMathStubsPtr->tclBN_mp_set_int) /* 62 */
 #define TclBN_mp_cnt_lsb \
 	(tclTomMathStubsPtr->tclBN_mp_cnt_lsb) /* 63 */
-#define TclBNInitBignumFromLong \
-	(tclTomMathStubsPtr->tclBNInitBignumFromLong) /* 64 */
-#define TclBNInitBignumFromWideInt \
-	(tclTomMathStubsPtr->tclBNInitBignumFromWideInt) /* 65 */
-#define TclBNInitBignumFromWideUInt \
-	(tclTomMathStubsPtr->tclBNInitBignumFromWideUInt) /* 66 */
+/* Slot 64 is reserved */
+/* Slot 65 is reserved */
+/* Slot 66 is reserved */
 #define TclBN_mp_expt_d_ex \
 	(tclTomMathStubsPtr->tclBN_mp_expt_d_ex) /* 67 */
 #define TclBN_mp_set_long_long \
diff --git a/generic/tclTomMathInterface.c b/generic/tclTomMathInterface.c
index 9e7bf4b..8a3d532 100644
--- a/generic/tclTomMathInterface.c
+++ b/generic/tclTomMathInterface.c
@@ -125,7 +125,7 @@ TclInitBignumFromLong(
 /*
  *----------------------------------------------------------------------
  *
- * TclBNInitBignumFromWideInt --
+ * TclInitBignumFromWideInt --
  *
  *	Allocate and initialize a 'bignum' from a Tcl_WideInt
  *
@@ -157,7 +157,7 @@ TclInitBignumFromWideInt(
 /*
  *----------------------------------------------------------------------
  *
- * TclBNInitBignumFromWideUInt --
+ * TclInitBignumFromWideUInt --
  *
  *	Allocate and initialize a 'bignum' from a Tcl_WideUInt
  *
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 9b7a140..0bc27fd 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -94,13 +94,6 @@ static ProcessGlobalValue executableName = {
 #define CONVERT_ANY	16
 
 /*
- * The following key is used by Tcl_PrintDouble and TclPrecTraceProc to
- * access the precision to be used for double formatting.
- */
-
-static Tcl_ThreadDataKey precisionKey;
-
-/*
  * Prototypes for functions defined later in this file.
  */
 
@@ -2998,10 +2991,9 @@ Tcl_DStringEndSublist(
  *	string using.
  *
  * Results:
- *	The ASCII equivalent of "value" is written at "dst". It is written
- *	using the current precision, and it is guaranteed to contain a decimal
- *	point or exponent, so that it looks like a floating-point value and
- *	not an integer.
+ *	The ASCII equivalent of "value" is written at "dst". It is guaranteed
+ *	to contain a decimal point or exponent, so that it looks like a
+ *	floating-point value and not an integer.
  *
  * Side effects:
  *	None.
@@ -3011,9 +3003,7 @@ Tcl_DStringEndSublist(
 
 void
 Tcl_PrintDouble(
-    Tcl_Interp *interp,		/* Interpreter whose tcl_precision variable
-				 * used to be used to control printing. It's
-				 * ignored now. */
+    Tcl_Interp *interp,		/* Not used */
     double value,		/* Value to print as string. */
     char *dst)			/* Where to store converted value; must have
 				 * at least TCL_DOUBLE_SPACE characters. */
@@ -3023,7 +3013,6 @@ Tcl_PrintDouble(
     int signum;
     char *digits;
     char *end;
-    int *precisionPtr = Tcl_GetThreadData(&precisionKey, sizeof(int));
 
     /*
      * Handle NaN.
@@ -3055,53 +3044,8 @@ Tcl_PrintDouble(
      * Ordinary (normal and denormal) values.
      */
 
-    if (*precisionPtr == 0) {
-	digits = TclDoubleDigits(value, -1, TCL_DD_SHORTEST,
-		&exponent, &signum, &end);
-    } else {
-	/*
-	 * There are at least two possible interpretations for tcl_precision.
-	 *
-	 * The first is, "choose the decimal representation having
-	 * $tcl_precision digits of significance that is nearest to the given
-	 * number, breaking ties by rounding to even, and then trimming
-	 * trailing zeros." This gives the greatest possible precision in the
-	 * decimal string, but offers the anomaly that [expr 0.1] will be
-	 * "0.10000000000000001".
-	 *
-	 * The second is "choose the decimal representation having at most
-	 * $tcl_precision digits of significance that is nearest to the given
-	 * number. If no such representation converts exactly to the given
-	 * number, choose the one that is closest, breaking ties by rounding
-	 * to even. If more than one such representation converts exactly to
-	 * the given number, choose the shortest, breaking ties in favour of
-	 * the nearest, breaking remaining ties in favour of the one ending in
-	 * an even digit."
-	 *
-	 * Tcl 8.4 implements the first of these, which gives rise to
-	 * anomalies in formatting:
-	 *
-	 *	% expr 0.1
-	 *	0.10000000000000001
-	 *	% expr 0.01
-	 *	0.01
-	 *	% expr 1e-7
-	 *	9.9999999999999995e-08
-	 *
-	 * For human readability, it appears better to choose the second rule,
-	 * and let [expr 0.1] return 0.1. But for 8.4 compatibility, we prefer
-	 * the first (the recommended zero value for tcl_precision avoids the
-	 * problem entirely).
-	 *
-	 * Uncomment TCL_DD_SHORTEN_FLAG in the next call to prefer the method
-	 * that allows floating point values to be shortened if it can be done
-	 * without loss of precision.
-	 */
-
-	digits = TclDoubleDigits(value, *precisionPtr,
-		TCL_DD_E_FORMAT /* | TCL_DD_SHORTEN_FLAG */,
-		&exponent, &signum, &end);
-    }
+    digits = TclDoubleDigits(value, -1, TCL_DD_SHORTEST,
+	    &exponent, &signum, &end);
     if (signum) {
 	*dst++ = '-';
     }
@@ -3121,16 +3065,7 @@ Tcl_PrintDouble(
 	    }
 	}
 
-	/*
-	 * Tcl 8.4 appears to format with at least a two-digit exponent;
-	 * preserve that behaviour when tcl_precision != 0
-	 */
-
-	if (*precisionPtr == 0) {
-	    sprintf(dst, "e%+d", exponent);
-	} else {
-	    sprintf(dst, "e%+03d", exponent);
-	}
+	sprintf(dst, "e%+d", exponent);
     } else {
 	/*
 	 * F format for others.
@@ -3168,84 +3103,6 @@ Tcl_PrintDouble(
 /*
  *----------------------------------------------------------------------
  *
- * TclPrecTraceProc --
- *
- *	This function is invoked whenever the variable "tcl_precision" is
- *	written.
- *
- * Results:
- *	Returns NULL if all went well, or an error message if the new value
- *	for the variable doesn't make sense.
- *
- * Side effects:
- *	If the new value doesn't make sense then this function undoes the
- *	effect of the variable modification. Otherwise it modifies the format
- *	string that's used by Tcl_PrintDouble.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-char *
-TclPrecTraceProc(
-    ClientData clientData,	/* Not used. */
-    Tcl_Interp *interp,		/* Interpreter containing variable. */
-    const char *name1,		/* Name of variable. */
-    const char *name2,		/* Second part of variable name. */
-    int flags)			/* Information about what happened. */
-{
-    Tcl_Obj *value;
-    int prec;
-    int *precisionPtr = Tcl_GetThreadData(&precisionKey, sizeof(int));
-
-    /*
-     * If the variable is unset, then recreate the trace.
-     */
-
-    if (flags & TCL_TRACE_UNSETS) {
-	if ((flags & TCL_TRACE_DESTROYED) && !Tcl_InterpDeleted(interp)) {
-	    Tcl_TraceVar2(interp, name1, name2,
-		    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES
-		    |TCL_TRACE_UNSETS, TclPrecTraceProc, clientData);
-	}
-	return NULL;
-    }
-
-    /*
-     * When the variable is read, reset its value from our shared value. This
-     * is needed in case the variable was modified in some other interpreter
-     * so that this interpreter's value is out of date.
-     */
-
-
-    if (flags & TCL_TRACE_READS) {
-	Tcl_SetVar2Ex(interp, name1, name2, Tcl_NewLongObj(*precisionPtr),
-		flags & TCL_GLOBAL_ONLY);
-	return NULL;
-    }
-
-    /*
-     * The variable is being written. Check the new value and disallow it if
-     * it isn't reasonable or if this is a safe interpreter (we don't want
-     * safe interpreters messing up the precision of other interpreters).
-     */
-
-    if (Tcl_IsSafe(interp)) {
-	return (char *) "can't modify precision from a safe interpreter";
-    }
-    value = Tcl_GetVar2Ex(interp, name1, name2, flags & TCL_GLOBAL_ONLY);
-    if (value == NULL
-	    || Tcl_GetIntFromObj(NULL, value, &prec) != TCL_OK
-	    || prec < 0 || prec > TCL_MAX_PREC) {
-	return (char *) "improper value for precision";
-    }
-    *precisionPtr = prec;
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TclNeedSpace --
  *
  *	This function checks to see whether it is appropriate to add a space
diff --git a/tests/basic.test b/tests/basic.test
index 7819241..a11ffdf 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -893,10 +893,7 @@ test basic-48.16.$noComp {expansion: testing for leaks} -setup {
 	rename stress {}
 } -result 0
 
-test basic-48.17.$noComp {expansion: object safety} -setup {
-        set old_precision $::tcl_precision
-        set ::tcl_precision 4
-    } -constraints $constraints -body {
+test basic-48.17.$noComp {expansion: object safety} -constraints $constraints -body {
             set third [expr {1.0/3.0}]
             set l [list $third $third]
             set x [run {list $third {*}$l $third}]
@@ -906,8 +903,7 @@ test basic-48.17.$noComp {expansion: object safety} -setup {
             }
             set res
     } -cleanup {
-        set ::tcl_precision $old_precision
-        unset old_precision res t l x third
+        unset res t l x third
 } -result {1.0 1.0 1.0 1.0}
 
 test basic-48.18.$noComp {expansion: list semantics} -constraints $constraints -body {
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 4c90376..0dd0bdb 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -377,6 +377,22 @@ test filesystem-1.52.1 {bug f9f390d0fa: file join where strep is not canonical}
     file normalize $x
     file join $x
 } -result /foo
+test filesystem-1.53 {[Bug 3559678] - normalize when tail is empty} {
+  string match */ [file normalize [lindex [glob -dir [pwd] {{}}] 0]]
+} 0
+test filesystem-1.54 {[Bug ce3a211dcb] - normalize when tail is empty} -setup {
+    set save [pwd]
+    cd [set home [makeDirectory ce3a211dcb]]
+    makeDirectory A $home
+    cd [lindex [glob */] 0]
+} -body {
+    string match */A [pwd]
+} -cleanup {
+    cd $home
+    removeDirectory A $home
+    cd $save
+    removeDirectory ce3a211dcb
+} -result 1
 
 test filesystem-2.0 {new native path} {unix} {
    foreach f [lsort [glob -nocomplain /usr/bin/c*]] {
diff --git a/tests/namespace.test b/tests/namespace.test
index 8847ab3..ed1eed6 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -1820,14 +1820,29 @@ test namespace-42.9 {
     deallocated List struct.
 } -setup {
     namespace eval n {namespace ensemble create}
-    dict set list one ::two
-    namespace ensemble configure n -subcommands $list -map $list
+    set lst [dict create one ::two]
+    namespace ensemble configure n -subcommands $lst -map $lst
 } -body {
     n one
 } -cleanup {
     namespace delete n
+    unset -nocomplain lst
 } -returnCodes error -match glob -result {invalid command name*}
 
+test namespace-42.10 {
+    ensembles: [Bug 4f6a1ebd64] segmentation fault due to pointer to a
+    deallocated List struct (this time with duplicate of one in "dict").
+} -setup {
+    namespace eval n {namespace ensemble create}
+    set lst [list one ::two one ::three]
+    namespace ensemble configure n -subcommands $lst -map $lst
+} -body {
+    n one
+} -cleanup {
+    namespace delete n
+    unset -nocomplain lst
+} -returnCodes error -match glob -result {invalid command name *three*}
+
 test namespace-43.1 {ensembles: dict-driven} {
     namespace eval ns {
 	namespace export x*
diff --git a/tests/oo.test b/tests/oo.test
index b9c5067..a8257fd 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -131,6 +131,10 @@ test oo-1.4 {basic test of OO functionality} -body {
 test oo-1.4.1 {fully-qualified nested name} -body {
     oo::object create ::one::two::three
 } -result {::one::two::three}
+test oo-1.4.2 {automatic command name has same name as namespace} -body {
+    set obj [oo::object new]
+    expr {[info object namespace $obj] == $obj}
+} -result 1
 test oo-1.5 {basic test of OO functionality} -body {
     oo::object doesnotexist
 } -returnCodes 1 -result {unknown method "doesnotexist": must be create, destroy or new}
diff --git a/tests/scan.test b/tests/scan.test
index b36b412..98c581b 100644
--- a/tests/scan.test
+++ b/tests/scan.test
@@ -553,7 +553,7 @@ test scan-5.18 {bigint scanning underflow} -setup {
     list [scan "-207698809136909011942886895" \
 	    %llu a] $a
 } -returnCodes 1 -result {unsigned bignum scans are invalid}
-test scan-5.18 {bigint scanning invalid} -setup {
+test scan-5.19 {bigint scanning invalid} -setup {
     set a {};
 } -body {
     list [scan "207698809136909011942886895" \
diff --git a/tests/utf.test b/tests/utf.test
index d0fa7be..95775a8 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -124,7 +124,7 @@ test utf-4.10 {Tcl_NumUtfChars: #u0000, calc len, overcomplete} {testnumutfchars
 test utf-5.1 {Tcl_UtfFindFirst} {testfindfirst testbytestring} {
     testfindfirst [testbytestring "abcbc"] 98
 } {bcbc}
-test utf-5.1 {Tcl_UtfFindLast} {testfindlast testbytestring} {
+test utf-5.2 {Tcl_UtfFindLast} {testfindlast testbytestring} {
     testfindlast [testbytestring "abcbc"] 98
 } {bc}
 
diff --git a/tests/util.test b/tests/util.test
index 35fc642..9d4c57e 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -385,38 +385,6 @@ test util-5.51 {Tcl_StringMatch} {
     Wrapper_Tcl_StringMatch "" ""
 } 1
 
-test util-6.1 {Tcl_PrintDouble - using tcl_precision} -setup {
-    set old_precision $::tcl_precision
-    set ::tcl_precision 12
-} -body {
-    concat x[expr 1.4]
-} -cleanup {
-    set ::tcl_precision $old_precision
-} -result {x1.4}
-test util-6.2 {Tcl_PrintDouble - using tcl_precision} -setup {
-    set old_precision $::tcl_precision
-    set ::tcl_precision 12
-} -body {
-    concat x[expr 1.39999999999]
-} -cleanup {
-    set ::tcl_precision $old_precision
-} -result {x1.39999999999}
-test util-6.3 {Tcl_PrintDouble - using tcl_precision} -setup {
-    set old_precision $::tcl_precision
-    set ::tcl_precision 12
-} -body {
-    concat x[expr 1.399999999999]
-} -cleanup {
-    set ::tcl_precision $old_precision
-} -result {x1.4}
-test util-6.4 {Tcl_PrintDouble - using tcl_precision} -setup {
-    set old_precision $::tcl_precision
-    set ::tcl_precision 5
-} -body {
-    concat x[expr 1.123412341234]
-} -cleanup {
-    set tcl_precision $old_precision
-} -result {x1.1234}
 test util-6.5 {Tcl_PrintDouble - make sure there's a decimal point} {
     concat x[expr 2.0]
 } {x2.0}
@@ -424,50 +392,6 @@ test util-6.6 {Tcl_PrintDouble - make sure there's a decimal point} {
     concat x[expr 3.0e98]
 } {x3e+98}
 
-test util-7.1 {TclPrecTraceProc - unset callbacks} -setup {
-    set old_precision $::tcl_precision
-} -body {
-    set tcl_precision 7
-    set x $tcl_precision
-    unset tcl_precision
-    list $x $tcl_precision
-} -cleanup {
-    set ::tcl_precision $old_precision
-} -result {7 7}
-test util-7.2 {TclPrecTraceProc - read traces, sharing among interpreters}  -setup {
-    set old_precision $::tcl_precision
-} -body {
-    set tcl_precision 12
-    interp create child
-    set x [child eval set tcl_precision]
-    child eval {set tcl_precision 6}
-    interp delete child
-    list $x $tcl_precision
-} -cleanup {
-    set ::tcl_precision $old_precision
-} -result {12 6}
-test util-7.3 {TclPrecTraceProc - write traces, safe interpreters} -setup {
-    set old_precision $::tcl_precision
-} -body {
-    set tcl_precision 12
-    interp create -safe child
-    set x [child eval {
-	list [catch {set tcl_precision 8} msg] $msg
-    }]
-    interp delete child
-    list $x $tcl_precision
-} -cleanup {
-    set ::tcl_precision $old_precision
-} -result {{1 {can't set "tcl_precision": can't modify precision from a safe interpreter}} 12}
-test util-7.4 {TclPrecTraceProc - write traces, bogus values} -setup {
-    set old_precision $::tcl_precision
-} -body {
-    set tcl_precision 12
-    list [catch {set tcl_precision abc} msg] $msg $tcl_precision
-} -cleanup {
-    set ::tcl_precision $old_precision
-} -result {1 {can't set "tcl_precision": improper value for precision} 12}
-
 # This test always succeeded in the C locale anyway...
 test util-8.1 {TclNeedSpace - correct UTF8 handling} {
     # Bug 411825
@@ -2138,1875 +2062,6 @@ test util-15.8 {smallest normal} {*}{
     }
 }
 
-set saved_precision $::tcl_precision
-foreach ::tcl_precision {0 12} {
-    for {set e -312} {$e < -9} {incr e} {
-	test util-16.1.$::tcl_precision.$e {shortening of numbers} \
-	    "expr 1.1e$e" 1.1e$e
-    }
-}
-set tcl_precision 0
-for {set e -9} {$e < -4} {incr e} {
-    test util-16.1.$::tcl_precision.$e {shortening of numbers} \
-	"expr 1.1e$e" 1.1e$e
-}
-set tcl_precision 12
-for {set e -9} {$e < -4} {incr e} {
-    test util-16.1.$::tcl_precision.$e {8.4 compatible formatting of doubles} \
-	"expr 1.1e$e" 1.1e[format %+03d $e]
-}
-foreach ::tcl_precision {0 12} {
-    test util-16.1.$::tcl_precision.-4 {shortening of numbers} \
-	{expr 1.1e-4} \
-	0.00011
-    test util-16.1.$::tcl_precision.-3 {shortening of numbers} \
-	{expr 1.1e-3} \
-	0.0011
-    test util-16.1.$::tcl_precision.-2 {shortening of numbers} \
-	{expr 1.1e-2} \
-	0.011
-    test util-16.1.$::tcl_precision.-1 {shortening of numbers} \
-	{expr 1.1e-1} \
-	0.11
-    test util-16.1.$::tcl_precision.0 {shortening of numbers} \
-	{expr 1.1} \
-	1.1
-    for {set e 1} {$e < 17} {incr e} {
-	test util-16.1.$::tcl_precision.$e {shortening of numbers} \
-	    "expr 11[string repeat 0 [expr {$e-1}]].0" \
-	    11[string repeat 0 [expr {$e-1}]].0
-    }
-    for {set e 17} {$e < 309} {incr e} {
-	test util-16.1.$::tcl_precision.$e {shortening of numbers} \
-	    "expr 1.1e$e" 1.1e+$e
-    }
-}
-set tcl_precision 17
-test util-16.1.17.-300 {8.4 compatible formatting of doubles} \
-    {expr 1e-300} \
-    1e-300
-test util-16.1.17.-299 {8.4 compatible formatting of doubles} \
-    {expr 1e-299} \
-    9.9999999999999999e-300
-test util-16.1.17.-298 {8.4 compatible formatting of doubles} \
-    {expr 1e-298} \
-    9.9999999999999991e-299
-test util-16.1.17.-297 {8.4 compatible formatting of doubles} \
-    {expr 1e-297} \
-    1e-297
-test util-16.1.17.-296 {8.4 compatible formatting of doubles} \
-    {expr 1e-296} \
-    1e-296
-test util-16.1.17.-295 {8.4 compatible formatting of doubles} \
-    {expr 1e-295} \
-    1.0000000000000001e-295
-test util-16.1.17.-294 {8.4 compatible formatting of doubles} \
-    {expr 1e-294} \
-    1e-294
-test util-16.1.17.-293 {8.4 compatible formatting of doubles} \
-    {expr 1e-293} \
-    1.0000000000000001e-293
-test util-16.1.17.-292 {8.4 compatible formatting of doubles} \
-    {expr 1e-292} \
-    1.0000000000000001e-292
-test util-16.1.17.-291 {8.4 compatible formatting of doubles} \
-    {expr 1e-291} \
-    9.9999999999999996e-292
-test util-16.1.17.-290 {8.4 compatible formatting of doubles} \
-    {expr 1e-290} \
-    1.0000000000000001e-290
-test util-16.1.17.-289 {8.4 compatible formatting of doubles} \
-    {expr 1e-289} \
-    1e-289
-test util-16.1.17.-288 {8.4 compatible formatting of doubles} \
-    {expr 1e-288} \
-    1.0000000000000001e-288
-test util-16.1.17.-287 {8.4 compatible formatting of doubles} \
-    {expr 1e-287} \
-    1e-287
-test util-16.1.17.-286 {8.4 compatible formatting of doubles} \
-    {expr 1e-286} \
-    1.0000000000000001e-286
-test util-16.1.17.-285 {8.4 compatible formatting of doubles} \
-    {expr 1e-285} \
-    1.0000000000000001e-285
-test util-16.1.17.-284 {8.4 compatible formatting of doubles} \
-    {expr 1e-284} \
-    1e-284
-test util-16.1.17.-283 {8.4 compatible formatting of doubles} \
-    {expr 1e-283} \
-    9.9999999999999995e-284
-test util-16.1.17.-282 {8.4 compatible formatting of doubles} \
-    {expr 1e-282} \
-    1e-282
-test util-16.1.17.-281 {8.4 compatible formatting of doubles} \
-    {expr 1e-281} \
-    1e-281
-test util-16.1.17.-280 {8.4 compatible formatting of doubles} \
-    {expr 1e-280} \
-    9.9999999999999996e-281
-test util-16.1.17.-279 {8.4 compatible formatting of doubles} \
-    {expr 1e-279} \
-    1.0000000000000001e-279
-test util-16.1.17.-278 {8.4 compatible formatting of doubles} \
-    {expr 1e-278} \
-    9.9999999999999994e-279
-test util-16.1.17.-277 {8.4 compatible formatting of doubles} \
-    {expr 1e-277} \
-    9.9999999999999997e-278
-test util-16.1.17.-276 {8.4 compatible formatting of doubles} \
-    {expr 1e-276} \
-    1.0000000000000001e-276
-test util-16.1.17.-275 {8.4 compatible formatting of doubles} \
-    {expr 1e-275} \
-    9.9999999999999993e-276
-test util-16.1.17.-274 {8.4 compatible formatting of doubles} \
-    {expr 1e-274} \
-    9.9999999999999997e-275
-test util-16.1.17.-273 {8.4 compatible formatting of doubles} \
-    {expr 1e-273} \
-    1.0000000000000001e-273
-test util-16.1.17.-272 {8.4 compatible formatting of doubles} \
-    {expr 1e-272} \
-    9.9999999999999993e-273
-test util-16.1.17.-271 {8.4 compatible formatting of doubles} \
-    {expr 1e-271} \
-    9.9999999999999996e-272
-test util-16.1.17.-270 {8.4 compatible formatting of doubles} \
-    {expr 1e-270} \
-    1e-270
-test util-16.1.17.-269 {8.4 compatible formatting of doubles} \
-    {expr 1e-269} \
-    9.9999999999999996e-270
-test util-16.1.17.-268 {8.4 compatible formatting of doubles} \
-    {expr 1e-268} \
-    9.9999999999999996e-269
-test util-16.1.17.-267 {8.4 compatible formatting of doubles} \
-    {expr 1e-267} \
-    9.9999999999999998e-268
-test util-16.1.17.-266 {8.4 compatible formatting of doubles} \
-    {expr 1e-266} \
-    9.9999999999999998e-267
-test util-16.1.17.-265 {8.4 compatible formatting of doubles} \
-    {expr 1e-265} \
-    9.9999999999999998e-266
-test util-16.1.17.-264 {8.4 compatible formatting of doubles} \
-    {expr 1e-264} \
-    1e-264
-test util-16.1.17.-263 {8.4 compatible formatting of doubles} \
-    {expr 1e-263} \
-    1e-263
-test util-16.1.17.-262 {8.4 compatible formatting of doubles} \
-    {expr 1e-262} \
-    1e-262
-test util-16.1.17.-261 {8.4 compatible formatting of doubles} \
-    {expr 1e-261} \
-    9.9999999999999998e-262
-test util-16.1.17.-260 {8.4 compatible formatting of doubles} \
-    {expr 1e-260} \
-    9.9999999999999996e-261
-test util-16.1.17.-259 {8.4 compatible formatting of doubles} \
-    {expr 1e-259} \
-    1.0000000000000001e-259
-test util-16.1.17.-258 {8.4 compatible formatting of doubles} \
-    {expr 1e-258} \
-    9.9999999999999995e-259
-test util-16.1.17.-257 {8.4 compatible formatting of doubles} \
-    {expr 1e-257} \
-    9.9999999999999998e-258
-test util-16.1.17.-256 {8.4 compatible formatting of doubles} \
-    {expr 1e-256} \
-    9.9999999999999998e-257
-test util-16.1.17.-255 {8.4 compatible formatting of doubles} \
-    {expr 1e-255} \
-    1e-255
-test util-16.1.17.-254 {8.4 compatible formatting of doubles} \
-    {expr 1e-254} \
-    9.9999999999999991e-255
-test util-16.1.17.-253 {8.4 compatible formatting of doubles} \
-    {expr 1e-253} \
-    1.0000000000000001e-253
-test util-16.1.17.-252 {8.4 compatible formatting of doubles} \
-    {expr 1e-252} \
-    9.9999999999999994e-253
-test util-16.1.17.-251 {8.4 compatible formatting of doubles} \
-    {expr 1e-251} \
-    1e-251
-test util-16.1.17.-250 {8.4 compatible formatting of doubles} \
-    {expr 1e-250} \
-    1.0000000000000001e-250
-test util-16.1.17.-249 {8.4 compatible formatting of doubles} \
-    {expr 1e-249} \
-    1.0000000000000001e-249
-test util-16.1.17.-248 {8.4 compatible formatting of doubles} \
-    {expr 1e-248} \
-    9.9999999999999998e-249
-test util-16.1.17.-247 {8.4 compatible formatting of doubles} \
-    {expr 1e-247} \
-    1e-247
-test util-16.1.17.-246 {8.4 compatible formatting of doubles} \
-    {expr 1e-246} \
-    9.9999999999999996e-247
-test util-16.1.17.-245 {8.4 compatible formatting of doubles} \
-    {expr 1e-245} \
-    9.9999999999999993e-246
-test util-16.1.17.-244 {8.4 compatible formatting of doubles} \
-    {expr 1e-244} \
-    9.9999999999999993e-245
-test util-16.1.17.-243 {8.4 compatible formatting of doubles} \
-    {expr 1e-243} \
-    1e-243
-test util-16.1.17.-242 {8.4 compatible formatting of doubles} \
-    {expr 1e-242} \
-    9.9999999999999997e-243
-test util-16.1.17.-241 {8.4 compatible formatting of doubles} \
-    {expr 1e-241} \
-    9.9999999999999997e-242
-test util-16.1.17.-240 {8.4 compatible formatting of doubles} \
-    {expr 1e-240} \
-    9.9999999999999997e-241
-test util-16.1.17.-239 {8.4 compatible formatting of doubles} \
-    {expr 1e-239} \
-    1.0000000000000001e-239
-test util-16.1.17.-238 {8.4 compatible formatting of doubles} \
-    {expr 1e-238} \
-    9.9999999999999999e-239
-test util-16.1.17.-237 {8.4 compatible formatting of doubles} \
-    {expr 1e-237} \
-    9.9999999999999999e-238
-test util-16.1.17.-236 {8.4 compatible formatting of doubles} \
-    {expr 1e-236} \
-    1e-236
-test util-16.1.17.-235 {8.4 compatible formatting of doubles} \
-    {expr 1e-235} \
-    9.9999999999999996e-236
-test util-16.1.17.-234 {8.4 compatible formatting of doubles} \
-    {expr 1e-234} \
-    9.9999999999999996e-235
-test util-16.1.17.-233 {8.4 compatible formatting of doubles} \
-    {expr 1e-233} \
-    9.9999999999999996e-234
-test util-16.1.17.-232 {8.4 compatible formatting of doubles} \
-    {expr 1e-232} \
-    1e-232
-test util-16.1.17.-231 {8.4 compatible formatting of doubles} \
-    {expr 1e-231} \
-    9.9999999999999999e-232
-test util-16.1.17.-230 {8.4 compatible formatting of doubles} \
-    {expr 1e-230} \
-    1e-230
-test util-16.1.17.-229 {8.4 compatible formatting of doubles} \
-    {expr 1e-229} \
-    1.0000000000000001e-229
-test util-16.1.17.-228 {8.4 compatible formatting of doubles} \
-    {expr 1e-228} \
-    1e-228
-test util-16.1.17.-227 {8.4 compatible formatting of doubles} \
-    {expr 1e-227} \
-    9.9999999999999994e-228
-test util-16.1.17.-226 {8.4 compatible formatting of doubles} \
-    {expr 1e-226} \
-    9.9999999999999992e-227
-test util-16.1.17.-225 {8.4 compatible formatting of doubles} \
-    {expr 1e-225} \
-    9.9999999999999996e-226
-test util-16.1.17.-224 {8.4 compatible formatting of doubles} \
-    {expr 1e-224} \
-    1e-224
-test util-16.1.17.-223 {8.4 compatible formatting of doubles} \
-    {expr 1e-223} \
-    9.9999999999999997e-224
-test util-16.1.17.-222 {8.4 compatible formatting of doubles} \
-    {expr 1e-222} \
-    1e-222
-test util-16.1.17.-221 {8.4 compatible formatting of doubles} \
-    {expr 1e-221} \
-    1e-221
-test util-16.1.17.-220 {8.4 compatible formatting of doubles} \
-    {expr 1e-220} \
-    9.9999999999999999e-221
-test util-16.1.17.-219 {8.4 compatible formatting of doubles} \
-    {expr 1e-219} \
-    1e-219
-test util-16.1.17.-218 {8.4 compatible formatting of doubles} \
-    {expr 1e-218} \
-    1e-218
-test util-16.1.17.-217 {8.4 compatible formatting of doubles} \
-    {expr 1e-217} \
-    1.0000000000000001e-217
-test util-16.1.17.-216 {8.4 compatible formatting of doubles} \
-    {expr 1e-216} \
-    1e-216
-test util-16.1.17.-215 {8.4 compatible formatting of doubles} \
-    {expr 1e-215} \
-    1e-215
-test util-16.1.17.-214 {8.4 compatible formatting of doubles} \
-    {expr 1e-214} \
-    9.9999999999999991e-215
-test util-16.1.17.-213 {8.4 compatible formatting of doubles} \
-    {expr 1e-213} \
-    9.9999999999999995e-214
-test util-16.1.17.-212 {8.4 compatible formatting of doubles} \
-    {expr 1e-212} \
-    9.9999999999999995e-213
-test util-16.1.17.-211 {8.4 compatible formatting of doubles} \
-    {expr 1e-211} \
-    1.0000000000000001e-211
-test util-16.1.17.-210 {8.4 compatible formatting of doubles} \
-    {expr 1e-210} \
-    1e-210
-test util-16.1.17.-209 {8.4 compatible formatting of doubles} \
-    {expr 1e-209} \
-    1e-209
-test util-16.1.17.-208 {8.4 compatible formatting of doubles} \
-    {expr 1e-208} \
-    1.0000000000000001e-208
-test util-16.1.17.-207 {8.4 compatible formatting of doubles} \
-    {expr 1e-207} \
-    9.9999999999999993e-208
-test util-16.1.17.-206 {8.4 compatible formatting of doubles} \
-    {expr 1e-206} \
-    1e-206
-test util-16.1.17.-205 {8.4 compatible formatting of doubles} \
-    {expr 1e-205} \
-    1e-205
-test util-16.1.17.-204 {8.4 compatible formatting of doubles} \
-    {expr 1e-204} \
-    1e-204
-test util-16.1.17.-203 {8.4 compatible formatting of doubles} \
-    {expr 1e-203} \
-    1e-203
-test util-16.1.17.-202 {8.4 compatible formatting of doubles} \
-    {expr 1e-202} \
-    1e-202
-test util-16.1.17.-201 {8.4 compatible formatting of doubles} \
-    {expr 1e-201} \
-    9.9999999999999995e-202
-test util-16.1.17.-200 {8.4 compatible formatting of doubles} \
-    {expr 1e-200} \
-    9.9999999999999998e-201
-test util-16.1.17.-199 {8.4 compatible formatting of doubles} \
-    {expr 1e-199} \
-    9.9999999999999998e-200
-test util-16.1.17.-198 {8.4 compatible formatting of doubles} \
-    {expr 1e-198} \
-    9.9999999999999991e-199
-test util-16.1.17.-197 {8.4 compatible formatting of doubles} \
-    {expr 1e-197} \
-    9.9999999999999999e-198
-test util-16.1.17.-196 {8.4 compatible formatting of doubles} \
-    {expr 1e-196} \
-    1e-196
-test util-16.1.17.-195 {8.4 compatible formatting of doubles} \
-    {expr 1e-195} \
-    1.0000000000000001e-195
-test util-16.1.17.-194 {8.4 compatible formatting of doubles} \
-    {expr 1e-194} \
-    1e-194
-test util-16.1.17.-193 {8.4 compatible formatting of doubles} \
-    {expr 1e-193} \
-    1e-193
-test util-16.1.17.-192 {8.4 compatible formatting of doubles} \
-    {expr 1e-192} \
-    1.0000000000000001e-192
-test util-16.1.17.-191 {8.4 compatible formatting of doubles} \
-    {expr 1e-191} \
-    1e-191
-test util-16.1.17.-190 {8.4 compatible formatting of doubles} \
-    {expr 1e-190} \
-    1e-190
-test util-16.1.17.-189 {8.4 compatible formatting of doubles} \
-    {expr 1e-189} \
-    1.0000000000000001e-189
-test util-16.1.17.-188 {8.4 compatible formatting of doubles} \
-    {expr 1e-188} \
-    9.9999999999999995e-189
-test util-16.1.17.-187 {8.4 compatible formatting of doubles} \
-    {expr 1e-187} \
-    1e-187
-test util-16.1.17.-186 {8.4 compatible formatting of doubles} \
-    {expr 1e-186} \
-    9.9999999999999991e-187
-test util-16.1.17.-185 {8.4 compatible formatting of doubles} \
-    {expr 1e-185} \
-    9.9999999999999999e-186
-test util-16.1.17.-184 {8.4 compatible formatting of doubles} \
-    {expr 1e-184} \
-    1.0000000000000001e-184
-test util-16.1.17.-183 {8.4 compatible formatting of doubles} \
-    {expr 1e-183} \
-    1e-183
-test util-16.1.17.-182 {8.4 compatible formatting of doubles} \
-    {expr 1e-182} \
-    1e-182
-test util-16.1.17.-181 {8.4 compatible formatting of doubles} \
-    {expr 1e-181} \
-    1e-181
-test util-16.1.17.-180 {8.4 compatible formatting of doubles} \
-    {expr 1e-180} \
-    1e-180
-test util-16.1.17.-179 {8.4 compatible formatting of doubles} \
-    {expr 1e-179} \
-    1e-179
-test util-16.1.17.-178 {8.4 compatible formatting of doubles} \
-    {expr 1e-178} \
-    9.9999999999999995e-179
-test util-16.1.17.-177 {8.4 compatible formatting of doubles} \
-    {expr 1e-177} \
-    9.9999999999999995e-178
-test util-16.1.17.-176 {8.4 compatible formatting of doubles} \
-    {expr 1e-176} \
-    1e-176
-test util-16.1.17.-175 {8.4 compatible formatting of doubles} \
-    {expr 1e-175} \
-    1e-175
-test util-16.1.17.-174 {8.4 compatible formatting of doubles} \
-    {expr 1e-174} \
-    1e-174
-test util-16.1.17.-173 {8.4 compatible formatting of doubles} \
-    {expr 1e-173} \
-    1e-173
-test util-16.1.17.-172 {8.4 compatible formatting of doubles} \
-    {expr 1e-172} \
-    1e-172
-test util-16.1.17.-171 {8.4 compatible formatting of doubles} \
-    {expr 1e-171} \
-    9.9999999999999998e-172
-test util-16.1.17.-170 {8.4 compatible formatting of doubles} \
-    {expr 1e-170} \
-    9.9999999999999998e-171
-test util-16.1.17.-169 {8.4 compatible formatting of doubles} \
-    {expr 1e-169} \
-    1e-169
-test util-16.1.17.-168 {8.4 compatible formatting of doubles} \
-    {expr 1e-168} \
-    1e-168
-test util-16.1.17.-167 {8.4 compatible formatting of doubles} \
-    {expr 1e-167} \
-    1e-167
-test util-16.1.17.-166 {8.4 compatible formatting of doubles} \
-    {expr 1e-166} \
-    1e-166
-test util-16.1.17.-165 {8.4 compatible formatting of doubles} \
-    {expr 1e-165} \
-    1e-165
-test util-16.1.17.-164 {8.4 compatible formatting of doubles} \
-    {expr 1e-164} \
-    9.9999999999999996e-165
-test util-16.1.17.-163 {8.4 compatible formatting of doubles} \
-    {expr 1e-163} \
-    9.9999999999999992e-164
-test util-16.1.17.-162 {8.4 compatible formatting of doubles} \
-    {expr 1e-162} \
-    9.9999999999999995e-163
-test util-16.1.17.-161 {8.4 compatible formatting of doubles} \
-    {expr 1e-161} \
-    1e-161
-test util-16.1.17.-160 {8.4 compatible formatting of doubles} \
-    {expr 1e-160} \
-    9.9999999999999999e-161
-test util-16.1.17.-159 {8.4 compatible formatting of doubles} \
-    {expr 1e-159} \
-    9.9999999999999999e-160
-test util-16.1.17.-158 {8.4 compatible formatting of doubles} \
-    {expr 1e-158} \
-    1.0000000000000001e-158
-test util-16.1.17.-157 {8.4 compatible formatting of doubles} \
-    {expr 1e-157} \
-    9.9999999999999994e-158
-test util-16.1.17.-156 {8.4 compatible formatting of doubles} \
-    {expr 1e-156} \
-    1e-156
-test util-16.1.17.-155 {8.4 compatible formatting of doubles} \
-    {expr 1e-155} \
-    1e-155
-test util-16.1.17.-154 {8.4 compatible formatting of doubles} \
-    {expr 1e-154} \
-    9.9999999999999997e-155
-test util-16.1.17.-153 {8.4 compatible formatting of doubles} \
-    {expr 1e-153} \
-    1e-153
-test util-16.1.17.-152 {8.4 compatible formatting of doubles} \
-    {expr 1e-152} \
-    1.0000000000000001e-152
-test util-16.1.17.-151 {8.4 compatible formatting of doubles} \
-    {expr 1e-151} \
-    9.9999999999999994e-152
-test util-16.1.17.-150 {8.4 compatible formatting of doubles} \
-    {expr 1e-150} \
-    1e-150
-test util-16.1.17.-149 {8.4 compatible formatting of doubles} \
-    {expr 1e-149} \
-    9.9999999999999998e-150
-test util-16.1.17.-148 {8.4 compatible formatting of doubles} \
-    {expr 1e-148} \
-    9.9999999999999994e-149
-test util-16.1.17.-147 {8.4 compatible formatting of doubles} \
-    {expr 1e-147} \
-    9.9999999999999997e-148
-test util-16.1.17.-146 {8.4 compatible formatting of doubles} \
-    {expr 1e-146} \
-    1e-146
-test util-16.1.17.-145 {8.4 compatible formatting of doubles} \
-    {expr 1e-145} \
-    9.9999999999999991e-146
-test util-16.1.17.-144 {8.4 compatible formatting of doubles} \
-    {expr 1e-144} \
-    9.9999999999999995e-145
-test util-16.1.17.-143 {8.4 compatible formatting of doubles} \
-    {expr 1e-143} \
-    9.9999999999999995e-144
-test util-16.1.17.-142 {8.4 compatible formatting of doubles} \
-    {expr 1e-142} \
-    1e-142
-test util-16.1.17.-141 {8.4 compatible formatting of doubles} \
-    {expr 1e-141} \
-    1e-141
-test util-16.1.17.-140 {8.4 compatible formatting of doubles} \
-    {expr 1e-140} \
-    9.9999999999999998e-141
-test util-16.1.17.-139 {8.4 compatible formatting of doubles} \
-    {expr 1e-139} \
-    1e-139
-test util-16.1.17.-138 {8.4 compatible formatting of doubles} \
-    {expr 1e-138} \
-    1.0000000000000001e-138
-test util-16.1.17.-137 {8.4 compatible formatting of doubles} \
-    {expr 1e-137} \
-    9.9999999999999998e-138
-test util-16.1.17.-136 {8.4 compatible formatting of doubles} \
-    {expr 1e-136} \
-    1e-136
-test util-16.1.17.-135 {8.4 compatible formatting of doubles} \
-    {expr 1e-135} \
-    1e-135
-test util-16.1.17.-134 {8.4 compatible formatting of doubles} \
-    {expr 1e-134} \
-    1e-134
-test util-16.1.17.-133 {8.4 compatible formatting of doubles} \
-    {expr 1e-133} \
-    1.0000000000000001e-133
-test util-16.1.17.-132 {8.4 compatible formatting of doubles} \
-    {expr 1e-132} \
-    9.9999999999999999e-133
-test util-16.1.17.-131 {8.4 compatible formatting of doubles} \
-    {expr 1e-131} \
-    9.9999999999999999e-132
-test util-16.1.17.-130 {8.4 compatible formatting of doubles} \
-    {expr 1e-130} \
-    1.0000000000000001e-130
-test util-16.1.17.-129 {8.4 compatible formatting of doubles} \
-    {expr 1e-129} \
-    9.9999999999999993e-130
-test util-16.1.17.-128 {8.4 compatible formatting of doubles} \
-    {expr 1e-128} \
-    1.0000000000000001e-128
-test util-16.1.17.-127 {8.4 compatible formatting of doubles} \
-    {expr 1e-127} \
-    1e-127
-test util-16.1.17.-126 {8.4 compatible formatting of doubles} \
-    {expr 1e-126} \
-    9.9999999999999995e-127
-test util-16.1.17.-125 {8.4 compatible formatting of doubles} \
-    {expr 1e-125} \
-    1e-125
-test util-16.1.17.-124 {8.4 compatible formatting of doubles} \
-    {expr 1e-124} \
-    9.9999999999999993e-125
-test util-16.1.17.-123 {8.4 compatible formatting of doubles} \
-    {expr 1e-123} \
-    1.0000000000000001e-123
-test util-16.1.17.-122 {8.4 compatible formatting of doubles} \
-    {expr 1e-122} \
-    1.0000000000000001e-122
-test util-16.1.17.-121 {8.4 compatible formatting of doubles} \
-    {expr 1e-121} \
-    9.9999999999999998e-122
-test util-16.1.17.-120 {8.4 compatible formatting of doubles} \
-    {expr 1e-120} \
-    9.9999999999999998e-121
-test util-16.1.17.-119 {8.4 compatible formatting of doubles} \
-    {expr 1e-119} \
-    1e-119
-test util-16.1.17.-118 {8.4 compatible formatting of doubles} \
-    {expr 1e-118} \
-    9.9999999999999999e-119
-test util-16.1.17.-117 {8.4 compatible formatting of doubles} \
-    {expr 1e-117} \
-    1e-117
-test util-16.1.17.-116 {8.4 compatible formatting of doubles} \
-    {expr 1e-116} \
-    9.9999999999999999e-117
-test util-16.1.17.-115 {8.4 compatible formatting of doubles} \
-    {expr 1e-115} \
-    1.0000000000000001e-115
-test util-16.1.17.-114 {8.4 compatible formatting of doubles} \
-    {expr 1e-114} \
-    1.0000000000000001e-114
-test util-16.1.17.-113 {8.4 compatible formatting of doubles} \
-    {expr 1e-113} \
-    9.9999999999999998e-114
-test util-16.1.17.-112 {8.4 compatible formatting of doubles} \
-    {expr 1e-112} \
-    9.9999999999999995e-113
-test util-16.1.17.-111 {8.4 compatible formatting of doubles} \
-    {expr 1e-111} \
-    1.0000000000000001e-111
-test util-16.1.17.-110 {8.4 compatible formatting of doubles} \
-    {expr 1e-110} \
-    1.0000000000000001e-110
-test util-16.1.17.-109 {8.4 compatible formatting of doubles} \
-    {expr 1e-109} \
-    9.9999999999999999e-110
-test util-16.1.17.-108 {8.4 compatible formatting of doubles} \
-    {expr 1e-108} \
-    1e-108
-test util-16.1.17.-107 {8.4 compatible formatting of doubles} \
-    {expr 1e-107} \
-    1e-107
-test util-16.1.17.-106 {8.4 compatible formatting of doubles} \
-    {expr 1e-106} \
-    9.9999999999999994e-107
-test util-16.1.17.-105 {8.4 compatible formatting of doubles} \
-    {expr 1e-105} \
-    9.9999999999999997e-106
-test util-16.1.17.-104 {8.4 compatible formatting of doubles} \
-    {expr 1e-104} \
-    9.9999999999999993e-105
-test util-16.1.17.-103 {8.4 compatible formatting of doubles} \
-    {expr 1e-103} \
-    9.9999999999999996e-104
-test util-16.1.17.-102 {8.4 compatible formatting of doubles} \
-    {expr 1e-102} \
-    9.9999999999999993e-103
-test util-16.1.17.-101 {8.4 compatible formatting of doubles} \
-    {expr 1e-101} \
-    1.0000000000000001e-101
-test util-16.1.17.-100 {8.4 compatible formatting of doubles} \
-    {expr 1e-100} \
-    1e-100
-test util-16.1.17.-99 {8.4 compatible formatting of doubles} \
-    {expr 1e-99} \
-    1e-99
-test util-16.1.17.-98 {8.4 compatible formatting of doubles} \
-    {expr 1e-98} \
-    9.9999999999999994e-99
-test util-16.1.17.-97 {8.4 compatible formatting of doubles} \
-    {expr 1e-97} \
-    1e-97
-test util-16.1.17.-96 {8.4 compatible formatting of doubles} \
-    {expr 1e-96} \
-    9.9999999999999991e-97
-test util-16.1.17.-95 {8.4 compatible formatting of doubles} \
-    {expr 1e-95} \
-    9.9999999999999999e-96
-test util-16.1.17.-94 {8.4 compatible formatting of doubles} \
-    {expr 1e-94} \
-    9.9999999999999996e-95
-test util-16.1.17.-93 {8.4 compatible formatting of doubles} \
-    {expr 1e-93} \
-    9.999999999999999e-94
-test util-16.1.17.-92 {8.4 compatible formatting of doubles} \
-    {expr 1e-92} \
-    9.9999999999999999e-93
-test util-16.1.17.-91 {8.4 compatible formatting of doubles} \
-    {expr 1e-91} \
-    1e-91
-test util-16.1.17.-90 {8.4 compatible formatting of doubles} \
-    {expr 1e-90} \
-    9.9999999999999999e-91
-test util-16.1.17.-89 {8.4 compatible formatting of doubles} \
-    {expr 1e-89} \
-    1e-89
-test util-16.1.17.-88 {8.4 compatible formatting of doubles} \
-    {expr 1e-88} \
-    9.9999999999999993e-89
-test util-16.1.17.-87 {8.4 compatible formatting of doubles} \
-    {expr 1e-87} \
-    1e-87
-test util-16.1.17.-86 {8.4 compatible formatting of doubles} \
-    {expr 1e-86} \
-    1.0000000000000001e-86
-test util-16.1.17.-85 {8.4 compatible formatting of doubles} \
-    {expr 1e-85} \
-    9.9999999999999998e-86
-test util-16.1.17.-84 {8.4 compatible formatting of doubles} \
-    {expr 1e-84} \
-    1e-84
-test util-16.1.17.-83 {8.4 compatible formatting of doubles} \
-    {expr 1e-83} \
-    1e-83
-test util-16.1.17.-82 {8.4 compatible formatting of doubles} \
-    {expr 1e-82} \
-    9.9999999999999996e-83
-test util-16.1.17.-81 {8.4 compatible formatting of doubles} \
-    {expr 1e-81} \
-    9.9999999999999996e-82
-test util-16.1.17.-80 {8.4 compatible formatting of doubles} \
-    {expr 1e-80} \
-    9.9999999999999996e-81
-test util-16.1.17.-79 {8.4 compatible formatting of doubles} \
-    {expr 1e-79} \
-    1e-79
-test util-16.1.17.-78 {8.4 compatible formatting of doubles} \
-    {expr 1e-78} \
-    1e-78
-test util-16.1.17.-77 {8.4 compatible formatting of doubles} \
-    {expr 1e-77} \
-    9.9999999999999993e-78
-test util-16.1.17.-76 {8.4 compatible formatting of doubles} \
-    {expr 1e-76} \
-    9.9999999999999993e-77
-test util-16.1.17.-75 {8.4 compatible formatting of doubles} \
-    {expr 1e-75} \
-    9.9999999999999996e-76
-test util-16.1.17.-74 {8.4 compatible formatting of doubles} \
-    {expr 1e-74} \
-    9.9999999999999996e-75
-test util-16.1.17.-73 {8.4 compatible formatting of doubles} \
-    {expr 1e-73} \
-    1e-73
-test util-16.1.17.-72 {8.4 compatible formatting of doubles} \
-    {expr 1e-72} \
-    9.9999999999999997e-73
-test util-16.1.17.-71 {8.4 compatible formatting of doubles} \
-    {expr 1e-71} \
-    9.9999999999999992e-72
-test util-16.1.17.-70 {8.4 compatible formatting of doubles} \
-    {expr 1e-70} \
-    1e-70
-test util-16.1.17.-69 {8.4 compatible formatting of doubles} \
-    {expr 1e-69} \
-    9.9999999999999996e-70
-test util-16.1.17.-68 {8.4 compatible formatting of doubles} \
-    {expr 1e-68} \
-    1.0000000000000001e-68
-test util-16.1.17.-67 {8.4 compatible formatting of doubles} \
-    {expr 1e-67} \
-    9.9999999999999994e-68
-test util-16.1.17.-66 {8.4 compatible formatting of doubles} \
-    {expr 1e-66} \
-    9.9999999999999998e-67
-test util-16.1.17.-65 {8.4 compatible formatting of doubles} \
-    {expr 1e-65} \
-    9.9999999999999992e-66
-test util-16.1.17.-64 {8.4 compatible formatting of doubles} \
-    {expr 1e-64} \
-    9.9999999999999997e-65
-test util-16.1.17.-63 {8.4 compatible formatting of doubles} \
-    {expr 1e-63} \
-    1.0000000000000001e-63
-test util-16.1.17.-62 {8.4 compatible formatting of doubles} \
-    {expr 1e-62} \
-    1e-62
-test util-16.1.17.-61 {8.4 compatible formatting of doubles} \
-    {expr 1e-61} \
-    1e-61
-test util-16.1.17.-60 {8.4 compatible formatting of doubles} \
-    {expr 1e-60} \
-    9.9999999999999997e-61
-test util-16.1.17.-59 {8.4 compatible formatting of doubles} \
-    {expr 1e-59} \
-    1e-59
-test util-16.1.17.-58 {8.4 compatible formatting of doubles} \
-    {expr 1e-58} \
-    1e-58
-test util-16.1.17.-57 {8.4 compatible formatting of doubles} \
-    {expr 1e-57} \
-    9.9999999999999995e-58
-test util-16.1.17.-56 {8.4 compatible formatting of doubles} \
-    {expr 1e-56} \
-    1e-56
-test util-16.1.17.-55 {8.4 compatible formatting of doubles} \
-    {expr 1e-55} \
-    9.9999999999999999e-56
-test util-16.1.17.-54 {8.4 compatible formatting of doubles} \
-    {expr 1e-54} \
-    1e-54
-test util-16.1.17.-53 {8.4 compatible formatting of doubles} \
-    {expr 1e-53} \
-    1e-53
-test util-16.1.17.-52 {8.4 compatible formatting of doubles} \
-    {expr 1e-52} \
-    1e-52
-test util-16.1.17.-51 {8.4 compatible formatting of doubles} \
-    {expr 1e-51} \
-    1e-51
-test util-16.1.17.-50 {8.4 compatible formatting of doubles} \
-    {expr 1e-50} \
-    1e-50
-test util-16.1.17.-49 {8.4 compatible formatting of doubles} \
-    {expr 1e-49} \
-    9.9999999999999994e-50
-test util-16.1.17.-48 {8.4 compatible formatting of doubles} \
-    {expr 1e-48} \
-    9.9999999999999997e-49
-test util-16.1.17.-47 {8.4 compatible formatting of doubles} \
-    {expr 1e-47} \
-    9.9999999999999997e-48
-test util-16.1.17.-46 {8.4 compatible formatting of doubles} \
-    {expr 1e-46} \
-    1e-46
-test util-16.1.17.-45 {8.4 compatible formatting of doubles} \
-    {expr 1e-45} \
-    9.9999999999999998e-46
-test util-16.1.17.-44 {8.4 compatible formatting of doubles} \
-    {expr 1e-44} \
-    9.9999999999999995e-45
-test util-16.1.17.-43 {8.4 compatible formatting of doubles} \
-    {expr 1e-43} \
-    1.0000000000000001e-43
-test util-16.1.17.-42 {8.4 compatible formatting of doubles} \
-    {expr 1e-42} \
-    1e-42
-test util-16.1.17.-41 {8.4 compatible formatting of doubles} \
-    {expr 1e-41} \
-    1e-41
-test util-16.1.17.-40 {8.4 compatible formatting of doubles} \
-    {expr 1e-40} \
-    9.9999999999999993e-41
-test util-16.1.17.-39 {8.4 compatible formatting of doubles} \
-    {expr 1e-39} \
-    9.9999999999999993e-40
-test util-16.1.17.-38 {8.4 compatible formatting of doubles} \
-    {expr 1e-38} \
-    9.9999999999999996e-39
-test util-16.1.17.-37 {8.4 compatible formatting of doubles} \
-    {expr 1e-37} \
-    1.0000000000000001e-37
-test util-16.1.17.-36 {8.4 compatible formatting of doubles} \
-    {expr 1e-36} \
-    9.9999999999999994e-37
-test util-16.1.17.-35 {8.4 compatible formatting of doubles} \
-    {expr 1e-35} \
-    1e-35
-test util-16.1.17.-34 {8.4 compatible formatting of doubles} \
-    {expr 1e-34} \
-    9.9999999999999993e-35
-test util-16.1.17.-33 {8.4 compatible formatting of doubles} \
-    {expr 1e-33} \
-    1.0000000000000001e-33
-test util-16.1.17.-32 {8.4 compatible formatting of doubles} \
-    {expr 1e-32} \
-    1.0000000000000001e-32
-test util-16.1.17.-31 {8.4 compatible formatting of doubles} \
-    {expr 1e-31} \
-    1.0000000000000001e-31
-test util-16.1.17.-30 {8.4 compatible formatting of doubles} \
-    {expr 1e-30} \
-    1.0000000000000001e-30
-test util-16.1.17.-29 {8.4 compatible formatting of doubles} \
-    {expr 1e-29} \
-    9.9999999999999994e-30
-test util-16.1.17.-28 {8.4 compatible formatting of doubles} \
-    {expr 1e-28} \
-    9.9999999999999997e-29
-test util-16.1.17.-27 {8.4 compatible formatting of doubles} \
-    {expr 1e-27} \
-    1e-27
-test util-16.1.17.-26 {8.4 compatible formatting of doubles} \
-    {expr 1e-26} \
-    1e-26
-test util-16.1.17.-25 {8.4 compatible formatting of doubles} \
-    {expr 1e-25} \
-    1e-25
-test util-16.1.17.-24 {8.4 compatible formatting of doubles} \
-    {expr 1e-24} \
-    9.9999999999999992e-25
-test util-16.1.17.-23 {8.4 compatible formatting of doubles} \
-    {expr 1e-23} \
-    9.9999999999999996e-24
-test util-16.1.17.-22 {8.4 compatible formatting of doubles} \
-    {expr 1e-22} \
-    1e-22
-test util-16.1.17.-21 {8.4 compatible formatting of doubles} \
-    {expr 1e-21} \
-    9.9999999999999991e-22
-test util-16.1.17.-20 {8.4 compatible formatting of doubles} \
-    {expr 1e-20} \
-    9.9999999999999995e-21
-test util-16.1.17.-19 {8.4 compatible formatting of doubles} \
-    {expr 1e-19} \
-    9.9999999999999998e-20
-test util-16.1.17.-18 {8.4 compatible formatting of doubles} \
-    {expr 1e-18} \
-    1.0000000000000001e-18
-test util-16.1.17.-17 {8.4 compatible formatting of doubles} \
-    {expr 1e-17} \
-    1.0000000000000001e-17
-test util-16.1.17.-16 {8.4 compatible formatting of doubles} \
-    {expr 1e-16} \
-    9.9999999999999998e-17
-test util-16.1.17.-15 {8.4 compatible formatting of doubles} \
-    {expr 1e-15} \
-    1.0000000000000001e-15
-test util-16.1.17.-14 {8.4 compatible formatting of doubles} \
-    {expr 1e-14} \
-    1e-14
-test util-16.1.17.-13 {8.4 compatible formatting of doubles} \
-    {expr 1e-13} \
-    1e-13
-test util-16.1.17.-12 {8.4 compatible formatting of doubles} \
-    {expr 1e-12} \
-    9.9999999999999998e-13
-test util-16.1.17.-11 {8.4 compatible formatting of doubles} \
-    {expr 1e-11} \
-    9.9999999999999994e-12
-test util-16.1.17.-10 {8.4 compatible formatting of doubles} \
-    {expr 1e-10} \
-    1e-10
-test util-16.1.17.-9 {8.4 compatible formatting of doubles} \
-    {expr 1e-9} \
-    1.0000000000000001e-09
-test util-16.1.17.-8 {8.4 compatible formatting of doubles} \
-    {expr 1e-8} \
-    1e-08
-test util-16.1.17.-7 {8.4 compatible formatting of doubles} \
-    {expr 1e-7} \
-    9.9999999999999995e-08
-test util-16.1.17.-6 {8.4 compatible formatting of doubles} \
-    {expr 1e-6} \
-    9.9999999999999995e-07
-test util-16.1.17.-5 {8.4 compatible formatting of doubles} \
-    {expr 1e-5} \
-    1.0000000000000001e-05
-test util-16.1.17.-4 {8.4 compatible formatting of doubles} \
-    {expr 1e-4} \
-    0.0001
-test util-16.1.17.-3 {8.4 compatible formatting of doubles} \
-    {expr 1e-3} \
-    0.001
-test util-16.1.17.-2 {8.4 compatible formatting of doubles} \
-    {expr 1e-2} \
-    0.01
-test util-16.1.17.-1 {8.4 compatible formatting of doubles} \
-    {expr 1e-1} \
-    0.10000000000000001
-test util-16.1.17.0 {8.4 compatible formatting of doubles} \
-    {expr 1e0} \
-    1.0
-test util-16.1.17.1 {8.4 compatible formatting of doubles} \
-    {expr 1e1} \
-    10.0
-test util-16.1.17.2 {8.4 compatible formatting of doubles} \
-    {expr 1e2} \
-    100.0
-test util-16.1.17.3 {8.4 compatible formatting of doubles} \
-    {expr 1e3} \
-    1000.0
-test util-16.1.17.4 {8.4 compatible formatting of doubles} \
-    {expr 1e4} \
-    10000.0
-test util-16.1.17.5 {8.4 compatible formatting of doubles} \
-    {expr 1e5} \
-    100000.0
-test util-16.1.17.6 {8.4 compatible formatting of doubles} \
-    {expr 1e6} \
-    1000000.0
-test util-16.1.17.7 {8.4 compatible formatting of doubles} \
-    {expr 1e7} \
-    10000000.0
-test util-16.1.17.8 {8.4 compatible formatting of doubles} \
-    {expr 1e8} \
-    100000000.0
-test util-16.1.17.9 {8.4 compatible formatting of doubles} \
-    {expr 1e9} \
-    1000000000.0
-test util-16.1.17.10 {8.4 compatible formatting of doubles} \
-    {expr 1e10} \
-    10000000000.0
-test util-16.1.17.11 {8.4 compatible formatting of doubles} \
-    {expr 1e11} \
-    100000000000.0
-test util-16.1.17.12 {8.4 compatible formatting of doubles} \
-    {expr 1e12} \
-    1000000000000.0
-test util-16.1.17.13 {8.4 compatible formatting of doubles} \
-    {expr 1e13} \
-    10000000000000.0
-test util-16.1.17.14 {8.4 compatible formatting of doubles} \
-    {expr 1e14} \
-    100000000000000.0
-test util-16.1.17.15 {8.4 compatible formatting of doubles} \
-    {expr 1e15} \
-    1000000000000000.0
-test util-16.1.17.16 {8.4 compatible formatting of doubles} \
-    {expr 1e16} \
-    10000000000000000.0
-test util-16.1.17.17 {8.4 compatible formatting of doubles} \
-    {expr 1e17} \
-    1e+17
-test util-16.1.17.18 {8.4 compatible formatting of doubles} \
-    {expr 1e18} \
-    1e+18
-test util-16.1.17.19 {8.4 compatible formatting of doubles} \
-    {expr 1e19} \
-    1e+19
-test util-16.1.17.20 {8.4 compatible formatting of doubles} \
-    {expr 1e20} \
-    1e+20
-test util-16.1.17.21 {8.4 compatible formatting of doubles} \
-    {expr 1e21} \
-    1e+21
-test util-16.1.17.22 {8.4 compatible formatting of doubles} \
-    {expr 1e22} \
-    1e+22
-test util-16.1.17.23 {8.4 compatible formatting of doubles} \
-    {expr 1e23} \
-    9.9999999999999992e+22
-test util-16.1.17.24 {8.4 compatible formatting of doubles} \
-    {expr 1e24} \
-    9.9999999999999998e+23
-test util-16.1.17.25 {8.4 compatible formatting of doubles} \
-    {expr 1e25} \
-    1.0000000000000001e+25
-test util-16.1.17.26 {8.4 compatible formatting of doubles} \
-    {expr 1e26} \
-    1e+26
-test util-16.1.17.27 {8.4 compatible formatting of doubles} \
-    {expr 1e27} \
-    1e+27
-test util-16.1.17.28 {8.4 compatible formatting of doubles} \
-    {expr 1e28} \
-    9.9999999999999996e+27
-test util-16.1.17.29 {8.4 compatible formatting of doubles} \
-    {expr 1e29} \
-    9.9999999999999991e+28
-test util-16.1.17.30 {8.4 compatible formatting of doubles} \
-    {expr 1e30} \
-    1e+30
-test util-16.1.17.31 {8.4 compatible formatting of doubles} \
-    {expr 1e31} \
-    9.9999999999999996e+30
-test util-16.1.17.32 {8.4 compatible formatting of doubles} \
-    {expr 1e32} \
-    1.0000000000000001e+32
-test util-16.1.17.33 {8.4 compatible formatting of doubles} \
-    {expr 1e33} \
-    9.9999999999999995e+32
-test util-16.1.17.34 {8.4 compatible formatting of doubles} \
-    {expr 1e34} \
-    9.9999999999999995e+33
-test util-16.1.17.35 {8.4 compatible formatting of doubles} \
-    {expr 1e35} \
-    9.9999999999999997e+34
-test util-16.1.17.36 {8.4 compatible formatting of doubles} \
-    {expr 1e36} \
-    1e+36
-test util-16.1.17.37 {8.4 compatible formatting of doubles} \
-    {expr 1e37} \
-    9.9999999999999995e+36
-test util-16.1.17.38 {8.4 compatible formatting of doubles} \
-    {expr 1e38} \
-    9.9999999999999998e+37
-test util-16.1.17.39 {8.4 compatible formatting of doubles} \
-    {expr 1e39} \
-    9.9999999999999994e+38
-test util-16.1.17.40 {8.4 compatible formatting of doubles} \
-    {expr 1e40} \
-    1e+40
-test util-16.1.17.41 {8.4 compatible formatting of doubles} \
-    {expr 1e41} \
-    1e+41
-test util-16.1.17.42 {8.4 compatible formatting of doubles} \
-    {expr 1e42} \
-    1e+42
-test util-16.1.17.43 {8.4 compatible formatting of doubles} \
-    {expr 1e43} \
-    1e+43
-test util-16.1.17.44 {8.4 compatible formatting of doubles} \
-    {expr 1e44} \
-    1.0000000000000001e+44
-test util-16.1.17.45 {8.4 compatible formatting of doubles} \
-    {expr 1e45} \
-    9.9999999999999993e+44
-test util-16.1.17.46 {8.4 compatible formatting of doubles} \
-    {expr 1e46} \
-    9.9999999999999999e+45
-test util-16.1.17.47 {8.4 compatible formatting of doubles} \
-    {expr 1e47} \
-    1e+47
-test util-16.1.17.48 {8.4 compatible formatting of doubles} \
-    {expr 1e48} \
-    1e+48
-test util-16.1.17.49 {8.4 compatible formatting of doubles} \
-    {expr 1e49} \
-    9.9999999999999995e+48
-test util-16.1.17.50 {8.4 compatible formatting of doubles} \
-    {expr 1e50} \
-    1.0000000000000001e+50
-test util-16.1.17.51 {8.4 compatible formatting of doubles} \
-    {expr 1e51} \
-    9.9999999999999999e+50
-test util-16.1.17.52 {8.4 compatible formatting of doubles} \
-    {expr 1e52} \
-    9.9999999999999999e+51
-test util-16.1.17.53 {8.4 compatible formatting of doubles} \
-    {expr 1e53} \
-    9.9999999999999999e+52
-test util-16.1.17.54 {8.4 compatible formatting of doubles} \
-    {expr 1e54} \
-    1.0000000000000001e+54
-test util-16.1.17.55 {8.4 compatible formatting of doubles} \
-    {expr 1e55} \
-    1e+55
-test util-16.1.17.56 {8.4 compatible formatting of doubles} \
-    {expr 1e56} \
-    1.0000000000000001e+56
-test util-16.1.17.57 {8.4 compatible formatting of doubles} \
-    {expr 1e57} \
-    1e+57
-test util-16.1.17.58 {8.4 compatible formatting of doubles} \
-    {expr 1e58} \
-    9.9999999999999994e+57
-test util-16.1.17.59 {8.4 compatible formatting of doubles} \
-    {expr 1e59} \
-    9.9999999999999997e+58
-test util-16.1.17.60 {8.4 compatible formatting of doubles} \
-    {expr 1e60} \
-    9.9999999999999995e+59
-test util-16.1.17.61 {8.4 compatible formatting of doubles} \
-    {expr 1e61} \
-    9.9999999999999995e+60
-test util-16.1.17.62 {8.4 compatible formatting of doubles} \
-    {expr 1e62} \
-    1e+62
-test util-16.1.17.63 {8.4 compatible formatting of doubles} \
-    {expr 1e63} \
-    1.0000000000000001e+63
-test util-16.1.17.64 {8.4 compatible formatting of doubles} \
-    {expr 1e64} \
-    1e+64
-test util-16.1.17.65 {8.4 compatible formatting of doubles} \
-    {expr 1e65} \
-    9.9999999999999999e+64
-test util-16.1.17.66 {8.4 compatible formatting of doubles} \
-    {expr 1e66} \
-    9.9999999999999995e+65
-test util-16.1.17.67 {8.4 compatible formatting of doubles} \
-    {expr 1e67} \
-    9.9999999999999998e+66
-test util-16.1.17.68 {8.4 compatible formatting of doubles} \
-    {expr 1e68} \
-    9.9999999999999995e+67
-test util-16.1.17.69 {8.4 compatible formatting of doubles} \
-    {expr 1e69} \
-    1.0000000000000001e+69
-test util-16.1.17.70 {8.4 compatible formatting of doubles} \
-    {expr 1e70} \
-    1.0000000000000001e+70
-test util-16.1.17.71 {8.4 compatible formatting of doubles} \
-    {expr 1e71} \
-    1e+71
-test util-16.1.17.72 {8.4 compatible formatting of doubles} \
-    {expr 1e72} \
-    9.9999999999999994e+71
-test util-16.1.17.73 {8.4 compatible formatting of doubles} \
-    {expr 1e73} \
-    9.9999999999999998e+72
-test util-16.1.17.74 {8.4 compatible formatting of doubles} \
-    {expr 1e74} \
-    9.9999999999999995e+73
-test util-16.1.17.75 {8.4 compatible formatting of doubles} \
-    {expr 1e75} \
-    9.9999999999999993e+74
-test util-16.1.17.76 {8.4 compatible formatting of doubles} \
-    {expr 1e76} \
-    1e+76
-test util-16.1.17.77 {8.4 compatible formatting of doubles} \
-    {expr 1e77} \
-    9.9999999999999998e+76
-test util-16.1.17.78 {8.4 compatible formatting of doubles} \
-    {expr 1e78} \
-    1e+78
-test util-16.1.17.79 {8.4 compatible formatting of doubles} \
-    {expr 1e79} \
-    9.9999999999999997e+78
-test util-16.1.17.80 {8.4 compatible formatting of doubles} \
-    {expr 1e80} \
-    1e+80
-test util-16.1.17.81 {8.4 compatible formatting of doubles} \
-    {expr 1e81} \
-    9.9999999999999992e+80
-test util-16.1.17.82 {8.4 compatible formatting of doubles} \
-    {expr 1e82} \
-    9.9999999999999996e+81
-test util-16.1.17.83 {8.4 compatible formatting of doubles} \
-    {expr 1e83} \
-    1e+83
-test util-16.1.17.84 {8.4 compatible formatting of doubles} \
-    {expr 1e84} \
-    1.0000000000000001e+84
-test util-16.1.17.85 {8.4 compatible formatting of doubles} \
-    {expr 1e85} \
-    1e+85
-test util-16.1.17.86 {8.4 compatible formatting of doubles} \
-    {expr 1e86} \
-    1e+86
-test util-16.1.17.87 {8.4 compatible formatting of doubles} \
-    {expr 1e87} \
-    9.9999999999999996e+86
-test util-16.1.17.88 {8.4 compatible formatting of doubles} \
-    {expr 1e88} \
-    9.9999999999999996e+87
-test util-16.1.17.89 {8.4 compatible formatting of doubles} \
-    {expr 1e89} \
-    9.9999999999999999e+88
-test util-16.1.17.90 {8.4 compatible formatting of doubles} \
-    {expr 1e90} \
-    9.9999999999999997e+89
-test util-16.1.17.91 {8.4 compatible formatting of doubles} \
-    {expr 1e91} \
-    1.0000000000000001e+91
-test util-16.1.17.92 {8.4 compatible formatting of doubles} \
-    {expr 1e92} \
-    1e+92
-test util-16.1.17.93 {8.4 compatible formatting of doubles} \
-    {expr 1e93} \
-    1e+93
-test util-16.1.17.94 {8.4 compatible formatting of doubles} \
-    {expr 1e94} \
-    1e+94
-test util-16.1.17.95 {8.4 compatible formatting of doubles} \
-    {expr 1e95} \
-    1e+95
-test util-16.1.17.96 {8.4 compatible formatting of doubles} \
-    {expr 1e96} \
-    1e+96
-test util-16.1.17.97 {8.4 compatible formatting of doubles} \
-    {expr 1e97} \
-    1.0000000000000001e+97
-test util-16.1.17.98 {8.4 compatible formatting of doubles} \
-    {expr 1e98} \
-    1e+98
-test util-16.1.17.99 {8.4 compatible formatting of doubles} \
-    {expr 1e99} \
-    9.9999999999999997e+98
-test util-16.1.17.100 {8.4 compatible formatting of doubles} \
-    {expr 1e100} \
-    1e+100
-test util-16.1.17.101 {8.4 compatible formatting of doubles} \
-    {expr 1e101} \
-    9.9999999999999998e+100
-test util-16.1.17.102 {8.4 compatible formatting of doubles} \
-    {expr 1e102} \
-    9.9999999999999998e+101
-test util-16.1.17.103 {8.4 compatible formatting of doubles} \
-    {expr 1e103} \
-    1e+103
-test util-16.1.17.104 {8.4 compatible formatting of doubles} \
-    {expr 1e104} \
-    1e+104
-test util-16.1.17.105 {8.4 compatible formatting of doubles} \
-    {expr 1e105} \
-    9.9999999999999994e+104
-test util-16.1.17.106 {8.4 compatible formatting of doubles} \
-    {expr 1e106} \
-    1.0000000000000001e+106
-test util-16.1.17.107 {8.4 compatible formatting of doubles} \
-    {expr 1e107} \
-    9.9999999999999997e+106
-test util-16.1.17.108 {8.4 compatible formatting of doubles} \
-    {expr 1e108} \
-    1e+108
-test util-16.1.17.109 {8.4 compatible formatting of doubles} \
-    {expr 1e109} \
-    9.9999999999999998e+108
-test util-16.1.17.110 {8.4 compatible formatting of doubles} \
-    {expr 1e110} \
-    1e+110
-test util-16.1.17.111 {8.4 compatible formatting of doubles} \
-    {expr 1e111} \
-    9.9999999999999996e+110
-test util-16.1.17.112 {8.4 compatible formatting of doubles} \
-    {expr 1e112} \
-    9.9999999999999993e+111
-test util-16.1.17.113 {8.4 compatible formatting of doubles} \
-    {expr 1e113} \
-    1e+113
-test util-16.1.17.114 {8.4 compatible formatting of doubles} \
-    {expr 1e114} \
-    1e+114
-test util-16.1.17.115 {8.4 compatible formatting of doubles} \
-    {expr 1e115} \
-    1e+115
-test util-16.1.17.116 {8.4 compatible formatting of doubles} \
-    {expr 1e116} \
-    1e+116
-test util-16.1.17.117 {8.4 compatible formatting of doubles} \
-    {expr 1e117} \
-    1.0000000000000001e+117
-test util-16.1.17.118 {8.4 compatible formatting of doubles} \
-    {expr 1e118} \
-    9.9999999999999997e+117
-test util-16.1.17.119 {8.4 compatible formatting of doubles} \
-    {expr 1e119} \
-    9.9999999999999994e+118
-test util-16.1.17.120 {8.4 compatible formatting of doubles} \
-    {expr 1e120} \
-    9.9999999999999998e+119
-test util-16.1.17.121 {8.4 compatible formatting of doubles} \
-    {expr 1e121} \
-    1e+121
-test util-16.1.17.122 {8.4 compatible formatting of doubles} \
-    {expr 1e122} \
-    1e+122
-test util-16.1.17.123 {8.4 compatible formatting of doubles} \
-    {expr 1e123} \
-    9.9999999999999998e+122
-test util-16.1.17.124 {8.4 compatible formatting of doubles} \
-    {expr 1e124} \
-    9.9999999999999995e+123
-test util-16.1.17.125 {8.4 compatible formatting of doubles} \
-    {expr 1e125} \
-    9.9999999999999992e+124
-test util-16.1.17.126 {8.4 compatible formatting of doubles} \
-    {expr 1e126} \
-    9.9999999999999992e+125
-test util-16.1.17.127 {8.4 compatible formatting of doubles} \
-    {expr 1e127} \
-    9.9999999999999995e+126
-test util-16.1.17.128 {8.4 compatible formatting of doubles} \
-    {expr 1e128} \
-    1.0000000000000001e+128
-test util-16.1.17.129 {8.4 compatible formatting of doubles} \
-    {expr 1e129} \
-    1e+129
-test util-16.1.17.130 {8.4 compatible formatting of doubles} \
-    {expr 1e130} \
-    1.0000000000000001e+130
-test util-16.1.17.131 {8.4 compatible formatting of doubles} \
-    {expr 1e131} \
-    9.9999999999999991e+130
-test util-16.1.17.132 {8.4 compatible formatting of doubles} \
-    {expr 1e132} \
-    9.9999999999999999e+131
-test util-16.1.17.133 {8.4 compatible formatting of doubles} \
-    {expr 1e133} \
-    1e+133
-test util-16.1.17.134 {8.4 compatible formatting of doubles} \
-    {expr 1e134} \
-    9.9999999999999992e+133
-test util-16.1.17.135 {8.4 compatible formatting of doubles} \
-    {expr 1e135} \
-    9.9999999999999996e+134
-test util-16.1.17.136 {8.4 compatible formatting of doubles} \
-    {expr 1e136} \
-    1.0000000000000001e+136
-test util-16.1.17.137 {8.4 compatible formatting of doubles} \
-    {expr 1e137} \
-    1e+137
-test util-16.1.17.138 {8.4 compatible formatting of doubles} \
-    {expr 1e138} \
-    1e+138
-test util-16.1.17.139 {8.4 compatible formatting of doubles} \
-    {expr 1e139} \
-    1e+139
-test util-16.1.17.140 {8.4 compatible formatting of doubles} \
-    {expr 1e140} \
-    1.0000000000000001e+140
-test util-16.1.17.141 {8.4 compatible formatting of doubles} \
-    {expr 1e141} \
-    1e+141
-test util-16.1.17.142 {8.4 compatible formatting of doubles} \
-    {expr 1e142} \
-    1.0000000000000001e+142
-test util-16.1.17.143 {8.4 compatible formatting of doubles} \
-    {expr 1e143} \
-    1e+143
-test util-16.1.17.144 {8.4 compatible formatting of doubles} \
-    {expr 1e144} \
-    1e+144
-test util-16.1.17.145 {8.4 compatible formatting of doubles} \
-    {expr 1e145} \
-    9.9999999999999999e+144
-test util-16.1.17.146 {8.4 compatible formatting of doubles} \
-    {expr 1e146} \
-    9.9999999999999993e+145
-test util-16.1.17.147 {8.4 compatible formatting of doubles} \
-    {expr 1e147} \
-    9.9999999999999998e+146
-test util-16.1.17.148 {8.4 compatible formatting of doubles} \
-    {expr 1e148} \
-    1e+148
-test util-16.1.17.149 {8.4 compatible formatting of doubles} \
-    {expr 1e149} \
-    1e+149
-test util-16.1.17.150 {8.4 compatible formatting of doubles} \
-    {expr 1e150} \
-    9.9999999999999998e+149
-test util-16.1.17.151 {8.4 compatible formatting of doubles} \
-    {expr 1e151} \
-    1e+151
-test util-16.1.17.152 {8.4 compatible formatting of doubles} \
-    {expr 1e152} \
-    1e+152
-test util-16.1.17.153 {8.4 compatible formatting of doubles} \
-    {expr 1e153} \
-    1e+153
-test util-16.1.17.154 {8.4 compatible formatting of doubles} \
-    {expr 1e154} \
-    1e+154
-test util-16.1.17.155 {8.4 compatible formatting of doubles} \
-    {expr 1e155} \
-    1e+155
-test util-16.1.17.156 {8.4 compatible formatting of doubles} \
-    {expr 1e156} \
-    9.9999999999999998e+155
-test util-16.1.17.157 {8.4 compatible formatting of doubles} \
-    {expr 1e157} \
-    9.9999999999999998e+156
-test util-16.1.17.158 {8.4 compatible formatting of doubles} \
-    {expr 1e158} \
-    9.9999999999999995e+157
-test util-16.1.17.159 {8.4 compatible formatting of doubles} \
-    {expr 1e159} \
-    9.9999999999999993e+158
-test util-16.1.17.160 {8.4 compatible formatting of doubles} \
-    {expr 1e160} \
-    1e+160
-test util-16.1.17.161 {8.4 compatible formatting of doubles} \
-    {expr 1e161} \
-    1e+161
-test util-16.1.17.162 {8.4 compatible formatting of doubles} \
-    {expr 1e162} \
-    9.9999999999999994e+161
-test util-16.1.17.163 {8.4 compatible formatting of doubles} \
-    {expr 1e163} \
-    9.9999999999999994e+162
-test util-16.1.17.164 {8.4 compatible formatting of doubles} \
-    {expr 1e164} \
-    1e+164
-test util-16.1.17.165 {8.4 compatible formatting of doubles} \
-    {expr 1e165} \
-    9.999999999999999e+164
-test util-16.1.17.166 {8.4 compatible formatting of doubles} \
-    {expr 1e166} \
-    9.9999999999999994e+165
-test util-16.1.17.167 {8.4 compatible formatting of doubles} \
-    {expr 1e167} \
-    1e+167
-test util-16.1.17.168 {8.4 compatible formatting of doubles} \
-    {expr 1e168} \
-    9.9999999999999993e+167
-test util-16.1.17.169 {8.4 compatible formatting of doubles} \
-    {expr 1e169} \
-    9.9999999999999993e+168
-test util-16.1.17.170 {8.4 compatible formatting of doubles} \
-    {expr 1e170} \
-    1e+170
-test util-16.1.17.171 {8.4 compatible formatting of doubles} \
-    {expr 1e171} \
-    9.9999999999999995e+170
-test util-16.1.17.172 {8.4 compatible formatting of doubles} \
-    {expr 1e172} \
-    1.0000000000000001e+172
-test util-16.1.17.173 {8.4 compatible formatting of doubles} \
-    {expr 1e173} \
-    1e+173
-test util-16.1.17.174 {8.4 compatible formatting of doubles} \
-    {expr 1e174} \
-    1.0000000000000001e+174
-test util-16.1.17.175 {8.4 compatible formatting of doubles} \
-    {expr 1e175} \
-    9.9999999999999994e+174
-test util-16.1.17.176 {8.4 compatible formatting of doubles} \
-    {expr 1e176} \
-    1e+176
-test util-16.1.17.177 {8.4 compatible formatting of doubles} \
-    {expr 1e177} \
-    1e+177
-test util-16.1.17.178 {8.4 compatible formatting of doubles} \
-    {expr 1e178} \
-    1.0000000000000001e+178
-test util-16.1.17.179 {8.4 compatible formatting of doubles} \
-    {expr 1e179} \
-    9.9999999999999998e+178
-test util-16.1.17.180 {8.4 compatible formatting of doubles} \
-    {expr 1e180} \
-    1e+180
-test util-16.1.17.181 {8.4 compatible formatting of doubles} \
-    {expr 1e181} \
-    9.9999999999999992e+180
-test util-16.1.17.182 {8.4 compatible formatting of doubles} \
-    {expr 1e182} \
-    1.0000000000000001e+182
-test util-16.1.17.183 {8.4 compatible formatting of doubles} \
-    {expr 1e183} \
-    9.9999999999999995e+182
-test util-16.1.17.184 {8.4 compatible formatting of doubles} \
-    {expr 1e184} \
-    1e+184
-test util-16.1.17.185 {8.4 compatible formatting of doubles} \
-    {expr 1e185} \
-    9.9999999999999998e+184
-test util-16.1.17.186 {8.4 compatible formatting of doubles} \
-    {expr 1e186} \
-    9.9999999999999998e+185
-test util-16.1.17.187 {8.4 compatible formatting of doubles} \
-    {expr 1e187} \
-    9.9999999999999991e+186
-test util-16.1.17.188 {8.4 compatible formatting of doubles} \
-    {expr 1e188} \
-    1e+188
-test util-16.1.17.189 {8.4 compatible formatting of doubles} \
-    {expr 1e189} \
-    1e+189
-test util-16.1.17.190 {8.4 compatible formatting of doubles} \
-    {expr 1e190} \
-    1.0000000000000001e+190
-test util-16.1.17.191 {8.4 compatible formatting of doubles} \
-    {expr 1e191} \
-    1.0000000000000001e+191
-test util-16.1.17.192 {8.4 compatible formatting of doubles} \
-    {expr 1e192} \
-    1e+192
-test util-16.1.17.193 {8.4 compatible formatting of doubles} \
-    {expr 1e193} \
-    1.0000000000000001e+193
-test util-16.1.17.194 {8.4 compatible formatting of doubles} \
-    {expr 1e194} \
-    9.9999999999999994e+193
-test util-16.1.17.195 {8.4 compatible formatting of doubles} \
-    {expr 1e195} \
-    9.9999999999999998e+194
-test util-16.1.17.196 {8.4 compatible formatting of doubles} \
-    {expr 1e196} \
-    9.9999999999999995e+195
-test util-16.1.17.197 {8.4 compatible formatting of doubles} \
-    {expr 1e197} \
-    9.9999999999999995e+196
-test util-16.1.17.198 {8.4 compatible formatting of doubles} \
-    {expr 1e198} \
-    1e+198
-test util-16.1.17.199 {8.4 compatible formatting of doubles} \
-    {expr 1e199} \
-    1.0000000000000001e+199
-test util-16.1.17.200 {8.4 compatible formatting of doubles} \
-    {expr 1e200} \
-    9.9999999999999997e+199
-test util-16.1.17.201 {8.4 compatible formatting of doubles} \
-    {expr 1e201} \
-    1e+201
-test util-16.1.17.202 {8.4 compatible formatting of doubles} \
-    {expr 1e202} \
-    9.999999999999999e+201
-test util-16.1.17.203 {8.4 compatible formatting of doubles} \
-    {expr 1e203} \
-    9.9999999999999999e+202
-test util-16.1.17.204 {8.4 compatible formatting of doubles} \
-    {expr 1e204} \
-    9.9999999999999999e+203
-test util-16.1.17.205 {8.4 compatible formatting of doubles} \
-    {expr 1e205} \
-    1e+205
-test util-16.1.17.206 {8.4 compatible formatting of doubles} \
-    {expr 1e206} \
-    1e+206
-test util-16.1.17.207 {8.4 compatible formatting of doubles} \
-    {expr 1e207} \
-    1e+207
-test util-16.1.17.208 {8.4 compatible formatting of doubles} \
-    {expr 1e208} \
-    9.9999999999999998e+207
-test util-16.1.17.209 {8.4 compatible formatting of doubles} \
-    {expr 1e209} \
-    1.0000000000000001e+209
-test util-16.1.17.210 {8.4 compatible formatting of doubles} \
-    {expr 1e210} \
-    9.9999999999999993e+209
-test util-16.1.17.211 {8.4 compatible formatting of doubles} \
-    {expr 1e211} \
-    9.9999999999999996e+210
-test util-16.1.17.212 {8.4 compatible formatting of doubles} \
-    {expr 1e212} \
-    9.9999999999999991e+211
-test util-16.1.17.213 {8.4 compatible formatting of doubles} \
-    {expr 1e213} \
-    9.9999999999999998e+212
-test util-16.1.17.214 {8.4 compatible formatting of doubles} \
-    {expr 1e214} \
-    9.9999999999999995e+213
-test util-16.1.17.215 {8.4 compatible formatting of doubles} \
-    {expr 1e215} \
-    9.9999999999999991e+214
-test util-16.1.17.216 {8.4 compatible formatting of doubles} \
-    {expr 1e216} \
-    1e+216
-test util-16.1.17.217 {8.4 compatible formatting of doubles} \
-    {expr 1e217} \
-    9.9999999999999996e+216
-test util-16.1.17.218 {8.4 compatible formatting of doubles} \
-    {expr 1e218} \
-    1.0000000000000001e+218
-test util-16.1.17.219 {8.4 compatible formatting of doubles} \
-    {expr 1e219} \
-    9.9999999999999997e+218
-test util-16.1.17.220 {8.4 compatible formatting of doubles} \
-    {expr 1e220} \
-    1e+220
-test util-16.1.17.221 {8.4 compatible formatting of doubles} \
-    {expr 1e221} \
-    1e+221
-test util-16.1.17.222 {8.4 compatible formatting of doubles} \
-    {expr 1e222} \
-    1e+222
-test util-16.1.17.223 {8.4 compatible formatting of doubles} \
-    {expr 1e223} \
-    1e+223
-test util-16.1.17.224 {8.4 compatible formatting of doubles} \
-    {expr 1e224} \
-    9.9999999999999997e+223
-test util-16.1.17.225 {8.4 compatible formatting of doubles} \
-    {expr 1e225} \
-    9.9999999999999993e+224
-test util-16.1.17.226 {8.4 compatible formatting of doubles} \
-    {expr 1e226} \
-    9.9999999999999996e+225
-test util-16.1.17.227 {8.4 compatible formatting of doubles} \
-    {expr 1e227} \
-    1.0000000000000001e+227
-test util-16.1.17.228 {8.4 compatible formatting of doubles} \
-    {expr 1e228} \
-    9.9999999999999992e+227
-test util-16.1.17.229 {8.4 compatible formatting of doubles} \
-    {expr 1e229} \
-    9.9999999999999999e+228
-test util-16.1.17.230 {8.4 compatible formatting of doubles} \
-    {expr 1e230} \
-    1.0000000000000001e+230
-test util-16.1.17.231 {8.4 compatible formatting of doubles} \
-    {expr 1e231} \
-    1.0000000000000001e+231
-test util-16.1.17.232 {8.4 compatible formatting of doubles} \
-    {expr 1e232} \
-    1.0000000000000001e+232
-test util-16.1.17.233 {8.4 compatible formatting of doubles} \
-    {expr 1e233} \
-    9.9999999999999997e+232
-test util-16.1.17.234 {8.4 compatible formatting of doubles} \
-    {expr 1e234} \
-    1e+234
-test util-16.1.17.235 {8.4 compatible formatting of doubles} \
-    {expr 1e235} \
-    1.0000000000000001e+235
-test util-16.1.17.236 {8.4 compatible formatting of doubles} \
-    {expr 1e236} \
-    1.0000000000000001e+236
-test util-16.1.17.237 {8.4 compatible formatting of doubles} \
-    {expr 1e237} \
-    9.9999999999999994e+236
-test util-16.1.17.238 {8.4 compatible formatting of doubles} \
-    {expr 1e238} \
-    1e+238
-test util-16.1.17.239 {8.4 compatible formatting of doubles} \
-    {expr 1e239} \
-    9.9999999999999999e+238
-test util-16.1.17.240 {8.4 compatible formatting of doubles} \
-    {expr 1e240} \
-    1e+240
-test util-16.1.17.241 {8.4 compatible formatting of doubles} \
-    {expr 1e241} \
-    1.0000000000000001e+241
-test util-16.1.17.242 {8.4 compatible formatting of doubles} \
-    {expr 1e242} \
-    1.0000000000000001e+242
-test util-16.1.17.243 {8.4 compatible formatting of doubles} \
-    {expr 1e243} \
-    1.0000000000000001e+243
-test util-16.1.17.244 {8.4 compatible formatting of doubles} \
-    {expr 1e244} \
-    1.0000000000000001e+244
-test util-16.1.17.245 {8.4 compatible formatting of doubles} \
-    {expr 1e245} \
-    1e+245
-test util-16.1.17.246 {8.4 compatible formatting of doubles} \
-    {expr 1e246} \
-    1.0000000000000001e+246
-test util-16.1.17.247 {8.4 compatible formatting of doubles} \
-    {expr 1e247} \
-    9.9999999999999995e+246
-test util-16.1.17.248 {8.4 compatible formatting of doubles} \
-    {expr 1e248} \
-    1e+248
-test util-16.1.17.249 {8.4 compatible formatting of doubles} \
-    {expr 1e249} \
-    9.9999999999999992e+248
-test util-16.1.17.250 {8.4 compatible formatting of doubles} \
-    {expr 1e250} \
-    9.9999999999999992e+249
-test util-16.1.17.251 {8.4 compatible formatting of doubles} \
-    {expr 1e251} \
-    1e+251
-test util-16.1.17.252 {8.4 compatible formatting of doubles} \
-    {expr 1e252} \
-    1.0000000000000001e+252
-test util-16.1.17.253 {8.4 compatible formatting of doubles} \
-    {expr 1e253} \
-    9.9999999999999994e+252
-test util-16.1.17.254 {8.4 compatible formatting of doubles} \
-    {expr 1e254} \
-    9.9999999999999994e+253
-test util-16.1.17.255 {8.4 compatible formatting of doubles} \
-    {expr 1e255} \
-    9.9999999999999999e+254
-test util-16.1.17.256 {8.4 compatible formatting of doubles} \
-    {expr 1e256} \
-    1e+256
-test util-16.1.17.257 {8.4 compatible formatting of doubles} \
-    {expr 1e257} \
-    1e+257
-test util-16.1.17.258 {8.4 compatible formatting of doubles} \
-    {expr 1e258} \
-    1.0000000000000001e+258
-test util-16.1.17.259 {8.4 compatible formatting of doubles} \
-    {expr 1e259} \
-    9.9999999999999993e+258
-test util-16.1.17.260 {8.4 compatible formatting of doubles} \
-    {expr 1e260} \
-    1.0000000000000001e+260
-test util-16.1.17.261 {8.4 compatible formatting of doubles} \
-    {expr 1e261} \
-    9.9999999999999993e+260
-test util-16.1.17.262 {8.4 compatible formatting of doubles} \
-    {expr 1e262} \
-    1e+262
-test util-16.1.17.263 {8.4 compatible formatting of doubles} \
-    {expr 1e263} \
-    1e+263
-test util-16.1.17.264 {8.4 compatible formatting of doubles} \
-    {expr 1e264} \
-    1e+264
-test util-16.1.17.265 {8.4 compatible formatting of doubles} \
-    {expr 1e265} \
-    1.0000000000000001e+265
-test util-16.1.17.266 {8.4 compatible formatting of doubles} \
-    {expr 1e266} \
-    1e+266
-test util-16.1.17.267 {8.4 compatible formatting of doubles} \
-    {expr 1e267} \
-    9.9999999999999997e+266
-test util-16.1.17.268 {8.4 compatible formatting of doubles} \
-    {expr 1e268} \
-    9.9999999999999997e+267
-test util-16.1.17.269 {8.4 compatible formatting of doubles} \
-    {expr 1e269} \
-    1e+269
-test util-16.1.17.270 {8.4 compatible formatting of doubles} \
-    {expr 1e270} \
-    1e+270
-test util-16.1.17.271 {8.4 compatible formatting of doubles} \
-    {expr 1e271} \
-    9.9999999999999995e+270
-test util-16.1.17.272 {8.4 compatible formatting of doubles} \
-    {expr 1e272} \
-    1.0000000000000001e+272
-test util-16.1.17.273 {8.4 compatible formatting of doubles} \
-    {expr 1e273} \
-    9.9999999999999995e+272
-test util-16.1.17.274 {8.4 compatible formatting of doubles} \
-    {expr 1e274} \
-    9.9999999999999992e+273
-test util-16.1.17.275 {8.4 compatible formatting of doubles} \
-    {expr 1e275} \
-    9.9999999999999996e+274
-test util-16.1.17.276 {8.4 compatible formatting of doubles} \
-    {expr 1e276} \
-    1.0000000000000001e+276
-test util-16.1.17.277 {8.4 compatible formatting of doubles} \
-    {expr 1e277} \
-    1e+277
-test util-16.1.17.278 {8.4 compatible formatting of doubles} \
-    {expr 1e278} \
-    9.9999999999999996e+277
-test util-16.1.17.279 {8.4 compatible formatting of doubles} \
-    {expr 1e279} \
-    1.0000000000000001e+279
-test util-16.1.17.280 {8.4 compatible formatting of doubles} \
-    {expr 1e280} \
-    1e+280
-test util-16.1.17.281 {8.4 compatible formatting of doubles} \
-    {expr 1e281} \
-    1e+281
-test util-16.1.17.282 {8.4 compatible formatting of doubles} \
-    {expr 1e282} \
-    1e+282
-test util-16.1.17.283 {8.4 compatible formatting of doubles} \
-    {expr 1e283} \
-    9.9999999999999996e+282
-test util-16.1.17.284 {8.4 compatible formatting of doubles} \
-    {expr 1e284} \
-    1.0000000000000001e+284
-test util-16.1.17.285 {8.4 compatible formatting of doubles} \
-    {expr 1e285} \
-    9.9999999999999998e+284
-test util-16.1.17.286 {8.4 compatible formatting of doubles} \
-    {expr 1e286} \
-    1e+286
-test util-16.1.17.287 {8.4 compatible formatting of doubles} \
-    {expr 1e287} \
-    1.0000000000000001e+287
-test util-16.1.17.288 {8.4 compatible formatting of doubles} \
-    {expr 1e288} \
-    1e+288
-test util-16.1.17.289 {8.4 compatible formatting of doubles} \
-    {expr 1e289} \
-    1.0000000000000001e+289
-test util-16.1.17.290 {8.4 compatible formatting of doubles} \
-    {expr 1e290} \
-    1.0000000000000001e+290
-test util-16.1.17.291 {8.4 compatible formatting of doubles} \
-    {expr 1e291} \
-    9.9999999999999996e+290
-test util-16.1.17.292 {8.4 compatible formatting of doubles} \
-    {expr 1e292} \
-    1e+292
-test util-16.1.17.293 {8.4 compatible formatting of doubles} \
-    {expr 1e293} \
-    9.9999999999999992e+292
-test util-16.1.17.294 {8.4 compatible formatting of doubles} \
-    {expr 1e294} \
-    1.0000000000000001e+294
-test util-16.1.17.295 {8.4 compatible formatting of doubles} \
-    {expr 1e295} \
-    9.9999999999999998e+294
-test util-16.1.17.296 {8.4 compatible formatting of doubles} \
-    {expr 1e296} \
-    9.9999999999999998e+295
-test util-16.1.17.297 {8.4 compatible formatting of doubles} \
-    {expr 1e297} \
-    1e+297
-test util-16.1.17.298 {8.4 compatible formatting of doubles} \
-    {expr 1e298} \
-    9.9999999999999996e+297
-test util-16.1.17.299 {8.4 compatible formatting of doubles} \
-    {expr 1e299} \
-    1.0000000000000001e+299
-test util-16.1.17.300 {8.4 compatible formatting of doubles} \
-    {expr 1e300} \
-    1.0000000000000001e+300
-test util-16.1.17.301 {8.4 compatible formatting of doubles} \
-    {expr 1e301} \
-    1.0000000000000001e+301
-test util-16.1.17.302 {8.4 compatible formatting of doubles} \
-    {expr 1e302} \
-    1.0000000000000001e+302
-test util-16.1.17.303 {8.4 compatible formatting of doubles} \
-    {expr 1e303} \
-    1e+303
-test util-16.1.17.304 {8.4 compatible formatting of doubles} \
-    {expr 1e304} \
-    9.9999999999999994e+303
-test util-16.1.17.305 {8.4 compatible formatting of doubles} \
-    {expr 1e305} \
-    9.9999999999999994e+304
-test util-16.1.17.306 {8.4 compatible formatting of doubles} \
-    {expr 1e306} \
-    1e+306
-test util-16.1.17.307 {8.4 compatible formatting of doubles} \
-    {expr 1e307} \
-    9.9999999999999999e+306
-
 test util-17.1 {bankers' rounding [Bug 3349507]} {ieeeFloatingPoint} {
     set r {}
     foreach {input} {
@@ -4084,8 +2139,6 @@ test util-18.12 {Tcl_ObjPrintf} {testprint} {
     testprint "%I64d %Id" 65537
 } {65537 65537}
 
-set ::tcl_precision $saved_precision
-
 # cleanup
 ::tcltest::cleanupTests
 return
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 5bc753a..b7df740 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -532,13 +532,13 @@ TclUnixWaitForFile(
 	numFound = poll(pollFds, 1, pollTimeout);
 	if (numFound == 1) {
 	    result = 0;
-	    if (pollFds[0].events & (POLLIN | POLLHUP)) {
+	    if (pollFds[0].revents & (POLLIN | POLLHUP)) {
 		result |= TCL_READABLE;
 	    }
-	    if (pollFds[0].events & POLLOUT) {
+	    if (pollFds[0].revents & POLLOUT) {
 		result |= TCL_WRITABLE;
 	    }
-	    if (pollFds[0].events & POLLERR) {
+	    if (pollFds[0].revents & POLLERR) {
 		result |= TCL_EXCEPTION;
 	    }
 	    if (result) {
diff --git a/win/configure b/win/configure
index 9554f3a..5ce3dff 100755
--- a/win/configure
+++ b/win/configure
@@ -706,7 +706,6 @@ CFLAGS_WARNING
 CFLAGS_OPTIMIZE
 CFLAGS_DEBUG
 DL_LIBS
-CELIB_DIR
 CYGPATH
 TCL_THREADS
 SET_MAKE
@@ -768,8 +767,6 @@ enable_threads
 with_encoding
 enable_shared
 enable_64bit
-enable_wince
-with_celib
 enable_symbols
 enable_embedded_manifest
 '
@@ -1392,7 +1389,6 @@ Optional Features:
   --enable-threads        build with threads (default: on)
   --enable-shared         build and link with shared libraries (default: on)
   --enable-64bit          enable 64bit support (where applicable)
-  --enable-wince          enable Win/CE support (where applicable)
   --enable-symbols        build with debugging symbols (default: off)
   --enable-embedded-manifest
                           embed manifest if possible (default: yes)
@@ -1401,7 +1397,6 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-encoding         encoding for configuration values
-  --with-celib=DIR        use Windows/CE support library from DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -3811,33 +3806,6 @@ fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bit" >&5
 $as_echo "$do64bit" >&6; }
 
-    # Cross-compiling options for Windows/CE builds
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Windows/CE build is requested" >&5
-$as_echo_n "checking if Windows/CE build is requested... " >&6; }
-    # Check whether --enable-wince was given.
-if test "${enable_wince+set}" = set; then :
-  enableval=$enable_wince; doWince=$enableval
-else
-  doWince=no
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $doWince" >&5
-$as_echo "$doWince" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Windows/CE celib directory" >&5
-$as_echo_n "checking for Windows/CE celib directory... " >&6; }
-
-# Check whether --with-celib was given.
-if test "${with_celib+set}" = set; then :
-  withval=$with_celib; CELIB_DIR=$withval
-else
-  CELIB_DIR=NO_CELIB
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CELIB_DIR" >&5
-$as_echo "$CELIB_DIR" >&6; }
-
     # Set some defaults (may get changed below)
     EXTRA_CFLAGS=""
 
@@ -4336,107 +4304,7 @@ fi
 	    LINKBIN="link"
 	fi
 
-	if test "$doWince" != "no" ; then
-	    # Set defaults for common evc4/PPC2003 setup
-	    # Currently Tcl requires 300+, possibly 420+ for sockets
-	    CEVERSION=420; 		# could be 211 300 301 400 420 ...
-	    TARGETCPU=ARMV4;	# could be ARMV4 ARM MIPS SH3 X86 ...
-	    ARCH=ARM;		# could be ARM MIPS X86EM ...
-	    PLATFORM="Pocket PC 2003"; # or "Pocket PC 2002"
-	    if test "$doWince" != "yes"; then
-		# If !yes then the user specified something
-		# Reset ARCH to allow user to skip specifying it
-		ARCH=
-		eval `echo $doWince | awk -F "," '{ \
-	if (length($1)) { printf "CEVERSION=\"%s\"\n", $1; \
-	if ($1 < 400)	  { printf "PLATFORM=\"Pocket PC 2002\"\n" } }; \
-	if (length($2)) { printf "TARGETCPU=\"%s\"\n", toupper($2) }; \
-	if (length($3)) { printf "ARCH=\"%s\"\n", toupper($3) }; \
-	if (length($4)) { printf "PLATFORM=\"%s\"\n", $4 }; \
-		}'`
-		if test "x${ARCH}" = "x" ; then
-		    ARCH=$TARGETCPU;
-		fi
-	    fi
-	    OSVERSION=WCE$CEVERSION;
-	    if test "x${WCEROOT}" = "x" ; then
-		WCEROOT="C:/Program Files/Microsoft eMbedded C++ 4.0"
-		if test ! -d "${WCEROOT}" ; then
-		    WCEROOT="C:/Program Files/Microsoft eMbedded Tools"
-		fi
-	    fi
-	    if test "x${SDKROOT}" = "x" ; then
-		SDKROOT="C:/Program Files/Windows CE Tools"
-		if test ! -d "${SDKROOT}" ; then
-		    SDKROOT="C:/Windows CE Tools"
-		fi
-	    fi
-	    # The space-based-path will work for the Makefile, but will
-	    # not work if AC_TRY_COMPILE is called.
-	    WCEROOT=`echo "$WCEROOT" | sed -e 's!\\\!/!g'`
-	    SDKROOT=`echo "$SDKROOT" | sed -e 's!\\\!/!g'`
-	    CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'`
-	    if test ! -d "${CELIB_DIR}/inc"; then
-		as_fn_error $? "Invalid celib directory \"${CELIB_DIR}\"" "$LINENO" 5
-	    fi
-	    if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"\
-		-o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then
-		as_fn_error $? "could not find PocketPC SDK or target compiler to enable WinCE mode $CEVERSION,$TARGETCPU,$ARCH,$PLATFORM" "$LINENO" 5
-	    else
-		CEINCLUDE="${SDKROOT}/${OSVERSION}/${PLATFORM}/include"
-		if test -d "${CEINCLUDE}/${TARGETCPU}" ; then
-		    CEINCLUDE="${CEINCLUDE}/${TARGETCPU}"
-		fi
-		CELIBPATH="${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"
-	    fi
-	fi
-
-	if test "$doWince" != "no" ; then
-	    CEBINROOT="${WCEROOT}/EVC/${OSVERSION}/bin"
-	    if test "${TARGETCPU}" = "X86"; then
-		CC="${CEBINROOT}/cl.exe"
-	    else
-		CC="${CEBINROOT}/cl${ARCH}.exe"
-	    fi
-	    CC="\"${CC}\" -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
-	    RC="\"${WCEROOT}/Common/EVC/bin/rc.exe\""
-	    arch=`echo ${ARCH} | awk '{print tolower($0)}'`
-	    defs="${ARCH} _${ARCH}_ ${arch} PALM_SIZE _MT _DLL _WINDOWS"
-	    for i in $defs ; do
-		cat >>confdefs.h <<_ACEOF
-#define $i 1
-_ACEOF
-
-	    done
-#	    if test "${ARCH}" = "X86EM"; then
-#		AC_DEFINE_UNQUOTED(_WIN32_WCE_EMULATION)
-#	    fi
-	    cat >>confdefs.h <<_ACEOF
-#define _WIN32_WCE $CEVERSION
-_ACEOF
-
-	    cat >>confdefs.h <<_ACEOF
-#define UNDER_CE $CEVERSION
-_ACEOF
-
-	    CFLAGS_DEBUG="-nologo -Zi -Od"
-	    CFLAGS_OPTIMIZE="-nologo -O2"
-	    lversion=`echo ${CEVERSION} | sed -e 's/\(.\)\(..\)/\1\.\2/'`
-	    lflags="-nodefaultlib -MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
-	    LINKBIN="\"${CEBINROOT}/link.exe\""
-
-	    if test "${CEVERSION}" -lt 400 ; then
-		LIBS="coredll.lib corelibc.lib winsock.lib"
-	    else
-		LIBS="coredll.lib corelibc.lib ws2.lib"
-	    fi
-	    # celib currently stuck at wce300 status
-	    #LIBS="$LIBS \${CELIB_DIR}/wince-${ARCH}-pocket-${OSVERSION}-release/celib.lib"
-	    LIBS="$LIBS \"\${CELIB_DIR}/wince-${ARCH}-pocket-wce300-release/celib.lib\""
-	    LIBS_GUI="commctrl.lib commdlg.lib"
-	else
-	    LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
-	fi
+	LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
 
 	SHLIB_LD="${LINKBIN} -dll -incremental:no ${lflags}"
 	SHLIB_LD_LIBS='${LIBS}'
@@ -4467,7 +4335,7 @@ _ACEOF
 
 	# Specify linker flags depending on the type of app being
 	# built -- Console vs. Window.
-	if test "$doWince" != "no" -a "${TARGETCPU}" != "X86"; then
+	if test "${TARGETCPU}" != "X86"; then
 	    LDFLAGS_CONSOLE="-link ${lflags}"
 	    LDFLAGS_WINDOW=${LDFLAGS_CONSOLE}
 	else
diff --git a/win/makefile.vc b/win/makefile.vc
index ceedc10..ab53ec3 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -1,7 +1,6 @@
-#-------------------------------------------------------------

-# makefile.vc --

+#------------------------------------------------------------- -*- makefile -*-

 #

-#	Microsoft Visual C++ makefile for use with nmake.exe v1.62+ (VC++ 5.0+)

+#	Microsoft Visual C++ makefile for building Tcl with nmake

 #

 # See the file "license.terms" for information on usage and redistribution

 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.

@@ -11,37 +10,16 @@
 # Copyright (c) 2001-2005 ActiveState Corporation.

 # Copyright (c) 2001-2004 David Gravereaux.

 # Copyright (c) 2003-2008 Pat Thoyts.

+# Copyright (c) 2017 Ashok P. Nadkarni

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

 

-# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or

-# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)

-!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCINSTALLDIR) && !defined(MSSDK) && !defined(WINDOWSSDKDIR)

-MSG = ^

-You need to run vcvars32.bat from Developer Studio or setenv.bat from the^

-Platform SDK first to setup the environment.  Jump to this line to read^

-the build instructions.

-!error $(MSG)

-!endif

-

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

-# HOW TO USE this makefile:

-#

-# 1)  It is now necessary to have MSVCDir, MSDevDir or MSSDK set in the

-#     environment.  This is used as a check to see if vcvars32.bat had been

-#     run prior to running nmake or during the installation of Microsoft

-#     Visual C++, MSVCDir had been set globally and the PATH adjusted.

-#     Either way is valid.

-#

-#     You'll need to run vcvars32.bat contained in the MsDev's vc(98)/bin

-#     directory to setup the proper environment, if needed, for your

-#     current setup.  This is a needed bootstrap requirement and allows the

-#     swapping of different environments to be easier.

+# General usage:

+#   nmake [-nologo] -f makefile.vc [TARGET|MACRODEF [TARGET|MACRODEF] [...]]

 #

-# 2)  To use the Platform SDK (not expressly needed), run setenv.bat after

-#     vcvars32.bat according to the instructions for it.  This can also

-#     turn on the 64-bit compiler, if your SDK has it.

+# For MACRODEF, see TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md)

+# or examine Sections 6-8 in rules.vc.

 #

-# 3)  Targets are:

+# Possible values of TARGET are:

 #	release  -- Builds the core, the shell and the dlls. (default)

 #	dlls     -- Just builds the windows extensions

 #	shell    -- Just builds the shell and the core.

@@ -61,154 +39,83 @@ the build instructions.
 #		    troff manual pages found in $(ROOT)\doc. You need to

 #		    have installed the HTML Help Compiler package from Microsoft

 #		    to produce the .chm file.

-#	winhelp  -- (deprecated) Builds the windows .hlp file for Tcl from

-#		    the troff man files found in $(ROOT)\doc. This type of

-#		    help file is deprecated by Microsoft in favour of html

-#		    help files (.chm)

-#

-# 4)  Macros usable on the commandline:

-#	INSTALLDIR=<path>

-#		Sets where to install Tcl from the built binaries.

-#		C:\Progra~1\Tcl is assumed when not specified.

-#

-#	OPTS=loimpact,msvcrt,nothreads,pdbs,profile,static,staticpkg,symbols,thrdalloc,tclalloc,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.

-#

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

-#		nothreads= Turns off full multithreading support.

-#		pdbs     = Build detached symbols for release builds.

-#		profile  = Adds profiling hooks.  Map file is assumed.

-#		static   = Builds a static library of the core instead of a

-#			   dll.  The static library will contain the dde and reg

-#			   extensions. External applications who want to use

-#			   this, need to link with the stub library as well as

-#			   the static Tcl library.The shell will be static (and

-#			   large), as well.

-#		staticpkg = Affects the static option only to switch

-#			   tclshXX.exe to have the dde and reg extension linked

-#			   inside it.

-#		symbols  = Debug build. Links to the debug C runtime, disables

-#			   optimizations and creates pdb symbols files.

-#		thrdalloc = Use the thread allocator (shared global free pool)

-#			   This is the default on threaded builds.

-#		tclalloc = Use the old non-thread allocator

-#		unchecked= Allows a symbols build to not use the debug

-#			   enabled runtime (msvcrt.dll not msvcrtd.dll

-#			   or libcmt.lib not libcmtd.lib).

-#

-#	STATS=compdbg,memdbg,none

-#		Sets optional memory and bytecode compiler debugging code added

-#		to the core.  The default is for none.  Any combination of the

-#		above may be used (comma separated).  'none' will over-ride

-#		everything to nothing.

 #

-#		compdbg  = Enables byte compilation logging.

-#		memdbg   = Enables the debugging memory allocator.

+# The steps to setup a Visual C++ environment depend on which

+# version of Visual Studio and/or the Windows SDK you are building

+# against and are not described here. The simplest method is generally

+# to start a command shell using one of the short cuts installed by

+# Visual Studio/Windows SDK for the appropriate target architecture.

 #

-#	CHECKS=64bit,fullwarn,nodep,none

-#		Sets special macros for checking compatibility.

+# NOTE: For older (Visual C++ 6 or the 2003 SDK), to use the Platform

+# SDK (not expressly needed), run setenv.bat after

+# vcvars32.bat according to the instructions for it.  This can also

+# turn on the 64-bit compiler, if your SDK has it.

 #

-#		64bit    = Enable 64bit portability warnings (if available)

-#		fullwarn = Builds with full compiler and link warnings enabled.

-#			    Very verbose.

-#		nodep	 = Turns off compatibility macros to ensure the core

-#			    isn't being built with deprecated functions.

-#

-#	MACHINE=(ARM|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

-#		when not specified. If the CPU environment variable has been

-#		set (ie: recent Platform SDK) then MACHINE is set from CPU.

-#

-#	TMP_DIR=<path>

-#	OUT_DIR=<path>

-#		Hooks to allow the intermediate and output directories to be

-#		changed.  $(OUT_DIR) is assumed to be

-#		$(BINROOT)\(Release|Debug) based on if symbols are requested.

-#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.

-#

-#	TESTPAT=<file>

-#		Reads the tests requested to be run from this file.

-#

-#	CFG_ENCODING=encoding

-#		name of encoding for configuration information. Defaults

-#		to cp1252

-#

-# 5)  Examples:

-#

-#	Basic syntax of calling nmake looks like this:

-#	nmake [-nologo] -f makefile.vc [target|macrodef [target|macrodef] [...]]

-#

-#                        Standard (no frills)

-#       c:\tcl_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat

-#       Setting environment for using Microsoft Visual C++ tools.

+# Examples:

 #       c:\tcl_src\win\>nmake -f makefile.vc release

+#       c:\tcl_src\win\>nmake -f makefile.vc test

 #       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl

+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs 

+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols

 #

-#                         Building for Win64

-#       c:\tcl_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat

-#       Setting environment for using Microsoft Visual C++ tools.

-#       c:\tcl_src\win\>c:\progra~1\platfo~1\setenv.bat /pre64 /RETAIL

-#       Targeting Windows pre64 RETAIL

-#       c:\tcl_src\win\>nmake -f makefile.vc MACHINE=IA64

-#

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

-#==============================================================================

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

-

 

-#    //==================================================================\\

-#   >>[               -> Do not modify below this line. <-               ]<<

-#   >>[  Please, use the commandline macros to modify how Tcl is built.  ]<<

-#   >>[  If you need more features, send us a patch for more macros.     ]<<

-#    \\==================================================================//

+# NOTE:

+# Before modifying this file, check whether the modification is applicable

+# to building extensions as well and if so, modify rules.vc instead.

 

+# The PROJECT macro is used by rules.vc for generating appropriate

+# macros and rules.

+PROJECT = tcl

 

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

-#==============================================================================

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

+# Default target to build if no target is specified. If unspecified, the

+# rules.vc file will set up "all" as the target.

+DEFAULT_BUILD_TARGET = release

 

-!if !exist("makefile.vc")

-MSG = ^

-You must run this makefile only from the directory it is in.^

-Please `cd` to its location first.

-!error $(MSG)

-!endif

+# We want to use our own resource file, not the standard template one.

+RCFILE = tcl.rc

 

-PROJECT = tcl

+# The rules.vc file does most of the hard work in terms of defining

+# the build configuration, macros, output directories etc.

 !include "rules.vc"

 

-STUBPREFIX      = $(PROJECT)stub

+# Tcl version info based on macros set up by rules.vc

 DOTVERSION      = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

 VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)

 

+# We need versions of various core packages to generate appropriate

+# file names during installation.

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

+!endif

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

+   && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]

+!endif

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

+   && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]

+!endif

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

+   && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc]

+!endif

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

+   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc]

+!endif

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

+   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]

+!endif

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

+   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]

+!endif

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

+   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]

+!endif

+

+!include versions.vc

+

 DDEDOTVERSION = 1.4

 DDEVERSION = $(DDEDOTVERSION:.=)

 

 REGDOTVERSION = 1.3

 REGVERSION = $(REGDOTVERSION:.=)

 

-BINROOT		= $(MAKEDIR)     # originally .

-ROOT		= $(MAKEDIR)\..  # originally ..

-

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

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

-TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)

-

-TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

-TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

-

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

-TCLSH		= $(OUT_DIR)\$(TCLSHNAME)

-

 TCLREGLIBNAME	= $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)

 TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)

 

@@ -218,22 +125,6 @@ TCLDDELIB	= $(OUT_DIR)\$(TCLDDELIBNAME)
 TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe

 CAT32		= $(OUT_DIR)\cat32.exe

 

-# Can we run what we build? IX86 runs on all architectures.

-!ifndef TCLSH_NATIVE

-!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"

-TCLSH_NATIVE	= $(TCLSH)

-!else

-!error You must explicitly set TCLSH_NATIVE for cross-compilation

-!endif

-!endif

-

-### Make sure we use backslash only.

-LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib

-BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin

-DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc

-SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\tcl$(DOTVERSION)

-INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include

-

 TCLSHOBJS = \

 	$(TMP_DIR)\tclAppInit.obj \

 !if !$(STATIC_BUILD)

@@ -460,120 +351,18 @@ TCLSTUBOBJS = \
 	$(TMP_DIR)\tclTomMathStubLib.obj \

 	$(TMP_DIR)\tclOOStubLib.obj

 

-### The following paths CANNOT have spaces in them.

-COMPATDIR	= $(ROOT)\compat

-DOCDIR		= $(ROOT)\doc

-GENERICDIR	= $(ROOT)\generic

+### The following paths CANNOT have spaces in them as they appear on

+### the left side of implicit rules.

 TOMMATHDIR	= $(ROOT)\libtommath

-TOOLSDIR	= $(ROOT)\tools

-WINDIR		= $(ROOT)\win

 PKGSDIR		= $(ROOT)\pkgs

 

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

-# Compile flags

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

-

-!if !$(DEBUG)

-!if $(OPTIMIZING)

-### This cranks the optimization level to maximize speed

-cdebug	= -O2 $(OPTIMIZATIONS)

-!else

-cdebug	=

-!endif

-!if $(SYMBOLS)

-cdebug	= $(cdebug) -Zi

-!endif

-!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"

-### Warnings are too many, can't support warnings into errors.

-cdebug	= -Zi -Od $(DEBUGFLAGS)

-!else

-cdebug	= -Zi -WX $(DEBUGFLAGS)

-!endif

-

-### Common compiler options that are architecture specific

-!if "$(MACHINE)" == "ARM"

-carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE

-!else

-carch =

-!endif

-

-### Declarations common to all compiler options

-cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE

-cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\

-

-!if $(MSVCRT)

-!if $(DEBUG) && !$(UNCHECKED)

-crt = -MDd

-!else

-crt = -MD

-!endif

-!else

-!if $(DEBUG) && !$(UNCHECKED)

-crt = -MTd

-!else

-crt = -MT

-!endif

-!endif

-

-TCL_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(TOMMATHDIR)"

-TCL_DEFINES	= -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1

-BASE_CFLAGS	= $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) $(TCL_DEFINES)

-CON_CFLAGS	= $(cflags) $(cdebug) $(crt) -DCONSOLE

-TCL_CFLAGS	= $(BASE_CFLAGS) $(OPTDEFINES)

-STUB_CFLAGS     = $(cflags) $(cdebug) $(OPTDEFINES)

+# Additional include and C macro definitions for the implicit rules

+# defined in rules.vc

+PRJ_INCLUDES	= -I"$(TOMMATHDIR)"

+PRJ_DEFINES	= -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE

 

-

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

-# Link flags

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

-

-!if $(DEBUG)

-ldebug	= -debug -debugtype:cv

-!else

-ldebug	= -release -opt:ref -opt:icf,3

-!if $(SYMBOLS)

-ldebug	= $(ldebug) -debug -debugtype:cv

-!endif

-!endif

-

-### Declarations common to all linker options

-lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)

-

-!if $(PROFILE)

-lflags	= $(lflags) -profile

-!endif

-

-!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

-lflags	= $(lflags) -nodefaultlib:libucrt.lib

-!endif

-

-!if $(ALIGN98_HACK) && !$(STATIC_BUILD)

-### Align sections for PE size savings.

-lflags	= $(lflags) -opt:nowin98

-!else if !$(ALIGN98_HACK) && $(STATIC_BUILD)

-### Align sections for speed in loading by choosing the virtual page size.

-lflags	= $(lflags) -align:4096

-!endif

-

-!if $(LOIMPACT)

-lflags	= $(lflags) -ws:aggressive

-!endif

-

-dlllflags = $(lflags) -dll

-conlflags = $(lflags) -subsystem:console

-guilflags = $(lflags) -subsystem:windows

-

-baselibs   = netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib

-# Avoid 'unresolved external symbol __security_cookie' errors.

-# c.f. http://support.microsoft.com/?id=894573

-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"

-!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500

-baselibs   = $(baselibs) bufferoverflowU.lib

-!endif

-!endif

-!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

-baselibs   = $(baselibs) ucrt.lib

-!endif

+# Additional Link libraries needed beyond those in rules.vc

+PRJ_LIBS   = netapi32.lib user32.lib userenv.lib ws2_32.lib

 

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

 # TclTest flags

@@ -595,23 +384,15 @@ dlls:	    setup $(TCLREGLIB) $(TCLDDELIB)
 all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls $(CAT32) pkgs

 tcltest:    setup $(TCLTEST) dlls $(CAT32)

 install:    install-binaries install-libraries install-docs install-pkgs

+setup:      default-setup

 

 test: test-core test-pkgs

 test-core: setup $(TCLTEST) dlls $(CAT32)

 	set TCL_LIBRARY=$(ROOT:\=/)/library

-!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"

 	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<

 		package ifneeded dde 1.4.0 [list load "$(TCLDDELIB:\=/)" dde]

 		package ifneeded registry 1.3.2 [list load "$(TCLREGLIB:\=/)" registry]

 <<

-!else

-	@echo Please wait while the tests are collected...

-	$(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log

-		package ifneeded dde 1.4.0 "$(TCLDDELIB:\=/)" dde]

-		package ifneeded registry 1.3.2 "$(TCLREGLIB:\=/)" registry]

-<<

-	type tests.log | more

-!endif

 

 runtest: setup $(TCLTEST) dlls $(CAT32)

 	set TCL_LIBRARY=$(ROOT:\=/)/library

@@ -621,55 +402,51 @@ runshell: setup $(TCLSH) dlls
 	set TCL_LIBRARY=$(ROOT:\=/)/library

 	$(DEBUGGER) $(TCLSH) $(SCRIPT)

 

-setup:

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

-	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)

-

-!if !$(STATIC_BUILD)

-$(TCLIMPLIB): $(TCLLIB)

-!endif

+!if $(STATIC_BUILD)

 

 $(TCLLIB): $(TCLOBJS)

-!if $(STATIC_BUILD)

-	$(lib32) -nologo $(LINKERFLAGS) -out:$@ @<<

+	$(LIBCMD) @<<

 $**

 <<

+

 !else

-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcl -out:$@ \

-		$(baselibs) @<<

+

+$(TCLLIB): $(TCLOBJS)

+	$(DLLCMD) @<<

 $**

 <<

 	$(_VC_MANIFEST_EMBED_DLL)

-!endif

+$(TCLIMPLIB): $(TCLLIB)

+

+!endif # $(STATIC_BUILD)

+

 

 $(TCLSTUBLIB): $(TCLSTUBOBJS)

-	$(lib32) -nologo $(LINKERFLAGS) -nodefaultlib -out:$@ $(TCLSTUBOBJS)

+	$(LIBCMD) -nodefaultlib $(TCLSTUBOBJS)

 

 $(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)

-	$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**

+	$(CONEXECMD) -stack:2300000 $**

 	$(_VC_MANIFEST_EMBED_EXE)

 

 $(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)

-	$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**

+	$(CONEXECMD) -stack:2300000 $**

 	$(_VC_MANIFEST_EMBED_EXE)

 

 !if $(STATIC_BUILD)

 $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj

-	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**

+	$(LIBCMD) $**

 !else

 $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)

-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcldde -out:$@ \

-		$** $(baselibs)

+	$(DLLCMD) $**

 	$(_VC_MANIFEST_EMBED_DLL)

 !endif

 

 !if $(STATIC_BUILD)

 $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj

-	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**

+	$(LIBCMD) $**

 !else

 $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)

-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tclreg -out:$@ \

-		$** $(baselibs)

+	$(DLLCMD) $**

 	$(_VC_MANIFEST_EMBED_DLL)

 !endif

 

@@ -706,9 +483,8 @@ clean-pkgs:
 	  )

 

 $(CAT32): $(WINDIR)\cat.c

-	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?

-	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMP_DIR)\cat.obj \

-		$(baselibs)

+	$(cc32) $(cflags) $(crt) -D_CRT_NONSTDC_NO_DEPRECATE -DCONSOLE -Fo$(TMP_DIR)\ $?

+	$(CONEXECMD) -stack:16384 $(TMP_DIR)\cat.obj

 	$(_VC_MANIFEST_EMBED_EXE)

 

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

@@ -746,9 +522,12 @@ gentommath_h:
 # Build the Windows HTML help file.

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

 

-# NOTE: you can define HHC on the command-line to override this

-!ifndef HHC

-HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""

+# NOTE: you can define HHC on the command-line to override this.

+# nmake does not set macro values if already set on the command line.

+!if defined(PROCESSOR_ARCHITECTURE) && "$(PROCESSOR_ARCHITECTURE)" == "AMD64"

+HHC="%ProgramFiles(x86)%\HTML Help Workshop\hhc.exe"

+!else

+HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe"

 !endif

 HTMLDIR=$(OUT_DIR)\html

 HTMLBASE=TclTk$(VERSION)

@@ -760,7 +539,7 @@ htmlhelp: chmsetup $(CHMFILE)
 $(CHMFILE): $(DOCDIR)\*

 	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"

 	@echo Compiling HTML help project

-	-$(HHC) <<$(HHPFILE) >NUL

+	-"$(HHC)" <<$(HHPFILE) >NUL

 [OPTIONS]

 Compatibility=1.1 or later

 Compiled file=$(HTMLBASE).chm

@@ -769,7 +548,7 @@ Display compile progress=no
 Error log file=$(HTMLBASE).log

 Full-text search=Yes

 Language=0x409 English (United States)

-Title=Tcl/Tk $(DOT_VERSION) Help

+Title=Tcl/Tk $(DOTVERSION) Help

 [FILES]

 contents.htm

 docs.css

@@ -784,76 +563,27 @@ UserCmd\*.htm
 chmsetup:

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

 

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

-# Build the old-style Windows .hlp file

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

-

-TCLHLPBASE	= $(PROJECT)$(VERSION)

-HELPFILE	= $(OUT_DIR)\$(TCLHLPBASE).hlp

-HELPCNT		= $(OUT_DIR)\$(TCLHLPBASE).cnt

-DOCTMP_DIR	= $(OUT_DIR)\$(PROJECT)_docs

-HELPRTF		= $(DOCTMP_DIR)\$(PROJECT).rtf

-MAN2HELP	= $(DOCTMP_DIR)\man2help.tcl

-MAN2HELP2	= $(DOCTMP_DIR)\man2help2.tcl

-INDEX		= $(DOCTMP_DIR)\index.tcl

-BMP		= $(DOCTMP_DIR)\feather.bmp

-BMP_NOPATH	= feather.bmp

-MAN2TCL		= $(DOCTMP_DIR)\man2tcl.exe

-

-winhelp: docsetup $(HELPFILE)

-

-docsetup:

-	@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)

-

-$(MAN2HELP) $(MAN2HELP2) $(INDEX) $(BMP): $(TOOLSDIR)\$$(@F)

-	@$(CPY) $(TOOLSDIR)\$(@F) $(@D)

-

-$(HELPFILE): $(HELPRTF) $(BMP)

-	cd $(DOCTMP_DIR)

-	start /wait hcrtf.exe -x <<$(PROJECT).hpj

-[OPTIONS]

-COMPRESS=12 Hall Zeck

-LCID=0x409 0x0 0x0 ; English (United States)

-TITLE=Tcl/Tk Reference Manual

-BMROOT=.

-CNT=$(@B).cnt

-HLP=$(@B).hlp

-

-[FILES]

-$(PROJECT).rtf

-

-[WINDOWS]

-main="Tcl/Tk Reference Manual",,27648,(r15263976),(r65535)

-

-[CONFIG]

-BrowseButtons()

-CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))

-CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))

-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)"

-

-$(MAN2TCL): $(TOOLSDIR)\$$(@B).c

-	$(cc32) $(TCL_CFLAGS) -Fo$(@D)\ $(TOOLSDIR)\$(@B).c

-	$(link32) $(conlflags) -out:$@ -stack:16384 $(@D)\man2tcl.obj

-	$(_VC_MANIFEST_EMBED_EXE)

-

-$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX) $(DOCDIR)\*

-	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)

-

 install-docs:

 !if exist("$(CHMFILE)")

 	@echo Installing compiled HTML help

 	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"

 !endif

-!if exist("$(HELPFILE)")

-	@echo Installing Windows help

-	@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"

-	@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"

-!endif

+

+# "emacs font-lock highlighting fix

+

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

+# Generate the tcl.nmake file which contains the options used to build

+# Tcl itself. This is used when building extensions.

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

+tcl-nmake: $(OUT_DIR)\tcl.nmake

+$(OUT_DIR)\tcl.nmake:

+	@type << >$@

+CORE_MACHINE = $(MACHINE)

+CORE_DEBUG = $(DEBUG)

+CORE_TCL_THREADS = $(TCL_THREADS)

+CORE_USE_THREAD_ALLOC = $(USE_THREAD_ALLOC)

+CORE_USE_WIDECHAR_API = $(USE_WIDECHAR_API)

+<<

 

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

 # Build tclConfig.sh for the TEA build system.

@@ -861,6 +591,7 @@ install-docs:
 

 tclConfig: $(OUT_DIR)\tclConfig.sh

 

+# TBD - is this tclConfig.sh file ever used? The values are incorrect!

 $(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in

 	@echo Creating tclConfig.sh

         @nmakehlp -s << $** >$@

@@ -870,7 +601,7 @@ $(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
 @TCL_MINOR_VERSION@  $(TCL_MINOR_VERSION)

 @TCL_PATCH_LEVEL@    $(TCL_PATCH_LEVEL)

 @CC@                 $(CC)

-@DEFS@               $(TCL_CFLAGS)

+@DEFS@               $(pkgcflags)

 @CFLAGS_DEBUG@       -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MDd

 @CFLAGS_OPTIMIZE@    -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MD

 @LDFLAGS_DEBUG@      -nologo -machine:$(MACHINE) -debug -debugtype:cv

@@ -878,7 +609,7 @@ $(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
 @TCL_DBGX@           $(SUFX)

 @TCL_LIB_FILE@       $(PROJECT)$(VERSION)$(SUFX).lib

 @TCL_NEEDS_EXP_FILE@

-@LIBS@               $(baselibs)

+@LIBS@               $(baselibs) $(PRJ_LIBS)

 @prefix@             $(_INSTALLDIR)

 @exec_prefix@        $(BIN_INSTALL_DIR)

 @SHLIB_CFLAGS@

@@ -887,7 +618,7 @@ $(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
 @EXTRA_CFLAGS@       -YX

 @SHLIB_LD@           $(link32) $(dlllflags)

 @STLIB_LD@           $(lib32) -nologo

-@SHLIB_LD_LIBS@      $(baselibs)

+@SHLIB_LD_LIBS@      $(baselibs) $(PRJ_LIBS)

 @SHLIB_SUFFIX@       .dll

 @DL_LIBS@

 @LDFLAGS@

@@ -938,28 +669,28 @@ gendate:
 #---------------------------------------------------------------------

 

 $(TMP_DIR)\testMain.obj: $(WINDIR)\tclAppInit.c

-	$(cc32) $(TCL_CFLAGS) -DTCL_TEST \

+	$(cc32) $(appcflags) -DTCL_TEST \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

 

 $(TMP_DIR)\tclMain2.obj: $(GENERICDIR)\tclMain.c

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -DTCL_ASCII_MAIN \

+	$(cc32) $(pkgcflags) -DTCL_ASCII_MAIN \

 	    -Fo$@ $?

 

 $(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c

-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?

+	$(cc32) $(appcflags) -Fo$@ $?

 

 $(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c

-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?

+	$(cc32) $(appcflags) -Fo$@ $?

 

 $(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c

-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?

+	$(CCAPPCMD) $?

 

 $(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c

-	$(cc32) $(TCL_CFLAGS) -I$(COMPATDIR)\zlib -DBUILD_tcl -Fo$@ $?

+	$(cc32) $(pkgcflags) -I$(COMPATDIR)\zlib -Fo$@ $?

 

 $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c

-	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) \

+	$(cc32) $(pkgcflags) \

 	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

 	-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

 	-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

@@ -973,7 +704,7 @@ $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
 	-Fo$@ $?

 

 $(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c

-	$(cc32) $(TCL_CFLAGS) \

+	$(cc32) $(appcflags) \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

 

@@ -982,17 +713,17 @@ $(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c
 

 $(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c

 !if $(STATIC_BUILD)

-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $?

+	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?

 !else

-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $?

+	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?

 !endif

 

 

 $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c

 !if $(STATIC_BUILD)

-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $?

+	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?

 !else

-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $?

+	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?

 !endif

 

 

@@ -1001,13 +732,13 @@ $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
 ### specific C run-time.

 

 $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c

-	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?

+	$(cc32) $(stubscflags) -Fo$@ $?

 

 $(TMP_DIR)\tclTomMathStubLib.obj: $(GENERICDIR)\tclTomMathStubLib.c

-	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?

+	$(cc32) $(stubscflags) -Fo$@ $?

 

 $(TMP_DIR)\tclOOStubLib.obj: $(GENERICDIR)\tclOOStubLib.c

-	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?

+	$(cc32) $(stubscflags) -Fo$@ $?

 

 $(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in

 	@nmakehlp -s << $** >$@

@@ -1028,7 +759,7 @@ depend:
 	@echo Build tclsh first!

 !else

 	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \

-		-passthru:"-DBUILD_tcl $(TCL_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

+		-passthru:"-DBUILD_tcl $(TCL_INCLUDES) $(PRJ_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

 		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<

 $(TCLOBJS)

 <<

@@ -1050,47 +781,23 @@ $(TCLOBJS)
 

 

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

-# Implicit rules.  A limitation exists with nmake that requires that

+# Implicit rules that are not covered by the common ones defined in

+# rules.vc. A limitation exists with nmake that requires that

 # source directory can not contain spaces in the path.  This an

 # absolute.

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

 

-{$(WINDIR)}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

-$<

-<<

-

 {$(TOMMATHDIR)}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

-$<

-<<

-

-{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

-$<

-<<

-

-{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

+	$(cc32) $(pkgcflags) -Fo$(TMP_DIR)\ @<<

 $<

 <<

 

 {$(COMPATDIR)\zlib}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

+	$(cc32) $(pkgcflags) -Fo$(TMP_DIR)\ @<<

 $<

 <<

 

-{$(WINDIR)}.rc{$(TMP_DIR)}.res:

-	$(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \

-	    -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \

-	    -d TCL_THREADS=$(TCL_THREADS) \

-	    -d STATIC_BUILD=$(STATIC_BUILD) \

-	    $<

-

-$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest

-

-.SUFFIXES:

-.SUFFIXES:.c .rc

+$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest $(WINDIR)\tclsh.rc

 

 

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

@@ -1111,10 +818,8 @@ install-binaries:
 	@echo Installing $(TCLSTUBLIBNAME)

 	@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"

 

-#" emacs fix

-

-install-libraries: tclConfig install-msgs install-tzdata

-	@if not exist "$(SCRIPT_INSTALL_DIR)$(NULL)" \

+install-libraries: tclConfig tcl-nmake install-msgs install-tzdata

+	@if not exist "$(SCRIPT_INSTALL_DIR)" \

 		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"

 	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9$(NULL)" \

 		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl9"

@@ -1145,6 +850,10 @@ install-libraries: tclConfig install-msgs install-tzdata
 	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"

 	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"

 	@$(CPY) "$(WINDIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"

+	@$(CPY) "$(WINDIR)\rules.vc"              "$(LIB_INSTALL_DIR)\nmake\"

+	@$(CPY) "$(WINDIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"

+	@$(CPY) "$(WINDIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"

+	@$(CPY) "$(OUT_DIR)\tcl.nmake"            "$(LIB_INSTALL_DIR)\nmake\"

 	@echo Installing library http1.0 directory

 	@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \

 	    "$(SCRIPT_INSTALL_DIR)\http1.0\"

@@ -1189,8 +898,7 @@ install-libraries: tclConfig install-msgs install-tzdata
 	@echo Installing encodings

 	@$(CPY) "$(ROOT)\library\encoding\*.enc" \

 		"$(SCRIPT_INSTALL_DIR)\encoding\"

-

-#" emacs fix

+# "emacs font-lock highlighting fix

 

 install-tzdata:

 	@echo Installing time zone data

@@ -1224,30 +932,10 @@ tidy:
 	@echo Removing $(TCLREGLIB) ...

 	@if exist $(TCLREGLIB) del $(TCLREGLIB)

 

-clean: clean-pkgs

-	@echo Cleaning $(TMP_DIR)\* ...

-	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)

-	@echo Cleaning $(WINDIR)\nmakehlp.obj ...

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

-	@echo Cleaning $(WINDIR)\nmakehlp.exe ...

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

-	@echo Cleaning $(WINDIR)\nmhlp-out.txt ...

-	@if exist $(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt

-	@echo Cleaning $(WINDIR)\_junk.pch ...

-	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch

-	@echo Cleaning $(WINDIR)\vercl.x ...

-	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x

-	@echo Cleaning $(WINDIR)\vercl.i ...

-	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i

-	@echo Cleaning $(WINDIR)\versions.vc ...

-	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

-

+clean: default-clean clean-pkgs

+hose: default-hose

 realclean: hose

 

-hose:

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

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

-

 # Local Variables:

 # mode: makefile

 # End:

diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 0439d1c..025bb99 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -39,7 +39,6 @@
 #endif
 
 
-
 /* protos */
 
 static int CheckForCompilerFeature(const char *option);
@@ -47,6 +46,7 @@ static int CheckForLinkerFeature(const char **options, int count);
 static int IsIn(const char *string, const char *substring);
 static int SubstituteFile(const char *substs, const char *filename);
 static int QualifyPath(const char *path);
+static int LocateDependency(const char *keyfile);
 static const char *GetVersionFromFile(const char *filename, const char *match, int numdots);
 static DWORD WINAPI ReadFromPipe(LPVOID args);
 
@@ -172,6 +172,18 @@ main(
 		return 2;
 	    }
 	    return QualifyPath(argv[2]);
+
+	case 'L':
+	    if (argc != 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -L keypath\n"
+		    "Emit the fully qualified path of directory containing keypath\n"
+		    "exitcodes: 0 == success, 1 == not found, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 2;
+	    }
+	    return LocateDependency(argv[2]);
 	}
     }
     chars = snprintf(msg, sizeof(msg) - 1,
@@ -701,6 +713,97 @@ QualifyPath(
 }
 
 /*
+ * Implements LocateDependency for a single directory. See that command
+ * for an explanation.
+ * Returns 0 if found after printing the directory.
+ * Returns 1 if not found but no errors.
+ * Returns 2 on any kind of error
+ * Basically, these are used as exit codes for the process.
+ */
+static int LocateDependencyHelper(const char *dir, const char *keypath)
+{
+    HANDLE hSearch;
+    char path[MAX_PATH+1];
+    int dirlen, keylen, ret;
+    WIN32_FIND_DATA finfo;
+
+    if (dir == NULL || keypath == NULL)
+	return 2; /* Have no real error reporting mechanism into nmake */
+    dirlen = strlen(dir);
+    if ((dirlen + 3) > sizeof(path))
+	return 2;
+    strncpy(path, dir, dirlen);
+    strncpy(path+dirlen, "\\*", 3);	/* Including terminating \0 */
+    keylen = strlen(keypath);
+
+#if 0 /* This function is not available in Visual C++ 6 */
+    /*
+     * Use numerics 0 -> FindExInfoStandard,
+     * 1 -> FindExSearchLimitToDirectories, 
+     * as these are not defined in Visual C++ 6
+     */
+    hSearch = FindFirstFileEx(path, 0, &finfo, 1, NULL, 0);
+#else
+    hSearch = FindFirstFile(path, &finfo);
+#endif
+    if (hSearch == INVALID_HANDLE_VALUE)
+	return 1; /* Not found */
+
+    /* Loop through all subdirs checking if the keypath is under there */
+    ret = 1; /* Assume not found */
+    do {
+	int sublen;
+	/*
+	 * We need to check it is a directory despite the 
+	 * FindExSearchLimitToDirectories in the above call. See SDK docs
+	 */
+	if ((finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+	    continue;
+	sublen = strlen(finfo.cFileName);
+	if ((dirlen+1+sublen+1+keylen+1) > sizeof(path))
+	    continue;		/* Path does not fit, assume not matched */
+	strncpy(path+dirlen+1, finfo.cFileName, sublen);
+	path[dirlen+1+sublen] = '\\';
+	strncpy(path+dirlen+1+sublen+1, keypath, keylen+1);
+	if (PathFileExists(path)) {
+	    /* Found a match, print to stdout */
+	    path[dirlen+1+sublen] = '\0';
+	    QualifyPath(path);
+	    ret = 0;
+	    break;
+	}
+    } while (FindNextFile(hSearch, &finfo));
+    FindClose(hSearch);
+    return ret;
+}
+
+/*
+ * LocateDependency --
+ *
+ *	Locates a dependency for a package.
+ *        keypath - a relative path within the package directory
+ *          that is used to confirm it is the correct directory.
+ *	The search path for the package directory is currently only
+ *      the parent and grandparent of the current working directory.
+ *      If found, the command prints 
+ *         name_DIRPATH=<full path of located directory>
+ *      and returns 0. If not found, does not print anything and returns 1.
+ */
+static int LocateDependency(const char *keypath)
+{
+    int i, ret;
+    static char *paths[] = {"..", "..\\..", "..\\..\\.."};
+    
+    for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
+	ret = LocateDependencyHelper(paths[i], keypath);
+	if (ret == 0)
+	    return ret;
+    }
+    return ret;
+}
+
+
+/*
  * Local variables:
  *   mode: c
  *   c-basic-offset: 4
diff --git a/win/rules-ext.vc b/win/rules-ext.vc
new file mode 100644
index 0000000..58c70fa
--- /dev/null
+++ b/win/rules-ext.vc
@@ -0,0 +1,118 @@
+# This file should only be included in makefiles for Tcl extensions,

+# NOT in the makefile for Tcl itself.

+

+!ifndef _RULES_EXT_VC

+

+# We need to run from the directory the parent makefile is located in.

+# nmake does not tell us what makefile was used to invoke it so parent

+# makefile has to set the MAKEFILEVC macro or we just make a guess and

+# warn if we think that is not the case.

+!if "$(MAKEFILEVC)" == ""

+

+!if exist("$(PROJECT).vc")

+MAKEFILEVC = $(PROJECT).vc

+!elseif exist("makefile.vc")

+MAKEFILEVC = makefile.vc

+!endif

+!endif # "$(MAKEFILEVC)" == ""

+

+!if !exist("$(MAKEFILEVC)")

+MSG = ^

+You must run nmake from the directory containing the project makefile.^

+If you are doing that and getting this message, set the MAKEFILEVC^

+macro to the name of the project makefile.

+!message WARNING: $(MSG)

+!endif

+

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

+!error The rules-ext.vc file is not intended for Tcl itself.

+!endif

+

+# We extract version numbers using the nmakehlp program. For now use

+# the local copy of nmakehlp. Once we locate Tcl, we will use that

+# one if it is newer.

+!if [$(CC) -nologo "nmakehlp.c" -link -subsystem:console > nul]

+!endif

+

+# First locate the Tcl directory that we are working with.

+!ifdef TCLDIR

+

+_RULESDIR = $(TCLDIR:/=\)

+

+!else

+

+# If an installation path is specified, that is also the Tcl directory.

+# Also Tk never builds against an installed Tcl, it needs Tcl sources

+!if defined(INSTALLDIR) && "$(PROJECT)" != "tk"

+_RULESDIR=$(INSTALLDIR:/=\)

+!else

+# Locate Tcl sources

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

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

+_RULESDIR = ..\..\tcl

+!else

+!include nmakehlp.out

+!endif

+

+!endif # defined(INSTALLDIR)....

+

+!endif # ifndef TCLDIR

+

+# Now look for the targets.vc file under the Tcl root. Note we check this

+# file and not rules.vc because the latter also exists on older systems.

+!if exist("$(_RULESDIR)\lib\nmake\targets.vc") # Building against installed Tcl

+_RULESDIR = $(_RULESDIR)\lib\nmake

+!elseif exist("$(_RULESDIR)\win\targets.vc")   # Building against Tcl sources

+_RULESDIR = $(_RULESDIR)\win

+!else

+# If we have not located Tcl's targets file, most likely we are compiling

+# against an older version of Tcl and so must use our own support files.

+_RULESDIR = .

+!endif

+

+!if "$(_RULESDIR)" != "."

+# Potentially using Tcl's support files. If this extension has its own

+# nmake support files, need to compare the versions and pick newer.

+

+!if exist("rules.vc") # The extension has its own copy

+

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

+   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MAJOR >> versions.vc]

+!endif

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

+   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MINOR >> versions.vc]

+!endif

+

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

+   && [nmakehlp -V "rules.vc" RULES_VERSION_MAJOR >> versions.vc]

+!endif

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

+   && [nmakehlp -V "rules.vc" RULES_VERSION_MINOR >> versions.vc]

+!endif

+!include versions.vc

+# We have a newer version of the support files, use them

+!if ($(TCL_RULES_MAJOR) != $(OUR_RULES_MAJOR)) || ($(TCL_RULES_MINOR) < $(OUR_RULES_MINOR))

+_RULESDIR = .

+!endif

+

+!endif # if exist("rules.vc")

+

+!endif # if $(_RULESDIR) != "."

+

+# Let rules.vc know what copy of nmakehlp.c to use.

+NMAKEHLPC = $(_RULESDIR)\nmakehlp.c

+

+# Get rid of our internal defines before calling rules.vc

+!undef TCL_RULES_MAJOR

+!undef TCL_RULES_MINOR

+!undef OUR_RULES_MAJOR

+!undef OUR_RULES_MINOR

+

+!if exist("$(_RULESDIR)\rules.vc")

+!message *** Using $(_RULESDIR)\rules.vc

+!include "$(_RULESDIR)\rules.vc"

+!else

+!error *** Could not locate rules.vc in $(_RULESDIR)

+!endif

+

+!endif # _RULES_EXT_VC
\ No newline at end of file
diff --git a/win/rules.vc b/win/rules.vc
index 4a3ae26..7fc51c1 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1,60 +1,435 @@
-#------------------------------------------------------------------------------

+#------------------------------------------------------------- -*- makefile -*-

 # rules.vc --

 #

-#	Microsoft Visual C++ makefile include for decoding the commandline

-#	macros.  This file does not need editing to build Tcl.

+# Part of the nmake based build system for Tcl and its extensions.

+# This file does all the hard work in terms of parsing build options,

+# compiler switches, defining common targets and macros. The Tcl makefile

+# directly includes this. Extensions include it via "rules-ext.vc".

+#

+# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for

+# detailed documentation.

 #

 # See the file "license.terms" for information on usage and redistribution

 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.

 #

 # Copyright (c) 2001-2003 David Gravereaux.

 # Copyright (c) 2003-2008 Patrick Thoyts

+# Copyright (c) 2017      Ashok P. Nadkarni

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

 

 !ifndef _RULES_VC

 _RULES_VC = 1

 

-cc32		= $(CC)   # built-in default.

-link32		= link

-lib32		= lib

-rc32		= $(RC)   # built-in default.

+# The following macros define the version of the rules.vc nmake build system

+# For modifications that are not backward-compatible, you *must* change

+# the major version.

+RULES_VERSION_MAJOR = 1

+RULES_VERSION_MINOR = 0

 

-!ifndef INSTALLDIR

-### Assume the normal default.

-_INSTALLDIR	= C:\Program Files\Tcl

+# The PROJECT macro must be defined by parent makefile.

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

+!error *** Error: Macro PROJECT not defined! Please define it before including rules.vc

+!endif

+

+!if "$(PRJ_PACKAGE_TCLNAME)" == ""

+PRJ_PACKAGE_TCLNAME = $(PROJECT)

+!endif

+

+# Also special case Tcl and Tk to save some typing later

+DOING_TCL = 0

+DOING_TK  = 0

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

+DOING_TCL = 1

+!elseif "$(PROJECT)" == "tk"

+DOING_TK = 1

+!endif

+

+!ifndef NEED_TK

+# Backwards compatibility

+!ifdef PROJECT_REQUIRES_TK

+NEED_TK = $(PROJECT_REQUIRES_TK)

 !else

-### Fix the path separators.

-_INSTALLDIR	= $(INSTALLDIR:/=\)

+NEED_TK = 0

+!endif

+!endif

+

+!ifndef NEED_TCL_SOURCE

+NEED_TCL_SOURCE = 0

+!endif

+

+!ifdef NEED_TK_SOURCE

+!if $(NEED_TK_SOURCE)

+NEED_TK = 1

+!endif

+!else

+NEED_TK_SOURCE = 0

 !endif

 

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

+# Nmake is a pretty weak environment in syntax and capabilities

+# so this file is necessarily verbose. It's broken down into

+# the following parts.

+#

+# 0. Sanity check that compiler environment is set up and initialize

+#    any built-in settings from the parent makefile

+# 1. First define the external tools used for compiling, copying etc.

+#    as this is independent of everything else.

+# 2. Figure out our build structure in terms of the directory, whether

+#    we are building Tcl or an extension, etc.

+# 3. Determine the compiler and linker versions

+# 4. Build the nmakehlp helper application

+# 5. Determine the supported compiler options and features

+# 6. Parse the OPTS macro value for user-specified build configuration

+# 7. Parse the STATS macro value for statistics instrumentation

+# 8. Parse the CHECKS macro for additional compilation checks

+# 9. Extract Tcl, and possibly Tk, version numbers from the headers

+# 10. Based on this selected configuration, construct the output

+#     directory and file paths

+# 11. Construct the paths where the package is to be installed

+# 12. Set up the actual options passed to compiler and linker based

+#     on the information gathered above.

+# 13. Define some standard build targets and implicit rules. These may

+#     be optionally disabled by the parent makefile.

+# 14. (For extensions only.) Compare the configuration of the target

+#     Tcl and the extensions and warn against discrepancies.

+#

+# One final note about the macro names used. They are as they are

+# for historical reasons. We would like legacy extensions to

+# continue to work with this make include file so be wary of

+# changing them for consistency or clarity.

+

+# 0. Sanity check compiler environment

+

+# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or

+# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)

+

+!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCINSTALLDIR) && !defined(MSSDK) && !defined(WINDOWSSDKDIR)

+MSG = ^

+Visual C++ compiler environment not initialized.

+!error $(MSG)

+!endif

+

+# We need to run from the directory the parent makefile is located in.

+# nmake does not tell us what makefile was used to invoke it so parent

+# makefile has to set the MAKEFILEVC macro or we just make a guess and

+# warn if we think that is not the case.

+!if "$(MAKEFILEVC)" == ""

+

+!if exist("$(PROJECT).vc")

+MAKEFILEVC = $(PROJECT).vc

+!elseif exist("makefile.vc")

+MAKEFILEVC = makefile.vc

+!endif

+!endif # "$(MAKEFILEVC)" == ""

+

+!if !exist("$(MAKEFILEVC)")

+MSG = ^

+You must run nmake from the directory containing the project makefile.^

+If you are doing that and getting this message, set the MAKEFILEVC^

+macro to the name of the project makefile.

+!message WARNING: $(MSG)

+!endif

+

+

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

+# 1. Define external programs being used

+

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

 # Set the proper copy method to avoid overwrite questions

 # to the user when copying files and selecting the right

 # "delete all" method.

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

 

-!if "$(OS)" == "Windows_NT"

 RMDIR	= rmdir /S /Q

-ERRNULL  = 2>NUL

-!if ![ver | find "4.0" > nul]

-CPY	= echo y | xcopy /i >NUL

-COPY	= copy >NUL

-!else

 CPY	= xcopy /i /y >NUL

+CPYDIR  = xcopy /e /i /y >NUL

 COPY	= copy /y >NUL

+MKDIR   = mkdir

+

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

+# 2. Figure out our build environment in terms of what we're building.

+#

+# (a) Tcl itself

+# (b) Tk

+# (c) a Tcl extension using libraries/includes from an *installed* Tcl

+# (d) a Tcl extension using libraries/includes from Tcl source directory

+#

+# This last is needed because some extensions still need

+# some Tcl interfaces that are not publicly exposed.

+#

+# The fragment will set the following macros:

+# ROOT - root of this module sources

+# COMPATDIR - source directory that holds compatibility sources

+# DOCDIR - source directory containing documentation files

+# GENERICDIR - platform-independent source directory

+# WINDIR - Windows-specific source directory

+# TESTDIR - directory containing test files

+# TOOLSDIR - directory containing build tools

+# _TCLDIR - root of the Tcl installation OR the Tcl sources. Not set

+#    when building Tcl itself.

+# _INSTALLDIR - native form of the installation path. For Tcl

+#    this will be the root of the Tcl installation. For extensions

+#    this will be the lib directory under the root.

+# TCLINSTALL  - set to 1 if _TCLDIR refers to

+#    headers and libraries from an installed Tcl, and 0 if built against

+#    Tcl sources. Not set when building Tcl itself. Yes, not very well

+#    named.

+# _TCL_H - native path to the tcl.h file

+#

+# If Tk is involved, also sets the following

+# _TKDIR - native form Tk installation OR Tk source. Not set if building

+#    Tk itself.

+# TKINSTALL - set 1 if _TKDIR refers to installed Tk and 0 if Tk sources

+# _TK_H - native path to the tk.h file

+

+# Root directory for sources and assumed subdirectories

+ROOT = $(MAKEDIR)\..

+# The following paths CANNOT have spaces in them as they appear on the

+# left side of implicit rules.

+!ifndef COMPATDIR

+COMPATDIR	= $(ROOT)\compat

+!endif

+!ifndef DOCDIR

+DOCDIR		= $(ROOT)\doc

+!endif

+!ifndef GENERICDIR

+GENERICDIR	= $(ROOT)\generic

+!endif

+!ifndef TOOLSDIR

+TOOLSDIR	= $(ROOT)\tools

+!endif

+!ifndef TESTDIR

+TESTDIR	= $(ROOT)\tests

+!endif

+!ifndef LIBDIR

+!if exist("$(ROOT)\library")

+LIBDIR          = $(ROOT)\library

+!else

+LIBDIR          = $(ROOT)\lib

 !endif

-!else # "$(OS)" != "Windows_NT"

-CPY	= xcopy /i >_JUNK.OUT # On Win98 NUL does not work here.

-COPY	= copy >_JUNK.OUT # On Win98 NUL does not work here.

-RMDIR	= deltree /Y

-NULL    = \NUL # Used in testing directory existence

-ERRNULL = >NUL # Win9x shell cannot redirect stderr

 !endif

-MKDIR   = mkdir

+!ifndef DEMODIR

+!if exist("$(LIBDIR)\demos")

+DEMODIR		= $(LIBDIR)\demos

+!else

+DEMODIR		= $(ROOT)\demos

+!endif

+!endif # ifndef DEMODIR

+# Do NOT enclose WINDIR in a !ifndef because Windows always defines

+# WINDIR env var to point to c:\windows!

+# TBD - This is a potentially dangerous conflict, rename WINDIR to

+# something else

+WINDIR		= $(ROOT)\win

+

+!ifndef RCDIR

+!if exist("$(WINDIR)\rc")

+RCDIR           = $(WINDIR)\rc

+!else

+RCDIR           = $(WINDIR)

+!endif

+!endif

+RCDIR = $(RCDIR:/=\)

 

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

-# Determine the host and target architectures and compiler version.

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

+# The target directory where the built packages and binaries will be installed.

+# INSTALLDIR is the (optional) path specified by the user.

+# _INSTALLDIR is INSTALLDIR using the backslash separator syntax

+!ifdef INSTALLDIR

+### Fix the path separators.

+_INSTALLDIR	= $(INSTALLDIR:/=\)

+!else

+### Assume the normal default.

+_INSTALLDIR	= $(HOMEDRIVE)\Tcl

+!endif

+

+!if $(DOING_TCL)

+

+# BEGIN Case 2(a) - Building Tcl itself

+

+# Only need to define _TCL_H

+_TCL_H = ..\generic\tcl.h

+

+# END Case 2(a) - Building Tcl itself

+

+!elseif $(DOING_TK)

+

+# BEGIN Case 2(b) - Building Tk

+

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

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

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

+!error Could not locate tcl.h. Please set the TCLDIR macro to point to the Tcl *source* directory.

+!endif

+

+_TK_H = ..\generic\tk.h

+

+# END Case 2(b) - Building Tk

+

+!else

+

+# BEGIN Case 2(c) or (d) - Building an extension other than Tk

+

+# If command line has specified Tcl location through TCLDIR, use it

+# else default to the INSTALLDIR setting

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

+

+_TCLDIR	= $(TCLDIR:/=\)

+!if exist("$(_TCLDIR)\include\tcl.h") # Case 2(c) with TCLDIR defined

+TCLINSTALL	= 1

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

+!elseif exist("$(_TCLDIR)\generic\tcl.h") # Case 2(d) with TCLDIR defined

+TCLINSTALL	= 0

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

+!endif

+

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

+

+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

+

+!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         = $(_TCLDIR)

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

+

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

+

+!endif # TCLDIR

+

+!ifndef _TCL_H

+MSG =^

+Failed to find tcl.h. The TCLDIR macro is set incorrectly or is not set and default path does not contain tcl.h.

+!error $(MSG)

+!endif

+

+# Now do the same to locate Tk headers and libs if project requires Tk

+!if $(NEED_TK)

+

+!if "$(TKDIR)" != ""

+

+_TKDIR = $(TKDIR:/=\)

+!if exist("$(_TKDIR)\include\tk.h")

+TKINSTALL      = 1

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

+!elseif exist("$(_TKDIR)\generic\tk.h")

+TKINSTALL      = 0

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

+!endif

+

+!else # TKDIR not defined

+

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

+

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

+

+!ifndef _TK_H

+MSG =^

+Failed to find tk.h. The TKDIR macro is set incorrectly or is not set and default path does not contain tk.h.

+!error $(MSG)

+!endif

+

+!endif # NEED_TK

+

+!if $(NEED_TCL_SOURCE) && $(TCLINSTALL)

+MSG = ^

+*** Warning: This extension requires the source distribution of Tcl.^

+*** Please set the TCLDIR macro to point to the Tcl sources.

+!error $(MSG)

+!endif

+

+!if $(NEED_TK_SOURCE)

+!if $(TKINSTALL)

+MSG = ^

+*** Warning: This extension requires the source distribution of Tk.^

+*** Please set the TKDIR macro to point to the Tk sources.

+!error $(MSG)

+!endif

+!endif

+

+

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

+!endif

+

+# END Case 2(c) or (d) - Building an extension

+!endif # if $(DOING_TCL)

+

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

+# 3. Determine compiler version and architecture

+# In this section, we figure out the compiler version and the

+# architecture for which we are building. This sets the

+# following macros:

+# VCVERSION - the internal compiler version as 1200, 1400, 1910 etc.

+#     This is also printed by the compiler in dotted form 19.10 etc.

+# VCVER - the "marketing version", for example Visual C++ 6 for internal

+#     compiler version 1200. This is kept only for legacy reasons as it

+#     does not make sense for recent Microsoft compilers. Only used for

+#     output directory names.

+# ARCH - set to IX86 or AMD64 depending on 32- or 64-bit target

+# NATIVE_ARCH - set to IX86 or AMD64 for the host machine

+# MACHINE - same as $(ARCH) - legacy

+# _VC_MANIFEST_EMBED_{DLL,EXE} - commands for embedding a manifest if needed

+# CFG_ENCODING - set to an character encoding.

+#   TBD - this is passed to compiler as TCL_CFGVAL_ENCODING but can't

+#   see where it is used

+

+cc32		= $(CC)   # built-in default.

+link32		= link

+lib32		= lib

+rc32		= $(RC)   # built-in default.

+

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

+# Figure out the compiler architecture and version by writing

+# the C macros to a file, preprocessing them with the C

+# preprocessor and reading back the created file

 

 _HASH=^#

 _VC_MANIFEST_EMBED_EXE=

@@ -66,16 +441,43 @@ VCVER=0
     && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \

     && ![echo ARCH=AMD64 >> vercl.x] \

     && ![echo $(_HASH)endif >> vercl.x] \

-    && ![cl -nologo -TC -P vercl.x $(ERRNULL)]

+    && ![$(cc32) -nologo -TC -P vercl.x 2>NUL]

 !include vercl.i

+!if $(VCVERSION) < 1900

 !if ![echo VCVER= ^\> vercl.vc] \

     && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]

 !include vercl.vc

 !endif

+!else

+# The simple calculation above does not apply to new Visual Studio releases

+# Keep the compiler version in its native form.

+VCVER = $(VCVERSION)

+!endif

+!endif

+

+!if ![del 2>NUL /q/f vercl.x vercl.i vercl.vc]

+!endif

+

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

+# The MACHINE macro is used by legacy makefiles so set it as well

+!ifdef MACHINE

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

+!undef MACHINE

+MACHINE = IX86

+!elseif "$(MACHINE)" == "x64"

+!undef MACHINE

+MACHINE = AMD64

+!endif

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

+!error Specified MACHINE macro $(MACHINE) does not match detected target architecture $(ARCH).

 !endif

-!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]

+!else

+MACHINE=$(ARCH)

 !endif

 

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

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

+

 !if ![reg query HKLM\Hardware\Description\System\CentralProcessor\0 /v Identifier | findstr /i x86]

 NATIVE_ARCH=IX86

 !else

@@ -88,135 +490,192 @@ _VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -ou
 _VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2

 !endif

 

-!ifndef MACHINE

-MACHINE=$(ARCH)

-!endif

-

 !ifndef CFG_ENCODING

 CFG_ENCODING	= \"cp1252\"

 !endif

 

-!message ===============================================================================

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

+# 4. Build the nmakehlp program

+# This is a helper app we need to overcome nmake's limiting

+# environment. We will call out to it to get various bits of

+# information about supported compiler options etc.

+#

+# Tcl itself will always use the nmakehlp.c program which is

+# in its own source. This is the "master" copy and kept updated.

+#

+# Extensions built against an installed Tcl will use the installed

+# copy of Tcl's nmakehlp.c if there is one and their own version

+# otherwise. In the latter case, they would also be using their own

+# rules.vc. Note that older versions of Tcl do not install nmakehlp.c

+# or rules.vc.

+#

+# Extensions built against Tcl sources will use the one from the Tcl source.

+#

+# When building an extension using a sufficiently new version of Tcl,

+# rules-ext.vc will define NMAKEHLPC appropriately to point to the

+# copy of nmakehlp.c to be used.

 

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

-# build the helper app we need to overcome nmake's limiting

-# environment.

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

+!ifndef NMAKEHLPC

+# Default to the one in the current directory (the extension's own nmakehlp.c)

+NMAKEHLPC = nmakehlp.c

 

-!if !exist(nmakehlp.exe)

-!if [$(cc32) -nologo nmakehlp.c -link -subsystem:console > nul]

+!if !$(DOING_TCL)

+!if $(TCLINSTALL)

+!if exist("$(_TCLDIR)\lib\nmake\nmakehlp.c")

+NMAKEHLPC = $(_TCLDIR)\lib\nmake\nmakehlp.c

 !endif

+!else # ! $(TCLINSTALL)

+!if exist("$(_TCLDIR)\win\nmakehlp.c")

+NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c

 !endif

+!endif # $(TCLINSTALL)

+!endif # !$(DOING_TCL)

 

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

-# Test for compiler features

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

+!endif # NMAKEHLPC

 

-### test for optimizations

-!if [nmakehlp -c -Ot]

-!message *** Compiler has 'Optimizations'

-OPTIMIZING	= 1

-!else

-!message *** Compiler does not have 'Optimizations'

-OPTIMIZING	= 0

+# We always build nmakehlp even if it exists since we do not know

+# what source it was built from.

+!message *** Using $(NMAKEHLPC)

+!if [$(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console > nul]

 !endif

 

-OPTIMIZATIONS   =

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

+# 5. Test for compiler features

+# Visual C++ compiler options have changed over the years. Check

+# which options are supported by the compiler in use.

+#

+# The following macros are set:

+# OPTIMIZATIONS - the compiler flags to be used for optimized builds

+# DEBUGFLAGS - the compiler flags to be used for debug builds

+# LINKERFLAGS - Flags passed to the linker 

+#

+# Note that these are the compiler settings *available*, not those

+# that will be *used*. The latter depends on the OPTS macro settings

+# which we have not yet parsed.

+#

+# Also note that some of the flags in OPTIMIZATIONS are not really

+# related to optimization. They are placed there only for legacy reasons

+# as some extensions expect them to be included in that macro.

 

-!if [nmakehlp -c -Ot]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Ot

+# -Op improves float consistency. Note only needed for older compilers

+# Newer compilers do not need or support this option.

+!if [nmakehlp -c -Op]

+FPOPTS  = -Op

 !endif

 

-!if [nmakehlp -c -Oi]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Oi

+# Strict floating point semantics - present in newer compilers in lieu of -Op

+!if [nmakehlp -c -fp:strict]

+FPOPTS  = $(FPOPTS) -fp:strict

 !endif

 

-!if [nmakehlp -c -Op]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Op

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

+### test for pentium errata

+!if [nmakehlp -c -QI0f]

+!message *** Compiler has 'Pentium 0x0f fix'

+FPOPTS  = $(FPOPTS) -QI0f

+!else

+!message *** Compiler does not have 'Pentium 0x0f fix'

 !endif

-

-!if [nmakehlp -c -fp:strict]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -fp:strict

 !endif

 

-!if [nmakehlp -c -Gs]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Gs

+### test for optimizations

+# /O2 optimization includes /Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy as per

+# documentation. Note we do NOT want /Gs as that inserts a _chkstk

+# stack probe at *every* function entry, not just those with more than

+# a page of stack allocation resulting in a performance hit.  However,

+# /O2 documentation is misleading as its stack probes are simply the

+# default page size locals allocation probes and not what is implied

+# by an explicit /Gs option.

+

+OPTIMIZATIONS = $(FPOPTS)

+

+!if [nmakehlp -c -O2]

+!message *** Compiler has 'Optimizations'

+OPTIMIZING = 1

+OPTIMIZATIONS   = $(OPTIMIZATIONS) -O2

+!else

+# Legacy, really. All modern compilers support this

+!message *** Compiler does not have 'Optimizations'

+OPTIMIZING = 0

 !endif

 

+# Checks for buffer overflows in local arrays

 !if [nmakehlp -c -GS]

 OPTIMIZATIONS  = $(OPTIMIZATIONS) -GS

 !endif

 

+# Link time optimization. Note that this option (potentially) makes

+# generated libraries only usable by the specific VC++ version that

+# created it. Requires /LTCG linker option

 !if [nmakehlp -c -GL]

 OPTIMIZATIONS  = $(OPTIMIZATIONS) -GL

+CC_GL_OPT_ENABLED = 1

+!else

+# In newer compilers -GL and -YX are incompatible.

+!if [nmakehlp -c -YX]

+OPTIMIZATIONS  = $(OPTIMIZATIONS) -YX

 !endif

+!endif # [nmakehlp -c -GL]

 

-DEBUGFLAGS     =

+DEBUGFLAGS     = $(FPOPTS)

 

+# Run time error checks. Not available or valid in a release, non-debug build

+# RTC is for modern compilers, -GZ is legacy

 !if [nmakehlp -c -RTC1]

 DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1

 !elseif [nmakehlp -c -GZ]

 DEBUGFLAGS     = $(DEBUGFLAGS) -GZ

 !endif

 

-COMPILERFLAGS  =-W3 /DUNICODE /D_UNICODE /D_ATL_XP_TARGETING

-

-# In v13 -GL and -YX are incompatible.

-!if [nmakehlp -c -YX]

-!if ![nmakehlp -c -GL]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -YX

-!endif

-!endif

-

-!if "$(MACHINE)" == "IX86"

-### test for pentium errata

-!if [nmakehlp -c -QI0f]

-!message *** Compiler has 'Pentium 0x0f fix'

-COMPILERFLAGS  = $(COMPILERFLAGS) -QI0f

-!else

-!message *** Compiler does not have 'Pentium 0x0f fix'

-!endif

-!endif

-

-!if "$(MACHINE)" == "IA64"

-### test for Itanium errata

-!if [nmakehlp -c -QIA64_Bx]

-!message *** Compiler has 'B-stepping errata workarounds'

-COMPILERFLAGS   = $(COMPILERFLAGS) -QIA64_Bx

-!else

-!message *** Compiler does not have 'B-stepping errata workarounds'

-!endif

-!endif

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

+# Linker flags

 

-# Prevents "LNK1561: entry point must be defined" error compiling from VS-IDE:

+# LINKER_TESTFLAGS are for internal use when we call nmakehlp to test

+# if the linker supports a specific option. Without these flags link will

+# return "LNK1561: entry point must be defined" error compiling from VS-IDE:

+# They are not passed through to the actual application / extension

+# link rules.

 !ifndef LINKER_TESTFLAGS

-LINKER_TESTFLAGS = /DLL /NOENTRY /OUT:nmhlp-out.txt

-!endif

-

-!if "$(MACHINE)" == "IX86"

-### test for -align:4096, when align:512 will do.

-!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]

-!message *** Linker has 'Win98 alignment problem'

-ALIGN98_HACK	= 1

-!else

-!message *** Linker does not have 'Win98 alignment problem'

-ALIGN98_HACK	= 0

-!endif

-!else

-ALIGN98_HACK	= 0

+LINKER_TESTFLAGS = /DLL /NOENTRY /OUT:nmakehlp.out

 !endif

 

 LINKERFLAGS     =

 

+# If compiler has enabled link time optimization, linker must too with -ltcg

+!ifdef CC_GL_OPT_ENABLED

 !if [nmakehlp -l -ltcg $(LINKER_TESTFLAGS)]

-LINKERFLAGS     =-ltcg

-!endif

-

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

-# Decode the options requested.

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

-

-!if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]

+LINKERFLAGS     = $(LINKERFLAGS) -ltcg

+!endif

+!endif

+

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

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

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

+# PGO     - 1 -> profile based optimization, 0 -> no

+# MSVCRT  - 1 -> link to dynamic C runtime even when building static Tcl build

+#           0 -> link to static C runtime for static Tcl build.

+#           Does not impact shared Tcl builds (STATIC_BUILD == 0)

+# TCL_USE_STATIC_PACKAGES - 1 -> statically link the registry and dde extensions

+#           in the Tcl shell. 0 -> keep them as shared libraries

+#           Does not impact shared Tcl builds.

+# USE_THREAD_ALLOC - 1 -> Use a shared global free pool for allocation.

+#           0 -> Use the non-thread allocator.

+# UNCHECKED - 1 -> when doing a debug build with symbols, use the release

+#           C runtime, 0 -> use the debug C runtime.

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

+# Further, LINKERFLAGS are modified based on above.

+

+# Default values for all the above

 STATIC_BUILD	= 0

 TCL_THREADS	= 1

 DEBUG		= 0

@@ -224,17 +683,32 @@ SYMBOLS		= 0
 PROFILE		= 0

 PGO		= 0

 MSVCRT		= 1

-LOIMPACT	= 0

 TCL_USE_STATIC_PACKAGES	= 0

 USE_THREAD_ALLOC = 1

 UNCHECKED	= 0

+CONFIG_CHECK    = 1

+!if $(DOING_TCL)

+USE_STUBS       = 0

 !else

+USE_STUBS       = 1

+!endif

+

+# If OPTS is not empty AND does not contain "none" which turns off all OPTS

+# set the above macros based on OPTS content

+!if "$(OPTS)" != "" && ![nmakehlp -f "$(OPTS)" "none"]

+

+# OPTS are specified, parse them

+

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

 !message *** Doing static

 STATIC_BUILD	= 1

-!else

-STATIC_BUILD	= 0

 !endif

+

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

+!message *** Not using stubs

+USE_STUBS	= 0

+!endif

+

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

 !message *** Doing nomsvcrt

 MSVCRT		= 0

@@ -249,13 +723,15 @@ MSVCRT		= 1
 MSVCRT		= 0

 !endif

 !endif

-!endif

+!endif # [nmakehlp -f $(OPTS) "nomsvcrt"]

+

 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)

 !message *** Doing staticpkg

 TCL_USE_STATIC_PACKAGES	= 1

 !else

 TCL_USE_STATIC_PACKAGES	= 0

 !endif

+

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

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

 TCL_THREADS	= 0

@@ -264,24 +740,28 @@ USE_THREAD_ALLOC= 0
 TCL_THREADS	= 1

 USE_THREAD_ALLOC= 1

 !endif

+

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

 !message *** Doing symbols

 DEBUG		= 1

 !else

 DEBUG		= 0

 !endif

+

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

 !message *** Doing pdbs

 SYMBOLS		= 1

 !else

 SYMBOLS		= 0

 !endif

+

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

 !message *** Doing profile

 PROFILE		= 1

 !else

 PROFILE		= 0

 !endif

+

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

 !message *** Doing profile guided optimization instrumentation

 PGO		= 1

@@ -291,44 +771,229 @@ PGO		= 2
 !else

 PGO		= 0

 !endif

+

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

-!message *** Doing loimpact

-LOIMPACT	= 1

-!else

-LOIMPACT	= 0

+!message *** Warning: ignoring option "loimpact" - deprecated on modern Windows.

 !endif

+

+# TBD - should get rid of this option

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

 !message *** Doing thrdalloc

 USE_THREAD_ALLOC = 1

 !endif

+

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

-!message *** Doing tclalloc

 USE_THREAD_ALLOC = 0

 !endif

+

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

 !message *** Doing unchecked

 UNCHECKED = 1

 !else

 UNCHECKED = 0

 !endif

+

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

+CONFIG_CHECK = 1

+!else

+CONFIG_CHECK = 0

 !endif

 

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

-# Figure-out how to name our intermediate and output directories.

-# We wouldn't want different builds to use the same .obj files

-# by accident.

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

+!endif # "$(OPTS)" != ""  && ... parsing of OPTS

+

+# Set linker flags based on above

+

+!if $(PGO) > 1

+!if [nmakehlp -l -ltcg:pgoptimize $(LINKER_TESTFLAGS)]

+LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize

+!else

+MSG=^

+This compiler does not support profile guided optimization.

+!error $(MSG)

+!endif

+!elseif $(PGO) > 0

+!if [nmakehlp -l -ltcg:pginstrument $(LINKER_TESTFLAGS)]

+LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument

+!else

+MSG=^

+This compiler does not support profile guided optimization.

+!error $(MSG)

+!endif

+!endif

+

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

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

+# TCL_COMPILE_DEBUG - 1 -> enables byte compiler logging

+#                     0 -> disables

+

+# Default both are off

+TCL_MEM_DEBUG	    = 0

+TCL_COMPILE_DEBUG   = 0

+

+!if "$(STATS)" != "" && ![nmakehlp -f "$(STATS)" "none"]

+

+!if [nmakehlp -f $(STATS) "memdbg"]

+!message *** Doing memdbg

+TCL_MEM_DEBUG	    = 1

+!else

+TCL_MEM_DEBUG	    = 0

+!endif

 

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

-# Naming convention:

+!if [nmakehlp -f $(STATS) "compdbg"]

+!message *** Doing compdbg

+TCL_COMPILE_DEBUG   = 1

+!else

+TCL_COMPILE_DEBUG   = 0

+!endif

+

+!endif

+

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

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

+#                     0 -> enable deprecated functions

+

+# Defaults - Permit deprecated functions and warning level 3

+TCL_NO_DEPRECATED	    = 0

+WARNINGS		    = -W3

+

+!if "$(CHECKS)" != "" && ![nmakehlp -f "$(CHECKS)" "none"]

+

+!if [nmakehlp -f $(CHECKS) "nodep"]

+!message *** Doing nodep check

+TCL_NO_DEPRECATED	    = 1

+!endif

+

+!if [nmakehlp -f $(CHECKS) "fullwarn"]

+!message *** Doing full warnings check

+WARNINGS		    = -W4

+!if [nmakehlp -l -warn:3 $(LINKER_TESTFLAGS)]

+LINKERFLAGS		    = $(LINKERFLAGS) -warn:3

+!endif

+!endif

+

+!if [nmakehlp -f $(CHECKS) "64bit"] && [nmakehlp -c -Wp64]

+!message *** Doing 64bit portability warnings

+WARNINGS		    = $(WARNINGS) -Wp64

+!endif

+

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

+# TCL_VERSION

+# TK_MAJOR_VERSION

+# TK_MINOR_VERSION

+# 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_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_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 defined(_TK_H)

+TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)

+TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)

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

+

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

+# 10. Construct output directory and file paths

+# Figure-out how to name our intermediate and output directories.

+# In order to avoid inadvertent mixing of object files built using

+# different compilers, build configurations etc.,

+#

+# Naming convention (suffixes):

 #   t = full thread support.

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

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

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

+#

+# The following macros are set in this section:

+# SUFX - the suffix to use for binaries based on above naming convention

+# BUILDDIRTOP - the toplevel default output directory

+#      is of the form {Release,Debug}[_AMD64][_COMPILERVERSION]

+# TMP_DIR - directory where object files are created

+# OUT_DIR - directory where output executables are created

+# Both TMP_DIR and OUT_DIR are defaulted only if not defined by the

+# parent makefile (or command line). The default values are

+# based on BUILDDIRTOP.

+# STUBPREFIX - name of the stubs library for this project

+# PRJIMPLIB - output path of the generated project import library

+# PRJLIBNAME - name of generated project library

+# PRJLIB     - output path of generated project library

+# PRJSTUBLIBNAME - name of the generated project stubs library

+# PRJSTUBLIB - output path of the generated project stubs library

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

+

 SUFX	    = tsgx

 

 !if $(DEBUG)

@@ -381,80 +1046,185 @@ OUT_DIR	    = $(TMP_DIR)
 !endif

 !endif

 

-

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

-# Decode the statistics requested.

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

-

-!if "$(STATS)" == "" || [nmakehlp -f "$(STATS)" "none"]

-TCL_MEM_DEBUG	    = 0

-TCL_COMPILE_DEBUG   = 0

-!else

-!if [nmakehlp -f $(STATS) "memdbg"]

-!message *** Doing memdbg

-TCL_MEM_DEBUG	    = 1

-!else

-TCL_MEM_DEBUG	    = 0

-!endif

-!if [nmakehlp -f $(STATS) "compdbg"]

-!message *** Doing compdbg

-TCL_COMPILE_DEBUG   = 1

-!else

-TCL_COMPILE_DEBUG   = 0

+# Relative paths -> absolute

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

+   || [nmakehlp -Q "$(OUT_DIR)" >> nmakehlp.out]

+!error *** Could not fully qualify path OUT_DIR=$(OUT_DIR)

 !endif

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

+   || [nmakehlp -Q "$(TMP_DIR)" >> nmakehlp.out]

+!error *** Could not fully qualify path TMP_DIR=$(TMP_DIR)

 !endif

+!include nmakehlp.out

 

+# The name of the stubs library for the project being built

+STUBPREFIX      = $(PROJECT)stub

 

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

-# Decode the checks requested.

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

+# Set up paths to various Tcl executables and libraries needed by extensions

+!if $(DOING_TCL)

 

-!if "$(CHECKS)" == "" || [nmakehlp -f "$(CHECKS)" "none"]

-TCL_NO_DEPRECATED	    = 0

-WARNINGS		    = -W3

-!else

-!if [nmakehlp -f $(CHECKS) "nodep"]

-!message *** Doing nodep check

-TCL_NO_DEPRECATED	    = 1

-!else

-TCL_NO_DEPRECATED	    = 0

-!endif

-!if [nmakehlp -f $(CHECKS) "fullwarn"]

-!message *** Doing full warnings check

-WARNINGS		    = -W4

-!if [nmakehlp -l -warn:3 $(LINKER_TESTFLAGS)]

-LINKERFLAGS		    = $(LINKERFLAGS) -warn:3

-!endif

-!else

-WARNINGS		    = -W3

-!endif

-!if [nmakehlp -f $(CHECKS) "64bit"] && [nmakehlp -c -Wp64]

-!message *** Doing 64bit portability warnings

-WARNINGS		    = $(WARNINGS) -Wp64

-!endif

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

+TCLSH		= $(OUT_DIR)\$(TCLSHNAME)

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

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

+TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)

+

+TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

+TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

+TCL_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"

+

+!else # ! $(DOING_TCL)

+

+!if $(TCLINSTALL) # Building against an installed Tcl

+

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

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

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

 !endif

+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\tcldde14$(SUFX:t=).lib

+TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target

+TCL_INCLUDES    = -I"$(_TCLDIR)\include"

 

-!if $(PGO) > 1

-!if [nmakehlp -l -ltcg:pgoptimize $(LINKER_TESTFLAGS)]

-LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize

-!else

-MSG=^

-This compiler does not support profile guided optimization.

-!error $(MSG)

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

-!elseif $(PGO) > 0

-!if [nmakehlp -l -ltcg:pginstrument $(LINKER_TESTFLAGS)]

-LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument

+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)\tcldde14$(SUFX:t=).lib

+TCLTOOLSDIR	= $(_TCLDIR)\tools

+TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"

+

+!endif # TCLINSTALL

+

+tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"

+

+!endif # $(DOING_TCL)

+

+# We need a tclsh that will run on the host machine as part of the build.

+# IX86 runs on all architectures.

+!ifndef TCLSH_NATIVE

+!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"

+TCLSH_NATIVE	= $(TCLSH)

 !else

-MSG=^

-This compiler does not support profile guided optimization.

-!error $(MSG)

+!error You must explicitly set TCLSH_NATIVE for cross-compilation

 !endif

 !endif

 

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

-# Set our defines now armed with our options.

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

+# Do the same for Tk and Tk extensions that require the Tk libraries

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

+WISHNAMEPREFIX = wish

+WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe

+TKLIBNAME	= $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)

+TKSTUBLIBNAME	= tkstub$(TK_VERSION).lib

+TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib

+

+!if $(DOING_TK)

+WISH 		= $(OUT_DIR)\$(WISHNAME)

+TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)

+TKIMPLIB	= $(OUT_DIR)\$(TKIMPLIBNAME)

+TKLIB		= $(OUT_DIR)\$(TKLIBNAME)

+TK_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"

+

+!else # effectively NEED_TK

+

+!if $(TKINSTALL) # Building against installed Tk

+WISH		= $(_TKDIR)\bin\$(WISHNAME)

+TKSTUBLIB	= $(_TKDIR)\lib\$(TKSTUBLIBNAME)

+TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)

+TK_INCLUDES     = -I"$(_TKDIR)\include"

+!else # Building against Tk sources

+WISH		= $(_TKDIR)\win\$(BUILDDIRTOP)\$(WISHNAME)

+TKSTUBLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSTUBLIBNAME)

+TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

+TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"

+!endif # TKINSTALL

+tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"

+

+!endif # $(DOING_TK)

+!endif # $(DOING_TK) || $(NEED_TK)

+

+# Various output paths

+PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

+PRJLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

+PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)

+

+PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

+PRJSTUBLIB	= $(OUT_DIR)\$(PRJSTUBLIBNAME)

+

+# If extension parent makefile has not defined a resource definition file,

+# we will generate one from standard template.

+!if !$(DOING_TCL) && !$(DOING_TK) && !$(STATIC_BUILD)

+!ifdef RCFILE

+RESFILE = $(TMP_DIR)\$(RCFILE:.rc=.res)

+!else

+RESFILE = $(TMP_DIR)\$(PROJECT).res

+!endif

+!endif

+

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

+# 11. Construct the paths for the installation directories

+# The following macros get defined in this section:

+# LIB_INSTALL_DIR - where libraries should be installed

+# BIN_INSTALL_DIR - where the executables should be installed

+# DOC_INSTALL_DIR - where documentation should be installed

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

+

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

+LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib

+BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin

+DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc

+!if $(DOING_TCL)

+SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

+!else # DOING_TK

+SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)

+!endif

+DEMO_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)\demos

+INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include

+

+!else # extension other than Tk

+

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

+LIB_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

+BIN_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

+DOC_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

+SCRIPT_INSTALL_DIR	= $(PRJ_INSTALL_DIR)

+DEMO_INSTALL_DIR	= $(PRJ_INSTALL_DIR)\demos

+INCLUDE_INSTALL_DIR	= $(_TCLDIR)\include

+

+!endif

+

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

+# 12. Set up actual options to be passed to the compiler and linker

+# Now we have all the information we need, set up the actual flags and

+# options that we will pass to the compiler and linker. The main

+# makefile should use these in combination with whatever other flags

+# and switches are specific to it.

+# The following macros are defined, names are for historical compatibility:

+# OPTDEFINES - /Dxxx C macro flags based on user-specified OPTS

+# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration opttions

+# crt - Compiler switch that selects the appropriate C runtime

+# cdebug - Compiler switches related to debug AND optimizations

+# cwarn - Compiler switches that set warning levels

+# cflags - complete compiler switches (subsumes cdebug and cwarn)

+# ldebug - Linker switches controlling debug information and optimization

+# lflags - complete linker switches (subsumes ldebug) except subsystem type

+# dlllflags - complete linker switches to build DLLs (subsumes lflags)

+# conlflags - complete linker switches for console program (subsumes lflags)

+# guilflags - complete linker switches for GUI program (subsumes lflags)

+# baselibs - minimum Windows libraries required. Parent makefile can

+#    define PRJ_LIBS before including rules.rc if additional libs are needed

 

 OPTDEFINES	= -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS

 

@@ -477,6 +1247,17 @@ OPTDEFINES	= $(OPTDEFINES) -DSTATIC_BUILD
 OPTDEFINES	= $(OPTDEFINES) -DTCL_NO_DEPRECATED

 !endif

 

+!if $(USE_STUBS)

+# Note we do not define USE_TCL_STUBS even when building tk since some

+# test targets in tk do not use stubs

+!if ! $(DOING_TCL)

+USE_STUBS_DEFS  = -DUSE_TCL_STUBS -DUSE_TCLOO_STUBS

+!if $(NEED_TK)

+USE_STUBS_DEFS  = $(USE_STUBS_DEFS) -DUSE_TK_STUBS

+!endif

+!endif

+!endif # USE_STUBS

+

 !if !$(DEBUG)

 OPTDEFINES	= $(OPTDEFINES) -DNDEBUG

 !if $(OPTIMIZING)

@@ -486,223 +1267,457 @@ OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_OPTIMIZED
 !if $(PROFILE)

 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_PROFILED

 !endif

-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"

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

 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DO64BIT

 !endif

 !if $(VCVERSION) < 1300

 OPTDEFINES	= $(OPTDEFINES) -DNO_STRTOI64

 !endif

 

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

-# Locate the Tcl headers to build against

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

-

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

-

-_TCL_H          = ..\generic\tcl.h

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

+COMPILERFLAGS  = /D_ATL_XP_TARGETING

 

+# Following is primarily for the benefit of extensions. Tcl 8.5 builds

+# Tcl without /DUNICODE, while 8.6 builds with it defined. When building

+# an extension, it is advisable (but not mandated) to use the same Windows

+# API as the Tcl build. This is accordingly defaulted below. A particular

+# extension can override this by pre-definining USE_WIDECHAR_API.

+!ifndef USE_WIDECHAR_API

+!if $(TCL_VERSION) > 85

+USE_WIDECHAR_API = 1

 !else

+USE_WIDECHAR_API = 0

+!endif

+!endif

 

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

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

-_INSTALLDIR=$(_INSTALLDIR)\lib

+!if $(USE_WIDECHAR_API)

+COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE 

 !endif

 

-!if !defined(TCLDIR)

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

-TCLINSTALL	= 1

-_TCLDIR		= $(_INSTALLDIR)\..

-_TCL_H          = $(_INSTALLDIR)\..\include\tcl.h

-TCLDIR          = $(_INSTALLDIR)\..

+# Like the TEA system only set this non empty for non-Tk extensions

+# Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME

+# so we pass both

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

+PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

+               -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

+               -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \

+               -DMODULE_SCOPE=extern 

+!endif

+

+# crt picks the C run time based on selected OPTS

+!if $(MSVCRT)

+!if $(DEBUG) && !$(UNCHECKED)

+crt = -MDd

 !else

-MSG=^

-Failed to find tcl.h.  Set the TCLDIR macro.

-!error $(MSG)

+crt = -MD

 !endif

 !else

-_TCLDIR	= $(TCLDIR:/=\)

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

-TCLINSTALL	= 1

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

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

-TCLINSTALL	= 0

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

+!if $(DEBUG) && !$(UNCHECKED)

+crt = -MTd

 !else

-MSG =^

-Failed to find tcl.h.  The TCLDIR macro does not appear correct.

-!error $(MSG)

-!endif

+crt = -MT

 !endif

 !endif

 

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

-# Extract various version numbers from tcl headers

-# The generated file is then included in the makefile.

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

+# cdebug includes compiler options for debugging as well as optimization.

+!if $(DEBUG)

 

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

+# In debugging mode, optimizations need to be disabled

+cdebug = -Zi -Od $(DEBUGFLAGS)

+

+!else

+

+cdebug = $(OPTIMIZATIONS)

+!if $(SYMBOLS)

+cdebug = $(cdebug) -Zi

 !endif

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

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

+

+!endif # $(DEBUG)

+

+# cwarn includes default warning levels.

+cwarn = $(WARNINGS)

+

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

+# Disable pointer<->int warnings related to cast between different sizes

+# There are a gadzillion of these due to use of ClientData and

+# clutter up compiler

+# output increasing chance of a real warning getting lost. So disable them.

+# Eventually some day, Tcl will be 64-bit clean.

+cwarn = $(cwarn) -wd4311 -wd4312

 !endif

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

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

+

+### Common compiler options that are architecture specific

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

+carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE

+!else

+carch =

 !endif

 

-# If building the tcl core then we need additional package versions

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

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

-   && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]

+!if $(DEBUG)

+# Turn warnings into errors

+cwarn = $(cwarn) -WX

 !endif

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

-   && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]

+

+INCLUDES = $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES)

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

+INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WINDIR)" -I"$(COMPATDIR)"

 !endif

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

-   && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc]

+

+# These flags are defined roughly in the order of the pre-reform

+# rules.vc/makefile.vc to help visually compare that the pre- and

+# post-reform build logs

+

+# cflags contains generic flags used for building practically all object files

+cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug)

+

+# appcflags contains $(cflags) and flags for building the application

+# object files (e.g. tclsh, or wish) pkgcflags contains $(cflags) plus

+# flags used for building shared object files The two differ in the

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

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

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

+

+# stubscflags contains $(cflags) plus flags used for building a stubs

+# library for the package.  Note: -DSTATIC_BUILD is defined in

+# $(OPTDEFINES) only if the OPTS configuration indicates a static

+# library. However the stubs library is ALWAYS static hence included

+# here irrespective of the OPTS setting.

+#

+# TBD - tclvfs has a comment that stubs libs should not be compiled with -GL

+# without stating why. Tcl itself compiled stubs libs with this flag.

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

+

+# Link flags 

+

+!if $(DEBUG)

+ldebug	= -debug -debugtype:cv

+!else

+ldebug	= -release -opt:ref -opt:icf,3

+!if $(SYMBOLS)

+ldebug	= $(ldebug) -debug -debugtype:cv

 !endif

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

-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc]

 !endif

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

-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]

+

+# Note: Profiling is currently only possible with the Visual Studio Enterprise

+!if $(PROFILE)

+ldebug= $(ldebug) -profile

 !endif

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

-   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]

+

+### Declarations common to all linker versions 

+lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)

+

+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

+lflags	= $(lflags) -nodefaultlib:libucrt.lib

 !endif

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

-   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]

+

+# Old linkers (Visual C++ 6 in particular) will link for fast loading

+# on Win98. Since we do not support Win98 any more, we specify nowin98

+# as recommended for NT and later. However, this is only required by

+# IX86 on older compilers and only needed if we are not doing a static build.

+

+!if "$(MACHINE)" == "IX86" && !$(STATIC_BUILD)

+!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]

+# Align sections for PE size savings.

+lflags	= $(lflags) -opt:nowin98

 !endif

 !endif

 

-!include versions.vc

-

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

-# Setup tcl version dependent stuff headers

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

+dlllflags = $(lflags) -dll

+conlflags = $(lflags) -subsystem:console

+guilflags = $(lflags) -subsystem:windows

 

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

+# Libraries that are required for every image.

+# Extensions should define any additional libraries with $(PRJ_LIBS)

+winlibs   = kernel32.lib advapi32.lib

 

-TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)

+!if $(NEED_TK)

+winlibs = $(winlibs) gdi32.lib user32.lib uxtheme.lib

+!endif

 

-!if $(TCLINSTALL)

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

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

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

+# Avoid 'unresolved external symbol __security_cookie' errors.

+# c.f. http://support.microsoft.com/?id=894573

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

+!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500

+winlibs   = $(winlibs) bufferoverflowU.lib

 !endif

-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\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"

-!else

-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

-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)\tcldde14$(SUFX:t=).lib"

-COFFBASE	= "$(_TCLDIR)\win\coffbase.txt"

-TCLTOOLSDIR	= $(_TCLDIR)\tools

-TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"

 !endif

 

+baselibs = $(winlibs) $(PRJ_LIBS)

+

+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

+baselibs   = $(baselibs) ucrt.lib

 !endif

 

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

-# Locate the Tk headers to build against

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

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

+# 13. Define standard commands, common make targets and implicit rules

 

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

-_TK_H          = ..\generic\tk.h

-_INSTALLDIR    = $(_INSTALLDIR)\..

-!endif

+CCPKGCMD = $(cc32) $(pkgcflags) -Fo$(TMP_DIR)^\

+CCAPPCMD = $(cc32) $(appcflags) -Fo$(TMP_DIR)^\

+CCSTUBSCMD = $(cc32) $(stubscflags) -Fo$(TMP_DIR)^\

 

-!ifdef PROJECT_REQUIRES_TK

-!if !defined(TKDIR)

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

-TKINSTALL      = 1

-_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)

+LIBCMD = $(lib32) -nologo $(LINKERFLAGS) -out:$@

+DLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)

+

+CONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)

+GUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)

+RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \

+	    $(TCL_INCLUDES) \

+	    -DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \

+	    -DCOMMAVERSION=$(DOTVERSION:.=,),0 \

+	    -DDOTVERSION=\"$(DOTVERSION)\" \

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

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

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

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

+

+!ifndef DEFAULT_BUILD_TARGET

+DEFAULT_BUILD_TARGET = $(PROJECT)

 !endif

+

+default-target: $(DEFAULT_BUILD_TARGET)

+

+default-pkgindex:

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

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

+

+default-pkgindex-tea:

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

+@PACKAGE_VERSION@    $(DOTVERSION)

+@PACKAGE_NAME@       $(PRJ_PACKAGE_TCLNAME)

+@PACKAGE_TCLNAME@    $(PRJ_PACKAGE_TCLNAME)

+@PKG_LIB_FILE@       $(PRJLIBNAME)

+<<

+

+

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

+

+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

+

+default-install-libraries: $(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)'

+	@$(CPY) $(OUT_DIR)\pkgIndex.tcl $(SCRIPT_INSTALL_DIR)

+

+default-install-stubs:

+	@echo Installing stubs library to '$(SCRIPT_INSTALL_DIR)'

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

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

+

+default-install-docs-html:

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

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

+	@if exist $(DOCDIR) for %f in ("$(DOCDIR)\*.html" "$(DOCDIR)\*.css" "$(DOCDIR)\*.png") do @$(COPY) %f "$(DOC_INSTALL_DIR)"

+

+default-install-docs-n:

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

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

+	@if exist $(DOCDIR) for %f in ("$(DOCDIR)\*.n") do @$(COPY) %f "$(DOC_INSTALL_DIR)"

+

+default-install-demos:

+	@echo Installing demos to '$(DEMO_INSTALL_DIR)'

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

+	@if exist $(DEMODIR) $(CPYDIR) "$(DEMODIR)" "$(DEMO_INSTALL_DIR)"

+

+default-clean:

+	@echo Cleaning $(TMP_DIR)\* ...

+	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)

+	@echo Cleaning $(WINDIR)\nmakehlp.obj, nmakehlp.exe ...

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

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

+	@if exist $(WINDIR)\nmakehlp.out del $(WINDIR)\nmakehlp.out

+	@echo Cleaning $(WINDIR)\nmhlp-out.txt ...

+	@if exist $(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt

+	@echo Cleaning $(WINDIR)\_junk.pch ...

+	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch

+	@echo Cleaning $(WINDIR)\vercl.x, vercl.i ...

+	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x

+	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i

+	@echo Cleaning $(WINDIR)\versions.vc, version.vc ...

+	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

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

+

+default-hose: default-clean

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

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

+

+# Only for backward compatibility

+default-distclean: default-hose

+

+default-setup:

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

+	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)

+

+!if "$(TESTPAT)" != ""

+TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)

+!endif

+

+default-test: default-setup $(PROJECT)

+	@set TCLLIBPATH=$(OUT_DIR:\=/)

+	@if exist $(LIBDIR) for %f in ("$(LIBDIR)\*.tcl") do @$(COPY) %f "$(OUT_DIR)"

+	cd "$(TESTDIR)" && $(DEBUGGER) $(TCLSH) all.tcl $(TESTFLAGS)

+

+default-shell: default-setup $(PROJECT)

+	@set TCLLIBPATH=$(OUT_DIR:\=/)

+	@if exist $(LIBDIR) for %f in ("$(LIBDIR)\*.tcl") do @$(COPY) %f "$(OUT_DIR)"

+	$(DEBUGGER) $(TCLSH)

+

+# Generation of Windows version resource 

+!ifdef RCFILE

+

+# Note: don't use $** in below rule because there may be other dependencies

+# and only the "master" rc must be passed to the resource compiler

+$(TMP_DIR)\$(PROJECT).res: $(RCDIR)\$(PROJECT).rc

+	$(RESCMD) $(RCDIR)\$(PROJECT).rc

+

 !else

-_TKDIR = $(TKDIR:/=\)

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

-TKINSTALL      = 1

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

-!elseif exist("$(_TKDIR)\generic\tk.h")

-TKINSTALL      = 0

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

-!else

-MSG =^

-Failed to find tk.h. The TKDIR macro does not appear correct.

-!error $(MSG)

-!endif

-!endif

+

+# If parent makefile has not defined a resource definition file,

+# we will generate one from standard template.

+$(TMP_DIR)\$(PROJECT).res: $(TMP_DIR)\$(PROJECT).rc

+

+$(TMP_DIR)\$(PROJECT).rc:

+	@$(COPY) << $(TMP_DIR)\$(PROJECT).rc

+#include <winver.h>

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION	COMMAVERSION

+ PRODUCTVERSION	COMMAVERSION

+ FILEFLAGSMASK	0x3fL

+#ifdef DEBUG

+ FILEFLAGS	VS_FF_DEBUG

+#else

+ FILEFLAGS	0x0L

+#endif

+ FILEOS		VOS_NT_WINDOWS32

+ FILETYPE	VFT_DLL

+ FILESUBTYPE	0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "FileDescription",  "Tcl extension " PROJECT

+            VALUE "OriginalFilename", PRJLIBNAME

+            VALUE "FileVersion",      DOTVERSION

+            VALUE "ProductName",      "Package " PROJECT " for Tcl"

+            VALUE "ProductVersion",   DOTVERSION 

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+<<

+

+!endif # ifdef RCFILE

+

+!ifndef DISABLE_IMPLICIT_RULES

+DISABLE_IMPLICIT_RULES = 0

 !endif

 

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

-# Extract Tk version numbers

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

+!if !$(DISABLE_IMPLICIT_RULES)

+# Implicit rule definitions - only for building library objects. For stubs and

+# main application, the master makefile should define explicit rules.

 

-!if defined(PROJECT_REQUIRES_TK) || "$(PROJECT)" == "tk"

+{$(ROOT)}.c{$(TMP_DIR)}.obj::

+	$(CCPKGCMD) @<<

+$<

+<<

+

+{$(WINDIR)}.c{$(TMP_DIR)}.obj::

+	$(CCPKGCMD) @<<

+$<

+<<

+

+{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::

+	$(CCPKGCMD) @<<

+$<

+<<

+

+{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::

+	$(CCPKGCMD) @<<

+$<

+<<

+

+{$(RCDIR)}.rc{$(TMP_DIR)}.res:

+	$(RESCMD) $<

+

+{$(WINDIR)}.rc{$(TMP_DIR)}.res:

+	$(RESCMD) $<

+

+{$(TMP_DIR)}.rc{$(TMP_DIR)}.res:

+	$(RESCMD) $<

+

+.SUFFIXES:

+.SUFFIXES:.c .rc

 

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

+

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

+# 14. Sanity check selected options against Tcl build options

+# When building an extension, certain configuration options should

+# match the ones used when Tcl was built. Here we check and

+# warn on a mismatch.

+!if ! $(DOING_TCL)

+

+!if $(TCLINSTALL) # Building against an installed Tcl

+!if exist("$(_TCLDIR)\lib\nmake\tcl.nmake")

+TCLNMAKECONFIG = "$(_TCLDIR)\lib\nmake\tcl.nmake"

 !endif

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

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

+!else # ! $(TCLINSTALL) - building against Tcl source

+!if exist("$(OUT_DIR)\tcl.nmake")

+TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"

 !endif

+!endif # TCLINSTALL

 

-!include versions.vc

+!if $(CONFIG_CHECK)

+!ifdef TCLNMAKECONFIG

+!include $(TCLNMAKECONFIG)

 

-TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)

-TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)

-

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

-!if $(TKINSTALL)

-WISH		= "$(_TKDIR)\bin\wish$(TK_VERSION)$(SUFX).exe"

-TKSTUBLIB	= "$(_TKDIR)\lib\tkstub$(TK_VERSION).lib"

-TKIMPLIB	= "$(_TKDIR)\lib\tk$(TK_VERSION)$(SUFX).lib"

-TK_INCLUDES     = -I"$(_TKDIR)\include"

-!else

-WISH		= "$(_TKDIR)\win\$(BUILDDIRTOP)\wish$(TCL_VERSION)$(SUFX).exe"

-TKSTUBLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_VERSION).lib"

-TKIMPLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_VERSION)$(SUFX).lib"

-TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"

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

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

+!message WARNING: Value of DEBUG ($(DEBUG)) does not match its Tcl library configuration ($(DEBUG)).

 !endif

-

 !endif

 

+!endif # TCLNMAKECONFIG

+

+!endif # ! $(DOING_TCL)

+

+

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

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

-!message *** Compiler options '$(COMPILERFLAGS) $(OPTIMIZATIONS) $(DEBUGFLAGS) $(WARNINGS)'

-!message *** Link options '$(LINKERFLAGS)'

 

-!endif

+!endif # ifdef _RULES_VC

diff --git a/win/targets.vc b/win/targets.vc
new file mode 100644
index 0000000..7f1d388
--- /dev/null
+++ b/win/targets.vc
@@ -0,0 +1,98 @@
+#------------------------------------------------------------- -*- makefile -*-

+# targets.vc --

+#

+# Part of the nmake based build system for Tcl and its extensions.

+# This file defines some standard targets for the convenience of extensions

+# and can be optionally included by the extension makefile.

+# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for docs.

+

+$(PROJECT): setup pkgindex $(PRJLIB)

+

+!ifdef PRJ_STUBOBJS

+$(PROJECT): $(PRJSTUBLIB)

+$(PRJSTUBLIB): $(PRJ_STUBOBJS)

+	$(LIBCMD) $**

+

+$(PRJ_STUBOBJS):

+	$(CCSTUBSCMD) %s

+!endif # PRJ_STUBOBJS

+

+!ifdef PRJ_MANIFEST

+$(PROJECT): $(PRJLIB).manifest

+$(PRJLIB).manifest: $(PRJ_MANIFEST)

+	@nmakehlp -s << $** >$@

+@MACHINE@	  $(MACHINE:IX86=X86)

+<<

+!endif

+

+!if "$(PROJECT)" != "tcl" && "$(PROJECT)" != "tk"

+$(PRJLIB): $(PRJ_OBJS) $(RESFILE)

+!if $(STATIC_BUILD)

+       $(LIBCMD) $**

+!else

+       $(DLLCMD) $**

+       $(_VC_MANIFEST_EMBED_DLL)

+!endif

+       -@del $*.exp

+!endif

+

+!if "$(PRJ_HEADERS)" != "" && "$(PRJ_OBJS)" != ""

+$(PRJ_OBJS): $(PRJ_HEADERS)

+!endif

+

+# If parent makefile has defined stub objects, add their installation

+# to the default install

+!if "$(PRJ_STUBOBJS)" != ""

+default-install: default-install-stubs

+!endif

+

+# Unlike the other default targets, these cannot be in rules.vc because

+# the executed command depends on existence of macro PRJ_HEADERS_PUBLIC

+# that the parent makefile will not define until after including rules-ext.vc

+!if "$(PRJ_HEADERS_PUBLIC)" != ""

+default-install: default-install-headers

+default-install-headers:

+	@echo Installing headers to '$(INCLUDE_INSTALL_DIR)'

+	@for %f in ($(PRJ_HEADERS_PUBLIC)) do @$(COPY) %f "$(INCLUDE_INSTALL_DIR)"

+!endif

+

+!if "$(DISABLE_STANDARD_TARGETS)" == ""

+DISABLE_STANDARD_TARGETS = 0

+!endif

+

+!if "$(DISABLE_TARGET_setup)" == ""

+DISABLE_TARGET_setup = 0

+!endif

+!if "$(DISABLE_TARGET_install)" == ""

+DISABLE_TARGET_install = 0

+!endif

+!if "$(DISABLE_TARGET_clean)" == ""

+DISABLE_TARGET_clean = 0

+!endif

+!if "$(DISABLE_TARGET_test)" == ""

+DISABLE_TARGET_test = 0

+!endif

+!if "$(DISABLE_TARGET_shell)" == ""

+DISABLE_TARGET_shell = 0

+!endif

+

+!if !$(DISABLE_STANDARD_TARGETS)

+!if !$(DISABLE_TARGET_setup)

+setup: default-setup

+!endif

+!if !$(DISABLE_TARGET_install)

+install: default-install

+!endif

+!if !$(DISABLE_TARGET_clean)

+clean: default-clean

+realclean: hose

+hose: default-hose

+distclean: realclean default-distclean

+!endif

+!if !$(DISABLE_TARGET_test)

+test: default-test

+!endif

+!if !$(DISABLE_TARGET_shell)

+shell: default-shell

+!endif

+!endif # DISABLE_STANDARD_TARGETS

diff --git a/win/tcl.m4 b/win/tcl.m4
index 6701b1e..d5269de 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -544,17 +544,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
     AC_ARG_ENABLE(64bit,[  --enable-64bit          enable 64bit support (where applicable)], [do64bit=$enableval], [do64bit=no])
     AC_MSG_RESULT($do64bit)
 
-    # Cross-compiling options for Windows/CE builds
-
-    AC_MSG_CHECKING([if Windows/CE build is requested])
-    AC_ARG_ENABLE(wince,[  --enable-wince          enable Win/CE support (where applicable)], [doWince=$enableval], [doWince=no])
-    AC_MSG_RESULT($doWince)
-
-    AC_MSG_CHECKING([for Windows/CE celib directory])
-    AC_ARG_WITH(celib,[  --with-celib=DIR        use Windows/CE support library from DIR],
-	    CELIB_DIR=$withval, CELIB_DIR=NO_CELIB)
-    AC_MSG_RESULT([$CELIB_DIR])
-
     # Set some defaults (may get changed below)
     EXTRA_CFLAGS=""
 	AC_DEFINE(MODULE_SCOPE, [extern], [No need to mark inidividual symbols as hidden])
@@ -871,98 +860,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    LINKBIN="link"
 	fi
 
-	if test "$doWince" != "no" ; then
-	    # Set defaults for common evc4/PPC2003 setup
-	    # Currently Tcl requires 300+, possibly 420+ for sockets
-	    CEVERSION=420; 		# could be 211 300 301 400 420 ...
-	    TARGETCPU=ARMV4;	# could be ARMV4 ARM MIPS SH3 X86 ...
-	    ARCH=ARM;		# could be ARM MIPS X86EM ...
-	    PLATFORM="Pocket PC 2003"; # or "Pocket PC 2002"
-	    if test "$doWince" != "yes"; then
-		# If !yes then the user specified something
-		# Reset ARCH to allow user to skip specifying it
-		ARCH=
-		eval `echo $doWince | awk -F "," '{ \
-	if (length([$]1)) { printf "CEVERSION=\"%s\"\n", [$]1; \
-	if ([$]1 < 400)	  { printf "PLATFORM=\"Pocket PC 2002\"\n" } }; \
-	if (length([$]2)) { printf "TARGETCPU=\"%s\"\n", toupper([$]2) }; \
-	if (length([$]3)) { printf "ARCH=\"%s\"\n", toupper([$]3) }; \
-	if (length([$]4)) { printf "PLATFORM=\"%s\"\n", [$]4 }; \
-		}'`
-		if test "x${ARCH}" = "x" ; then
-		    ARCH=$TARGETCPU;
-		fi
-	    fi
-	    OSVERSION=WCE$CEVERSION;
-	    if test "x${WCEROOT}" = "x" ; then
-		WCEROOT="C:/Program Files/Microsoft eMbedded C++ 4.0"
-		if test ! -d "${WCEROOT}" ; then
-		    WCEROOT="C:/Program Files/Microsoft eMbedded Tools"
-		fi
-	    fi
-	    if test "x${SDKROOT}" = "x" ; then
-		SDKROOT="C:/Program Files/Windows CE Tools"
-		if test ! -d "${SDKROOT}" ; then
-		    SDKROOT="C:/Windows CE Tools"
-		fi
-	    fi
-	    # The space-based-path will work for the Makefile, but will
-	    # not work if AC_TRY_COMPILE is called.
-	    WCEROOT=`echo "$WCEROOT" | sed -e 's!\\\!/!g'`
-	    SDKROOT=`echo "$SDKROOT" | sed -e 's!\\\!/!g'`
-	    CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'`
-	    if test ! -d "${CELIB_DIR}/inc"; then
-		AC_MSG_ERROR([Invalid celib directory "${CELIB_DIR}"])
-	    fi
-	    if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"\
-		-o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then
-		AC_MSG_ERROR([could not find PocketPC SDK or target compiler to enable WinCE mode [$CEVERSION,$TARGETCPU,$ARCH,$PLATFORM]])
-	    else
-		CEINCLUDE="${SDKROOT}/${OSVERSION}/${PLATFORM}/include"
-		if test -d "${CEINCLUDE}/${TARGETCPU}" ; then
-		    CEINCLUDE="${CEINCLUDE}/${TARGETCPU}"
-		fi
-		CELIBPATH="${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"
-	    fi
-	fi
-
-	if test "$doWince" != "no" ; then
-	    CEBINROOT="${WCEROOT}/EVC/${OSVERSION}/bin"
-	    if test "${TARGETCPU}" = "X86"; then
-		CC="${CEBINROOT}/cl.exe"
-	    else
-		CC="${CEBINROOT}/cl${ARCH}.exe"
-	    fi
-	    CC="\"${CC}\" -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
-	    RC="\"${WCEROOT}/Common/EVC/bin/rc.exe\""
-	    arch=`echo ${ARCH} | awk '{print tolower([$]0)}'`
-	    defs="${ARCH} _${ARCH}_ ${arch} PALM_SIZE _MT _DLL _WINDOWS"
-	    for i in $defs ; do
-		AC_DEFINE_UNQUOTED($i)
-	    done
-#	    if test "${ARCH}" = "X86EM"; then
-#		AC_DEFINE_UNQUOTED(_WIN32_WCE_EMULATION)
-#	    fi
-	    AC_DEFINE_UNQUOTED(_WIN32_WCE, $CEVERSION)
-	    AC_DEFINE_UNQUOTED(UNDER_CE, $CEVERSION)
-	    CFLAGS_DEBUG="-nologo -Zi -Od"
-	    CFLAGS_OPTIMIZE="-nologo -O2"
-	    lversion=`echo ${CEVERSION} | sed -e 's/\(.\)\(..\)/\1\.\2/'`
-	    lflags="-nodefaultlib -MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
-	    LINKBIN="\"${CEBINROOT}/link.exe\""
-	    AC_SUBST(CELIB_DIR)
-	    if test "${CEVERSION}" -lt 400 ; then
-		LIBS="coredll.lib corelibc.lib winsock.lib"
-	    else
-		LIBS="coredll.lib corelibc.lib ws2.lib"
-	    fi
-	    # celib currently stuck at wce300 status
-	    #LIBS="$LIBS \${CELIB_DIR}/wince-${ARCH}-pocket-${OSVERSION}-release/celib.lib"
-	    LIBS="$LIBS \"\${CELIB_DIR}/wince-${ARCH}-pocket-wce300-release/celib.lib\""
-	    LIBS_GUI="commctrl.lib commdlg.lib"
-	else
-	    LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
-	fi
+	LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
 
 	SHLIB_LD="${LINKBIN} -dll -incremental:no ${lflags}"
 	SHLIB_LD_LIBS='${LIBS}'
@@ -993,7 +891,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 
 	# Specify linker flags depending on the type of app being
 	# built -- Console vs. Window.
-	if test "$doWince" != "no" -a "${TARGETCPU}" != "X86"; then
+	if test "${TARGETCPU}" != "X86"; then
 	    LDFLAGS_CONSOLE="-link ${lflags}"
 	    LDFLAGS_WINDOW=${LDFLAGS_CONSOLE}
 	else
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 1d6cb2b..95b8193 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -23,7 +23,6 @@
  */
 
 static HINSTANCE hInstance;	/* HINSTANCE of this DLL. */
-static int platformId;		/* Running under NT, or 95/98? */
 
 /*
  * VC++ 5.x has no 'cpuid' assembler instruction, so we must emulate it
@@ -186,51 +185,20 @@ TclWinInit(
     hInstance = hInst;
     os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
     GetVersionExW(&os);
-    platformId = os.dwPlatformId;
 
     /*
-     * We no longer support Win32s or Win9x, so just in case someone manages
-     * to get a runtime there, make sure they know that.
+     * We no longer support Win32s or Win9x or Windows CE, so just in case
+     * someone manages to get a runtime there, make sure they know that.
      */
 
-    if (platformId == VER_PLATFORM_WIN32s) {
-	Tcl_Panic("Win32s is not a supported platform");
-    }
-    if (platformId == VER_PLATFORM_WIN32_WINDOWS) {
-	Tcl_Panic("Windows 9x is not a supported platform");
+    if (os.dwPlatformId != VER_PLATFORM_WIN32_NT) {
+	Tcl_Panic("Windows NT is the only supported platform");
     }
 
     TclWinResetInterfaces();
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * TclWinGetPlatformId --
- *
- *	Determines whether running under NT, 95, or Win32s, to allow runtime
- *	conditional code.
- *
- * Results:
- *	The return value is one of:
- *	VER_PLATFORM_WIN32s	   Win32s on Windows 3.1 (not supported)
- *	VER_PLATFORM_WIN32_WINDOWS Win32 on Windows 95, 98, ME (not supported)
- *	VER_PLATFORM_WIN32_NT	Win32 on Windows NT, 2000, XP
- *	VER_PLATFORM_WIN32_CE	Win32 on Windows CE
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclWinGetPlatformId(void)
-{
-    return platformId;
-}
-
-/*
  *-------------------------------------------------------------------------
  *
  * TclWinNoBackslash --
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 3255a9f..8b0be8d 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -152,13 +152,6 @@ Dde_Init(
 	return TCL_ERROR;
     }
 
-#ifdef UNICODE
-    if (TclWinGetPlatformId() < VER_PLATFORM_WIN32_NT) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"Win32s and Windows 9x are not supported platforms", -1));
-	return TCL_ERROR;
-    }
-#endif
     Tcl_CreateObjCommand(interp, "dde", DdeObjCmd, NULL, NULL);
     Tcl_CreateExitHandler(DdeExitProc, NULL);
     return Tcl_PkgProvide(interp, TCL_DDE_PACKAGE_NAME, TCL_DDE_VERSION);
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index eaf4f36..4be8f1f 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -84,15 +84,10 @@ TclWinProcs tclWinProcs;
 
 /*
  * The following arrays contain the human readable strings for the Windows
- * platform and processor values.
+ * processor values.
  */
 
 
-#define NUMPLATFORMS 4
-static const char *const platforms[NUMPLATFORMS] = {
-    "Win32s", "Windows 95", "Windows NT", "Windows CE"
-};
-
 #define NUMPROCESSORS 11
 static const char *const processors[NUMPROCESSORS] = {
     "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil",
@@ -563,10 +558,7 @@ TclpSetVariables(
 
     Tcl_SetVar2(interp, "tcl_platform", "platform", "windows",
 	    TCL_GLOBAL_ONLY);
-    if (osInfo.dwPlatformId < NUMPLATFORMS) {
-	Tcl_SetVar2(interp, "tcl_platform", "os",
-		platforms[osInfo.dwPlatformId], TCL_GLOBAL_ONLY);
-    }
+    Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY);
     wsprintfA(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
     if (sys.oemId.wProcessorArchitecture < NUMPROCESSORS) {
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 43799d0..cf85bbb 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -40,19 +40,6 @@ typedef struct TclWinProcs {
 
 MODULE_SCOPE TclWinProcs tclWinProcs;
 
-/*
- * Some versions of Borland C have a define for the OSVERSIONINFO for
- * Win32s and for NT, but not for Windows 95.
- * Define VER_PLATFORM_WIN32_CE for those without newer headers.
- */
-
-#ifndef VER_PLATFORM_WIN32_WINDOWS
-#define VER_PLATFORM_WIN32_WINDOWS 1
-#endif
-#ifndef VER_PLATFORM_WIN32_CE
-#define VER_PLATFORM_WIN32_CE 3
-#endif
-
 #ifdef _WIN64
 #         define TCL_I_MODIFIER        "I"
 #else
@@ -114,7 +101,7 @@ typedef struct TclPipeThreadInfo {
 } TclPipeThreadInfo;
 
 
-/* If pipe-workers will use some tcl subsystem, we can use ckalloc without
+/* If pipe-workers will use some tcl subsystem, we can use Tcl_Alloc without
  * more overhead for finalize thread (should be executed anyway)
  *
  * #define _PTI_USE_CKALLOC 1
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 5f1aa70..55e4d73 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -1095,40 +1095,23 @@ TclpCreateProcess(
      * detached processes. The GUI window will still pop up to the foreground.
      */
 
-    if (TclWinGetPlatformId() == VER_PLATFORM_WIN32_NT) {
-	if (HasConsole()) {
+    if (HasConsole()) {
 	    createFlags = 0;
-	} else if (applType == APPL_DOS) {
-	    /*
-	     * Under NT, 16-bit DOS applications will not run unless they can
-	     * be attached to a console. If we are running without a console,
-	     * run the 16-bit program as an normal process inside of a hidden
-	     * console application, and then run that hidden console as a
-	     * detached process.
-	     */
+    } else if (applType == APPL_DOS) {
+	/*
+	 * Under NT, 16-bit DOS applications will not run unless they can
+	 * be attached to a console. If we are running without a console,
+	 * run the 16-bit program as an normal process inside of a hidden
+	 * console application, and then run that hidden console as a
+	 * detached process.
+	 */
 
-	    startInfo.wShowWindow = SW_HIDE;
-	    startInfo.dwFlags |= STARTF_USESHOWWINDOW;
-	    createFlags = CREATE_NEW_CONSOLE;
-	    TclDStringAppendLiteral(&cmdLine, "cmd.exe /c");
-	} else {
-	    createFlags = DETACHED_PROCESS;
-	}
+	startInfo.wShowWindow = SW_HIDE;
+	startInfo.dwFlags |= STARTF_USESHOWWINDOW;
+	createFlags = CREATE_NEW_CONSOLE;
+	TclDStringAppendLiteral(&cmdLine, "cmd.exe /c");
     } else {
-	if (HasConsole()) {
-	    createFlags = 0;
-	} else {
-	    createFlags = DETACHED_PROCESS;
-	}
-
-	if (applType == APPL_DOS) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "DOS application process not supported on this platform",
-		    -1));
-	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC", "DOS_APP",
-		    NULL);
-	    goto end;
-	}
+	createFlags = DETACHED_PROCESS;
     }
 
     /*
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 1a438d2..fe627cc 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -551,7 +551,7 @@ typedef DWORD_PTR * PDWORD_PTR;
  * address platform-specific issues.
  */
 
-#define TclpReleaseFile(file)	ckfree(file)
+#define TclpReleaseFile(file)	Tcl_Free(file)
 
 /*
  * The following macros and declarations wrap the C runtime library