merge core-8-6-branch

tcltk · Jan 23, 2024 · 93ae80b · 93ae80b
2 parents 73926cb + 036028b
commit 93ae80b
Show file tree

Hide file tree

Showing 9 changed files with 273 additions and 391 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
     - "main"
+    - "core-8-branch"
     - "core-8-6-branch"
     - "less_tests_constraints"
     tags:
@@ -23,14 +24,12 @@ jobs:
         compiler:
           - "gcc"
           - "clang"
-        symbols:
-          - "no"
-          - "mem"
-        disables:
+        config:
           - ""
           - "--disable-shared"
           - "--disable-xft"
           - "--disable-xss"
+          - "--enable-symbols"
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v4
@@ -53,10 +52,10 @@ jobs:
           echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
         working-directory: "."
         env:
-          CFGOPT: --enable-symbols=${{ matrix.symbols }} ${{ matrix.disables }}
+          CFGOPT: ${{ matrix.config }}
           COMPILER: ${{ matrix.compiler }}
-          OPTS: ${{ matrix.compiler }}-${{ matrix.symbols }}${{ matrix.disables }}
-      - name: Configure (symbols=${{ matrix.symbols }} opts=${{ matrix.disables }})
+          OPTS: ${{ matrix.compiler }}${{ matrix.config }}
+      - name: Configure (opts=${{ matrix.config }})
         run: |
           ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
@@ -94,20 +93,20 @@ jobs:
             exit 1
           }
       - name: Discover Version ID
-        if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
+        if: ${{ env.BUILD_CONFIG_ID == 'gcc' }}
         run: |
           cd /tmp/dist
           echo "VERSION=`ls -d tk* | sed 's/tk//'`" >> $GITHUB_ENV
       - name: Upload Source Distribution
-        if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
+        if: ${{ env.BUILD_CONFIG_ID == 'gcc' }}
         uses: actions/upload-artifact@v4
         with:
           name: Tk ${{ env.VERSION }} Source distribution (snapshot)
           path: |
             /tmp/dist/tk*
             !/tmp/dist/tk*/html/**
       - name: Upload Documentation Distribution
-        if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
+        if: ${{ env.BUILD_CONFIG_ID == 'gcc' }}
         uses: actions/upload-artifact@v4
         with:
           name: Tk ${{ env.VERSION }} HTML documentation (snapshot)
@@ -118,9 +117,10 @@ jobs:
       matrix:
         compiler:
           - "gcc"
-        symbols:
-          - "no"
-          - "mem"
+        config:
+          - ""
+          - "--disable-xft"
+          - "--enable-symbols"
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v4
@@ -135,9 +135,9 @@ jobs:
           echo "CC=$COMPILER" >> $GITHUB_ENV
         working-directory: "."
         env:
-          CFGOPT: --enable-symbols=${{ matrix.symbols }}
+          CFGOPT: ${{ matrix.config }}
           COMPILER: ${{ matrix.compiler }}
-      - name: Configure (symbols=${{ matrix.symbols }})
+      - name: Configure ${{ matrix.config }}
         run: |
           ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
@@ -162,4 +162,4 @@ jobs:
             echo "::error::Failure during Test"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 10
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
     - "main"
+    - "core-8-branch"
     - "core-8-6-branch"
     - "less_tests_constraints"
     tags:
@@ -97,7 +98,7 @@ jobs:
       - name: Build Tcl
         # Note that macOS is always a 64 bit platform
         run: |
-          ./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" || {
+          ./configure --enable-64bit $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::error::Failure during Tcl Configure"
             exit 1
@@ -116,7 +117,7 @@ jobs:
       - name: Configure (symbols=${{ matrix.symbols }} ${{matrix.options }})
         # Note that macOS is always a 64 bit platform
         run: |
-          ./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" --disable-xft || {
+          ./configure --enable-64bit $CFGOPT "--prefix=$HOME/install dir" --disable-xft || {
             cat config.log
             echo "::error::Failure during Configure"
             exit 1
@@ -162,7 +163,7 @@ jobs:
             echo "::error::Failure in ttk test results"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 20
       - name: Carry out trial installation
         run: |
           make install || {

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
@@ -88,7 +88,7 @@ jobs:
         env:
           CI_BUILD_WITH_MSVC: 1
         shell: bash
-        timeout-minutes: 15
+        timeout-minutes: 10
       - name: Build Help (${{ matrix.config }})
         run: |
           &nmake -f makefile.vc htmlhelp ${{ matrix.config }}
@@ -177,4 +177,4 @@ jobs:
             echo "::error::Failure during Test"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 10
diff --git a/.travis.yml b/.travis.yml
diff --git a/generic/tkMenubutton.h b/generic/tkMenubutton.h
@@ -165,7 +165,7 @@ typedef struct {
     				 * "right", and "flush". "flush" means that
     				 * the upper left corner of the menubutton is
     				 * where the menu pops up. "above" and "below"
-    				 * will attempt to pop the menu compleletly
+    				 * will attempt to pop the menu completely
     				 * above or below the menu respectively.
     				 * "left" and "right" will pop the menu left
     				 * or right, and the active item will be next