Make everything work for Tcl 8.6+ too

Author: jan.nijtmans

.github/workflows/linux-build.yml

@@ -12,17 +12,48 @@ jobs:
       matrix:
         compiler:
           - "gcc"
+          - "clang"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup Environment
+      - name: Setup Environment (compiler=${{ matrix.compiler }})
         run: |
+          sudo apt-get install tcl8.6-dev libgdbm-dev liblmdb-dev
+          mkdir "$HOME/install dir"
           curl https://core.tcl-lang.org/tclconfig/tarball/main/tclconfig.tar.gz >tclconfig.tar.gz
           tar xfz tclconfig.tar.gz
-      - name: Configure (not really, just enough to do a "make dist")
+          echo "CFGOPT=--with-tcl=/usr/lib/tcl8.6 --with-gdbm --with-lmdb" >> $GITHUB_ENV
+          echo "CC=$COMPILER" >> $GITHUB_ENV
+        env:
+          COMPILER: ${{ matrix.compiler }}
+          OPTS: ${{ matrix.compiler }}
+      - name: Configure
         run: |
-          sed s/@srcdir@/\./ <Makefile.in | sed s/@abs_top_builddir@/./ | sed s/@SHELL@/bash/ | sed s/@PACKAGE_NAME@/thread/ | sed s/@PACKAGE_VERSION@/9.0a1/ | sed "s/@INSTALL@/tclconfig\/install-sh/" | sed "s/@INSTALL_DATA_DIR@/tclconfig\/install-sh -d -m 755/" >Makefile
-          touch config.status
+          ./configure $CFGOPT "--prefix=$HOME/install dir" "--exec-prefix=$HOME/install dir" || {
+            cat config.log
+            echo "::error::Failure during Configure"
+            exit 1
+          }
+      - name: Build
+        run: |
+          make || {
+            echo "::error::Failure during Build"
+            exit 1
+          }
+      - name: Run Tests
+        run: |
+          make test || {
+            echo "::error::Failure during Test"
+            exit 1
+          }
+        env:
+          ERROR_ON_FAILURES: 1
+      - name: Test-Drive Installation
+        run: |
+          make install || {
+            echo "::error::Failure during Install"
+            exit 1
+          }
       - name: Create Distribution Package
         run: |
           make dist || {

configure

@@ -2834,11 +2834,6 @@ printf "%s\n" "found ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
 	fi
     fi
 
-if test x"${with_tcl8}" != x; then
-with_tcl8=""
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --with-tcl8 option ignored" >&5
-printf "%s\n" "$as_me: WARNING: --with-tcl8 option ignored" >&2;}
-fi
 
 
 
@@ -4027,11 +4022,6 @@ printf "%s\n" "#define BUILD_${SAFE_PKG_NAME} /**/" >>confdefs.h
 
 
 
-if test "${TCL_MAJOR_VERSION}" -eq 8; then
-    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 9.0+
-Found config for Tcl ${TCL_VERSION}" "$LINENO" 5
-fi
-
 #--------------------------------------------------------------------
 # Load the tkConfig.sh file if necessary (Tk extension)
 #--------------------------------------------------------------------
@@ -9468,7 +9458,8 @@ printf "%s\n" "${TCLSH_PROG}" >&6; }
 #--------------------------------------------------------------------
 #	Zipfs support - Tip 430
 #--------------------------------------------------------------------
-# Check whether --enable-zipfs was given.
+if test "${TCL_MAJOR_VERSION}" -gt 8; then
+    # Check whether --enable-zipfs was given.
 if test ${enable_zipfs+y}
 then :
   enableval=$enable_zipfs; tcl_ok=$enableval
@@ -9477,13 +9468,15 @@ else case e in #(
 esac
 fi
 
-if test "$tcl_ok" = "yes" -a "x$enable_framework" != "xyes"; then
-    ZIPFS_BUILD=1
-    THREAD_ZIP_FILE=lib${PACKAGE_NAME}${PACKAGE_VERSION}.zip
-else
-    ZIPFS_BUILD=0
-    THREAD_ZIP_FILE=
+    if test "$tcl_ok" = "yes" -a "x$enable_framework" != "xyes"; then
+        ZIPFS_BUILD=1
+        THREAD_ZIP_FILE=lib${PACKAGE_NAME}${PACKAGE_VERSION}.zip
+    else
+        ZIPFS_BUILD=0
+        THREAD_ZIP_FILE=
+    fi
 fi
+
 # Do checking message here to not mess up interleaved configure output
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for building with zipfs" >&5
 printf %s "checking for building with zipfs... " >&6; }

configure.ac

@@ -34,17 +34,8 @@ AC_CONFIG_AUX_DIR(tclconfig)
 #--------------------------------------------------------------------
 
 TEA_PATH_TCLCONFIG
-if test x"${with_tcl8}" != x; then
-with_tcl8=""
-AC_MSG_WARN([--with-tcl8 option ignored])
-fi
 TEA_LOAD_TCLCONFIG
 
-if test "${TCL_MAJOR_VERSION}" -eq 8; then
-    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 9.0+
-Found config for Tcl ${TCL_VERSION}])
-fi
-
 #--------------------------------------------------------------------
 # Load the tkConfig.sh file if necessary (Tk extension)
 #--------------------------------------------------------------------
@@ -213,16 +204,19 @@ TEA_PROG_TCLSH
 #--------------------------------------------------------------------
 #	Zipfs support - Tip 430
 #--------------------------------------------------------------------
-AC_ARG_ENABLE(zipfs,
-    AS_HELP_STRING([--enable-zipfs],[build with Zipfs support (default: on)]),
-    [tcl_ok=$enableval], [tcl_ok=yes])
-if test "$tcl_ok" = "yes" -a "x$enable_framework" != "xyes"; then
-    ZIPFS_BUILD=1
-    THREAD_ZIP_FILE=lib${PACKAGE_NAME}${PACKAGE_VERSION}.zip
-else
-    ZIPFS_BUILD=0
-    THREAD_ZIP_FILE=
+if test "${TCL_MAJOR_VERSION}" -gt 8; then
+    AC_ARG_ENABLE(zipfs,
+        AS_HELP_STRING([--enable-zipfs],[build with Zipfs support (default: on)]),
+        [tcl_ok=$enableval], [tcl_ok=yes])
+    if test "$tcl_ok" = "yes" -a "x$enable_framework" != "xyes"; then
+        ZIPFS_BUILD=1
+        THREAD_ZIP_FILE=lib${PACKAGE_NAME}${PACKAGE_VERSION}.zip
+    else
+        ZIPFS_BUILD=0
+        THREAD_ZIP_FILE=
+    fi
 fi
+
 # Do checking message here to not mess up interleaved configure output
 AC_MSG_CHECKING([for building with zipfs])
 if test "${ZIPFS_BUILD}" = 1; then

generic/tclThread.h

@@ -22,6 +22,36 @@
 
 #include <tcl.h>
 
+/*
+ * Bunch of Tcl8 and Tcl9 compatibility definitions.
+ */
+#ifndef TCL_INDEX_NONE
+# define TCL_INDEX_NONE (-1)
+#endif
+
+#if TCL_MAJOR_VERSION < 9
+  typedef Tcl_ObjCmdProc Tcl_ObjCmdProc2;
+# undef Tcl_Size
+  typedef int Tcl_Size;
+#endif
+#ifndef TCL_HASH_TYPE
+# if TCL_MAJOR_VERSION < 9
+#   define TCL_HASH_TYPE unsigned
+# else
+#   define TCL_HASH_TYPE size_t
+# endif
+#endif
+
+#ifndef TCL_Z_MODIFIER
+#   if defined(__GNUC__) && !defined(_WIN32)
+#	define TCL_Z_MODIFIER	"z"
+#   elif defined(_WIN64)
+#	define TCL_Z_MODIFIER	TCL_LL_MODIFIER
+#   else
+#	define TCL_Z_MODIFIER	""
+#   endif
+#endif /* !TCL_Z_MODIFIER */
+
 /*
  * Exported from threadCmd.c file.
  */

generic/tclThreadInt.h

@@ -65,9 +65,9 @@
 
 #if (TCL_MAJOR_VERSION == 8) && defined(USE_TCL_STUBS)
 #undef Tcl_Free
-#define Tcl_Free(p) tclStubsPtr->tcl_Free((void *)(p))
+#define Tcl_Free(p) tclStubsPtr->tcl_Free((char *)(p))
 #undef Tcl_Realloc
-#define Tcl_Realloc(p,m) tclStubsPtr->tcl_Realloc((void *)(p),(m))
+#define Tcl_Realloc(p,m) tclStubsPtr->tcl_Realloc((char *)(p),(m))
 #endif
 
 #ifndef JOIN
@@ -135,6 +135,9 @@ MODULE_SCOPE const char *TpoolInit(Tcl_Interp *interp);
  * Utility macros
  */
 
+#if TCL_MAJOR_VERSION < 9
+# define Tcl_CreateObjCommand2 Tcl_CreateObjCommand
+#endif
 #define TCL_CMD(a,b,c) \
   if (Tcl_CreateObjCommand2((a),(b),(c),NULL, NULL) == NULL) \
     return NULL;
@@ -147,6 +150,19 @@ MODULE_SCOPE const char *TpoolInit(Tcl_Interp *interp);
   (ThreadSpecificData*)Tcl_GetThreadData((keyPtr),sizeof(ThreadSpecificData))
 #endif
 
+#ifdef TCL_QUEUE_ALERT_IF_EMPTY
+static inline void
+ThreadQueueEvent(Tcl_ThreadId thrId, Tcl_Event *evPtr, Tcl_QueuePosition position) {
+    Tcl_ThreadQueueEvent(thrId, evPtr, position|TCL_QUEUE_ALERT_IF_EMPTY);
+}
+#else
+static inline void
+ThreadQueueEvent(Tcl_ThreadId thrId, Tcl_Event *evPtr, Tcl_QueuePosition position) {
+    Tcl_ThreadQueueEvent(thrId, evPtr, position);
+    Tcl_ThreadAlert(thrId);
+}
+#endif
+
 /*
  * Structure to pass to NsThread_Init. This holds the module
  * and virtual server name for proper interp initializations.

generic/tclXkeylist.c

@@ -312,7 +312,9 @@ const Tcl_ObjType keyedListType = {
     DupKeyedListInternalRep,  /* dupIntRepProc */
     UpdateStringOfKeyedList,  /* updateStringProc */
     NULL,                     /* setFromAnyProc */
+#if TCL_MAJOR_VERSION >= 9
     TCL_OBJTYPE_V0
+#endif
 };
 
 
@@ -861,7 +863,7 @@ TclX_KeyedListGet(
 ) {
     keylIntObj_t *keylIntPtr;
     const char *nextSubKey;
-    size_t findIdx;
+    Tcl_Size findIdx;
 
     if (keylPtr->typePtr != &keyedListType) {
 	if (SetKeyedListFromAny(interp, keylPtr) != TCL_OK) {
@@ -919,7 +921,7 @@ TclX_KeyedListSet(
 ) {
     keylIntObj_t *keylIntPtr;
     const char *nextSubKey;
-    size_t findIdx;
+    Tcl_Size findIdx;
     int status;
     size_t keyLen;
     Tcl_Obj *newKeylPtr;
@@ -1022,7 +1024,7 @@ TclX_KeyedListDelete(
 ) {
     keylIntObj_t *keylIntPtr, *subKeylIntPtr;
     const char *nextSubKey;
-    size_t findIdx;
+    Tcl_Size findIdx;
     int status;
 
     if (keylPtr->typePtr != &keyedListType) {
@@ -1102,7 +1104,8 @@ TclX_KeyedListGetKeys(
     keylIntObj_t *keylIntPtr;
     Tcl_Obj *nameObjPtr, *listObjPtr;
     const char *nextSubKey;
-    size_t idx, findIdx;
+    size_t idx;
+    Tcl_Size findIdx;
 
     if (keylPtr->typePtr != &keyedListType) {
 	if (SetKeyedListFromAny(interp, keylPtr) != TCL_OK) {

generic/threadCmd.c

@@ -375,23 +375,7 @@ static const char *
 ThreadInit(
     Tcl_Interp *interp /* The current Tcl interpreter */
 ) {
-    /* Tcl 8.7 interps are only supported on 32-bit machines.
-     * Lower than that is never supported. Bye!
-     */
-#if defined(TCL_WIDE_INT_IS_LONG) && TCL_MAJOR_VERSION < 9
-#   error "Thread 3.0 is only supported with Tcl 9.0 and higher."
-#	error "Please use Thread 2.8 (branch thread-2-8-branch)"
-#endif
-
-	/* Even though it's not supported, Thread 3.0 works with Tcl 8.7
-	 * on 32-bit platforms, so allow that for now. It could be that
-	 * Tcl 9.0 introduces a further binary incompatibility in the
-	 * future, so this is not guaranteed to stay like it is now!
-	 */
-    const char *ver = (sizeof(size_t) == sizeof(int))? "8.7-": "9.0";
-
-    if (!((Tcl_InitStubs)(interp, ver, (TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16),
-	    TCL_STUB_MAGIC))) {
+    if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
 	return NULL;
     }
 
@@ -2469,7 +2453,7 @@ ThreadTransfer(
      * Queue the event and poke the other thread's notifier.
      */
 
-    Tcl_ThreadQueueEvent(thrId, (Tcl_Event*)evPtr, TCL_QUEUE_TAIL|TCL_QUEUE_ALERT_IF_EMPTY);
+    ThreadQueueEvent(thrId, (Tcl_Event *)evPtr, TCL_QUEUE_TAIL);
 
     /*
      * (*) Block until the other thread has either processed the transfer
@@ -2810,9 +2794,9 @@ ThreadSend(
 
     eventPtr->event.proc = ThreadEventProc;
     if ((flags & THREAD_SEND_HEAD)) {
-	Tcl_ThreadQueueEvent(thrId, (Tcl_Event*)eventPtr, TCL_QUEUE_HEAD|TCL_QUEUE_ALERT_IF_EMPTY);
+	ThreadQueueEvent(thrId, (Tcl_Event*)eventPtr, TCL_QUEUE_HEAD);
     } else {
-	Tcl_ThreadQueueEvent(thrId, (Tcl_Event*)eventPtr, TCL_QUEUE_TAIL|TCL_QUEUE_ALERT_IF_EMPTY);
+	ThreadQueueEvent(thrId, (Tcl_Event*)eventPtr, TCL_QUEUE_TAIL);
     }
 
     if ((flags & THREAD_SEND_WAIT) == 0) {
@@ -3015,7 +2999,8 @@ ThreadReserve(
     int operation,                     /* THREAD_RESERVE | THREAD_RELEASE */
     int wait                           /* Wait for thread to exit */
 ) {
-    int users, dowait = 0;
+    Tcl_Size users;
+    int dowait = 0;
     ThreadEvent *evPtr;
     ThreadSpecificData *tsdPtr;
 
@@ -3087,7 +3072,7 @@ ThreadReserve(
 	    evPtr->clbkData   = NULL;
 	    evPtr->resultPtr  = resultPtr;
 
-	    Tcl_ThreadQueueEvent(thrId, (Tcl_Event*)evPtr, TCL_QUEUE_TAIL|TCL_QUEUE_ALERT_IF_EMPTY);
+	    ThreadQueueEvent(thrId, (Tcl_Event*)evPtr, TCL_QUEUE_TAIL);
 
 	    if (dowait) {
 		while (resultPtr->result == NULL) {
@@ -3301,12 +3286,12 @@ ThreadSetResult(
 	result    = "no target interp!";
 	size    = strlen(result);
 	resultPtr->result = (size) ?
-	    memcpy(Tcl_Alloc(1+size), result, 1+size) : threadEmptyResult;
+	    (char *)memcpy(Tcl_Alloc(1+size), result, 1+size) : threadEmptyResult;
     } else {
 	result = Tcl_GetString(Tcl_GetObjResult(interp));
 	size = Tcl_GetObjResult(interp)->length;
 	resultPtr->result = (size) ?
-		memcpy(Tcl_Alloc(1+size), result, 1+size) : threadEmptyResult;
+		(char *)memcpy(Tcl_Alloc(1+size), result, 1+size) : threadEmptyResult;
 	if (code == TCL_ERROR) {
 	    errorCode = Tcl_GetVar2(interp, "errorCode", NULL, TCL_GLOBAL_ONLY);
 	    errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY);
@@ -3743,7 +3728,7 @@ ThreadExitProc(
 	     * because the main thread is going to call free on it.
 	     */
 
-	    resultPtr->result = strcpy(Tcl_Alloc(1+strlen(diemsg)), diemsg);
+	    resultPtr->result = strcpy((char *)Tcl_Alloc(1+strlen(diemsg)), diemsg);
 	    resultPtr->code = TCL_ERROR;
 	    resultPtr->errorCode = resultPtr->errorInfo = NULL;
 	    Tcl_ConditionNotify(&resultPtr->done);

generic/threadPoolCmd.c

@@ -1815,7 +1815,7 @@ SignalWaiter(
     evPtr = (Tcl_Event *)Tcl_Alloc(sizeof(Tcl_Event));
     evPtr->proc = RunStopEvent;
 
-    Tcl_ThreadQueueEvent(waitPtr->threadId,(Tcl_Event*)evPtr,TCL_QUEUE_TAIL|TCL_QUEUE_ALERT_IF_EMPTY);
+    ThreadQueueEvent(waitPtr->threadId,(Tcl_Event*)evPtr,TCL_QUEUE_TAIL);
 }
 
 /*