Update build scripts (backported from 8.7/9.0). Travis is no longer supported (probably won't even work any more). typo in tkMenubutton.h

6 files changed, 23 insertions, 259 deletions

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 77d5849..9414037 100644
--- 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"
     tags:
     - "core-**"
@@ -22,14 +23,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
@@ -52,10 +51,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
@@ -93,12 +92,12 @@ 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)
@@ -106,7 +105,7 @@ jobs:
             /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)
@@ -117,9 +116,10 @@ jobs:
       matrix:
         compiler:
           - "gcc"
-        symbols:
-          - "no"
-          - "mem"
+        config:
+          - ""
+          - "--disable-xft"
+          - "--enable-symbols"
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v4
@@ -134,9 +134,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
@@ -161,4 +161,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
index 70af86d..9fd297a 100644
--- 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"
     tags:
     - "core-**"
@@ -96,7 +97,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
@@ -115,7 +116,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
@@ -161,7 +162,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
index 6e399be..a0af658 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -87,7 +87,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 }}
@@ -176,4 +176,4 @@ jobs:
             echo "::error::Failure during Test"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 10
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 77a8d27..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,236 +0,0 @@
-language: c
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - binutils-mingw-w64-i686
-      - binutils-mingw-w64-x86-64
-      - gcc-mingw-w64
-      - gcc-mingw-w64-base
-      - gcc-mingw-w64-i686
-      - gcc-mingw-w64-x86-64
-      - gcc-multilib
-      - tcl8.6-dev
-      - libx11-dev
-      - libxss-dev
-      - xvfb
-  homebrew:
-    packages:
-      - tcl-tk
-#   casks:
-#     - xquartz
-jobs:
-  include:
-# Testing on Linux GCC
-    - name: "Linux/GCC/Shared"
-      os: linux
-      dist: focal
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-      script: &x11gui
-        - make binaries libraries tktest
-        - make install
-        - make test-classic >out-classic.txt
-        - cat out-classic.txt
-        - grep -q "Failed	0" out-classic.txt
-        - make test-ttk >out-ttk.txt
-        - cat out-ttk.txt
-        - grep -q "Failed	0" out-ttk.txt
-    - name: "Linux/GCC/Shared/no-xft"
-      os: linux
-      dist: focal
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--disable-xft"
-      script: *x11gui
-    - name: "Linux/GCC/Shared/bionic"
-      os: linux
-      dist: bionic
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-      script: *x11gui
-    - name: "Linux/GCC/Shared/xenial"
-      os: linux
-      dist: xenial
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-      script: *x11gui
-    - name: "Linux/GCC/Static"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--disable-shared"
-    - name: "Linux/GCC/Debug"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--enable-symbols"
-# Newer/Older versions of GCC
-    - name: "Linux/GCC 10/Shared"
-      os: linux
-      dist: focal
-      compiler: gcc-10
-      addons:
-        apt:
-          packages:
-            - g++-10
-      env:
-        - BUILD_DIR=unix
-    - name: "Linux/GCC 5/Shared"
-      os: linux
-      dist: bionic
-      compiler: gcc-5
-      addons:
-        apt:
-          packages:
-            - g++-5
-      env:
-        - BUILD_DIR=unix
-# Testing on Linux Clang
-    - name: "Linux/Clang/Shared"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-    - name: "Linux/Clang/Shared/no-xft"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--disable-xft"
-    - name: "Linux/Clang/Static"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - CFGOPT="--disable-shared"
-        - BUILD_DIR=unix
-    - name: "Linux/Clang/Debug"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--enable-symbols"
-# Testing on Mac, various styles
-    - name: "macOS/Xcode 12/Shared"
-      os: osx
-      osx_image: xcode12
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
-    - name: "macOS/Xcode 12/Static"
-      os: osx
-      osx_image: xcode12
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include"
-    - name: "macOS/Xcode 12/Debug"
-      os: osx
-      osx_image: xcode12
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include"
-#   - name: "macOS/Xcode 12/Shared/XQuartz"
-#     os: osx
-#     osx_image: xcode12
-#     env:
-#       - BUILD_DIR=unix
-#       - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
-# Older MacOS versions
-    - name: "macOS/Xcode 11/Shared"
-      os: osx
-      osx_image: xcode11.7
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
-    - name: "macOS/Xcode 10/Shared"
-      os: osx
-      osx_image: xcode10.3
-      addons:
-        homebrew:
-          packages:
-            - tcl-tk
-          update: true
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
-    - name: "macOS/Xcode 9/Shared"
-      os: osx
-      osx_image: xcode9.4
-      addons:
-        homebrew:
-          packages:
-            - tcl-tk
-          update: true
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"
-# Test on Windows with MSVC native
-#   - name: "Windows/MSVC/Shared"
-#     os: windows
-#     compiler: cl
-#     env: &vcenv
-#       - BUILD_DIR=win
-#       - VCDIR="/C/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build"
-#     before_install: &vcpreinst
-#       - PATH="$PATH:$VCDIR"
-#       - cd ${BUILD_DIR}
-#     install: []
-#     script:
-#       - cmd.exe //C vcvarsall.bat x64 '&&' nmake '-f' makefile.vc all tktest
-# "make dist" only
-    - name: "Linux: make dist"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-      script:
-        - touch ../doc/man.macros
-        - make dist
-before_install:
-  - |-
-      case $TRAVIS_OS_NAME in
-        windows)
-          choco install -y magicsplat-tcl-tk
-          ;;
-      esac
-  - cd ${BUILD_DIR}
-install:
-  - mkdir "$HOME/install dir"
-  - ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
-script:
-  - make binaries libraries tktest
-  - make install
-before_cache:
-  - |-
-      case $TRAVIS_OS_NAME in
-        osx)
-          brew cleanup
-          ;;
-      esac
-cache:
-  directories:
-  - $HOME/Library/Caches/Homebrew
-  - $HOME/AppData/Local/Temp/chocolatey
-  - $HOME/AppData/Local/Apps/Tcl86
diff --git a/generic/tkMenubutton.h b/generic/tkMenubutton.h
index 1dbacb3..a5a1d3a 100644
--- 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
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0567e41..2074720 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1675,7 +1675,6 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC
 		$(TEST_DIR)/option.file* $(DISTDIR)/tests
 	mkdir $(DISTDIR)/tests/ttk
 	cp -p $(TEST_DIR)/ttk/*.{test,tcl} $(DISTDIR)/tests/ttk
-	cp -p $(TOP_DIR)/.travis.yml $(DISTDIR)
 	mkdir -p $(DISTDIR)/.github/workflows
 	cp -p $(TOP_DIR)/.github/workflows/*.yml $(DISTDIR)/.github/workflows