Merge 8.7

.fossil-settings/crlf-glob

@@ -1,9 +1,12 @@
 compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
 compat/zlib/contrib/vstudio/readme.txt
 compat/zlib/contrib/vstudio/*/zlib.rc
+compat/zlib/contrib/vstudio/*/zlibvc.def
 compat/zlib/contrib/vstudio/*/*.sln
+compat/zlib/win32/zlib.def
 compat/zlib/win32/*.txt
 compat/zlib/win64/*.txt
+compat/zlib/zlib.map
 libtommath/*.dsp
 libtommath/*.sln
 libtommath/*.vcproj

.fossil-settings/ignore-glob

@@ -24,7 +24,8 @@
 */versions.vc
 */version.vc
 */libtcl.vfs
-*/libtcl_*.zip
+*/libtcl*.zip
+*/tclUuid.h
 html
 libtommath/bn.ilg
 libtommath/bn.ind

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,3 @@
 Important Note
 ==========
-Please do not file issues with Tcl on Github. They are unlikely to be noticed in a timely fashion. Tcl issues are hosted in the [tcl fossil repository on core.tcl.tk](https://core.tcl.tk/tcl/tktnew); please post them there.
+Please do not file issues with Tcl on Github. They are unlikely to be noticed in a timely fashion. Tcl issues are hosted in the [tcl fossil repository on core.tcl-lang.org](https://core.tcl-lang.org/tcl/tktnew); please post them there.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,3 @@
 Important Note
 ==========
-Please do not file pull requests with Tcl on Github. They are unlikely to be noticed in a timely fashion. Tcl issues (including patches) are hosted in the [tcl fossil repository on core.tcl.tk](https://core.tcl.tk/tcl/tktnew); please post them there.
+Please do not file pull requests with Tcl on Github. They are unlikely to be noticed in a timely fashion. Tcl issues (including patches) are hosted in the [tcl fossil repository on core.tcl-lang.org](https://core.tcl-lang.org/tcl/tktnew); please post them there.

.github/workflows/linux-build.yml

@@ -1,24 +1,27 @@
 name: Linux
 on: [push]
+permissions:
+  contents: read
 jobs:
   gcc:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         cfgopt:
           - ""
-          - "CFLAGS=-DTCL_UTF_MAX=4"
+          - "CFLAGS=-DTCL_UTF_MAX=3"
           - "CFLAGS=-DTCL_NO_DEPRECATED=1"
           - "--disable-shared"
           - "--enable-symbols"
           - "--enable-symbols=mem"
+          - "--enable-symbols=all"
     defaults:
       run:
         shell: bash
         working-directory: unix
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Prepare
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
@@ -38,6 +41,8 @@ jobs:
       - name: Run Tests
         run: |
           make test
+        env:
+          ERROR_ON_FAILURES: 1
       - name: Test-Drive Installation
         run: |
           make install

.github/workflows/mac-build.yml

@@ -1,55 +1,63 @@
 name: macOS
 on: [push]
+permissions:
+  contents: read
 jobs:
   xcode:
-    runs-on: macos-11.0
+    runs-on: macos-11
     defaults:
       run:
         shell: bash
         working-directory: macosx
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Prepare
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
         working-directory: generic
       - name: Build
         run: make all
+        env:
+          CFLAGS: -arch x86_64 -arch arm64e
       - name: Run Tests
         run: make test styles=develop
         env:
           ERROR_ON_FAILURES: 1
           MAC_CI: 1
   clang:
-    runs-on: macos-11.0
+    runs-on: macos-11
     strategy:
       matrix:
         cfgopt:
           - ""
           - "--disable-shared"
           - "--enable-symbols"
           - "--enable-symbols=mem"
+          - "--enable-symbols=all"
     defaults:
       run:
         shell: bash
         working-directory: unix
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Prepare
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
           mkdir "$HOME/install dir"
         working-directory: generic
       - name: Configure ${{ matrix.cfgopt }}
         # Note that macOS is always a 64 bit platform
-        run: ./configure --enable-64bit --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
+        run: ./configure --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
         env:
+          CFLAGS: -arch x86_64 -arch arm64e
           CFGOPT: ${{ matrix.cfgopt }}
       - name: Build
         run: |
           make all tcltest
+        env:
+          CFLAGS: -arch x86_64 -arch arm64e
       - name: Run Tests
         run: |
           make test

.github/workflows/onefiledist.yml

@@ -1,15 +1,17 @@
 name: Build Binaries
 on: [push]
+permissions:
+  contents: read
 jobs:
   linux:
     name: Linux
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     defaults:
       run:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Prepare
         run: |
           touch generic/tclStubInit.c generic/tclOOStubInit.c
@@ -21,32 +23,32 @@ jobs:
         working-directory: unix
       - name: Build
         run: |
-          make tclsh tclzipfile
+          make tclsh
           make shell SCRIPT="$VER_PATH $GITHUB_ENV"
           echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
         working-directory: unix
       - name: Package
         run: |
-          cat ../unix/tclsh $TCL_ZIP > tclsh${TCL_PATCHLEVEL}_unofficial
-          chmod +x tclsh${TCL_PATCHLEVEL}_unofficial
-          tar -cf tclsh${TCL_PATCHLEVEL}_unofficial.tar tclsh${TCL_PATCHLEVEL}_unofficial
+          cp ../unix/tclsh tclsh${TCL_PATCHLEVEL}_snapshot
+          chmod +x tclsh${TCL_PATCHLEVEL}_snapshot
+          tar -cf tclsh${TCL_PATCHLEVEL}_snapshot.tar tclsh${TCL_PATCHLEVEL}_snapshot
         working-directory: 1dist
       - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Linux single-file build (unofficial)
+          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Linux single-file build (snapshot)
           path: 1dist/*.tar
   macos:
     name: macOS
-    runs-on: macos-latest
+    runs-on: macos-11
     defaults:
       run:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Checkout create-dmg
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: create-dmg/create-dmg
           ref: v1.0.8
@@ -55,84 +57,90 @@ jobs:
         run: |
           mkdir 1dist
           touch generic/tclStubInit.c generic/tclOOStubInit.c || true
+          wget https://github.com/culler/macher/releases/download/v1.3/macher
+          sudo cp macher /usr/local/bin
+          sudo chmod a+x /usr/local/bin/macher
           echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV
           echo "CREATE_DMG=$(cd create-dmg;pwd)/create-dmg" >> $GITHUB_ENV
+          echo "CFLAGS=-arch x86_64 -arch arm64e" >> $GITHUB_ENV
       - name: Configure
         run: ./configure --disable-symbols --disable-shared --enable-zipfs
         working-directory: unix
       - name: Build
         run: |
-          make tclsh tclzipfile
+          make tclsh
           make shell SCRIPT="$VER_PATH $GITHUB_ENV"
           echo "TCL_BIN=`pwd`/tclsh" >> $GITHUB_ENV
           echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
         working-directory: unix
       - name: Package
         run: |
           mkdir contents
-          cat $TCL_BIN $TCL_ZIP > contents/tclsh${TCL_PATCHLEVEL}_unofficial
-          chmod +x contents/tclsh${TCL_PATCHLEVEL}_unofficial
+          cp $TCL_BIN contents/tclsh${TCL_PATCHLEVEL}_snapshot
+          chmod +x contents/tclsh${TCL_PATCHLEVEL}_snapshot
           cat > contents/README.txt <<EOF
           This is a single-file executable developer preview of Tcl $TCL_PATCHLEVEL
 
           It is not intended as an official release at all, so it is unsigned and unnotarized.
           Use strictly at your own risk.
 
           To run it, you need to copy the executable out and run:
-              xattr -d com.apple.quarantine tclsh${TCL_PATCHLEVEL}_unofficial
+              xattr -d com.apple.quarantine tclsh${TCL_PATCHLEVEL}_snapshot
           to mark the executable as runnable on your machine.
           EOF
           $CREATE_DMG \
-              --volname "Tcl $TCL_PATCHLEVEL (unofficial)" \
+              --volname "Tcl $TCL_PATCHLEVEL (snapshot)" \
               --window-pos 200 120 \
               --window-size 800 400 \
-              "Tcl-$TCL_PATCHLEVEL-(unofficial).dmg" \
+              "Tcl-$TCL_PATCHLEVEL-(snapshot).dmg" \
               "contents/"
         working-directory: 1dist
       - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: Tclsh ${{ env.TCL_PATCHLEVEL }} macOS single-file build (unofficial)
+          name: Tclsh ${{ env.TCL_PATCHLEVEL }} macOS single-file build (snapshot)
           path: 1dist/*.dmg
   win:
     name: Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
     defaults:
       run:
-        shell: bash
+        shell: msys2 {0}
+    env:
+      CC: gcc
+      CFGOPT: --disable-symbols --disable-shared
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
       - name: Install MSYS2
         uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          install: git mingw-w64-ucrt-x86_64-toolchain make zip
+      - name: Checkout
+        uses: actions/checkout@v3
       - name: Prepare
         run: |
           touch generic/tclStubInit.c generic/tclOOStubInit.c
           echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV
           mkdir 1dist
         working-directory: .
       - name: Configure
-        run: ./configure --disable-symbols --disable-shared --enable-zipfs
+        run: ./configure $CFGOPT
         working-directory: win
       - name: Build
         run: |
-          make binaries libraries tclzipfile
+          make binaries libraries
           echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
         working-directory: win
-      - name: Package
-        run: |
-          cat ../win/tclsh*.exe $TCL_ZIP > combined.exe
-        working-directory: 1dist
       - name: Get Exact Version
         run: |
-          ./combined.exe $VER_PATH $GITHUB_ENV
-        working-directory: 1dist
+          ./tclsh*.exe $VER_PATH $GITHUB_ENV
+        working-directory: win
       - name: Set Executable Name
         run: |
-          mv combined.exe tclsh${TCL_PATCHLEVEL}_unofficial.exe
+          cp ../win/tclsh*.exe tclsh${TCL_PATCHLEVEL}_snapshot.exe
         working-directory: 1dist
       - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Windows single-file build (unofficial)
-          path: '1dist/*_unofficial.exe'
+          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Windows single-file build (snapshot)
+          path: '1dist/*_snapshot.exe'