Merge branch 'master' into patch-10

.codacy.yaml

@@ -1,12 +1,13 @@
 exclude_paths:
-  - 'deprecated/**'
-  - 'mac/libusb/**'
-  - 'reference/**'
-  - 'shapelib/**'
-  - 'strptime/**'
-  - 'zlib/**'
-  - coverity_model.cc
-  - jeeps/gpsproj.cc
-  - jeeps/gpsproj.h
-  - tools/qtci/README.md
-  - tools/uploadtool/README.md
+  - "coverity_model.cc"
+  - "deprecated/**"
+  - "gui/coretool/gpsbabel_*.ts"
+  - "gui/gpsbabelfe_*.ts"
+  - "jeeps/gpsproj.cc"
+  - "jeeps/gpsproj.h"
+  - "mac/libusb/**"
+  - "reference/**"
+  - "shapelib/**"
+  - "strptime/**"
+  - "tools/uploadtool/README.md"
+  - "zlib/**"

.github/workflows/codacy-analysis.yaml

@@ -16,8 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - IMAGE: 'jammy'
-            CMAKE_PREFIX_PATH: '/usr/lib/x86_64-linux-gnu/cmake/Qt5'
+          - IMAGE: 'noble'
+            CMAKE_PREFIX_PATH: '/usr/lib/x86_64-linux-gnu/cmake/Qt6'
             SCRIPT: './tools/ci_run_tidy.sh'
     container:
       image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_${{ matrix.IMAGE }}
@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: build_and_test
       run: |

.github/workflows/codeql-analysis.yml

@@ -8,67 +8,77 @@
 # We have attempted to detect the languages in your repository. Please check
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
-# ******** NOTE ********
-
+#
 name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master" ]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ "master" ]
   schedule:
     - cron: '27 4 * * 2'
   workflow_dispatch: ~
 
 jobs:
   analyze:
     name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
     runs-on: ubuntu-latest
+    timeout-minutes: 360
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
     container:
-      image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_focal
+      image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_jammy
       env:
         CMAKE_GENERATOR: Ninja
 
     strategy:
       fail-fast: false
       matrix:
-        # language: [ 'cpp', 'javascript' ]
-        language: [ 'cpp' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+        language: [ 'c-cpp' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     #- run: |
-    #   make bootstrap
-    #   make release
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/fedora.yml

@@ -13,19 +13,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # version 32, though obsolete, uses Qt 5.14 so we keep it for that.
         include:
-          - IMAGE: '32'
-            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
-          - IMAGE: '35'
-            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
-          - IMAGE: '37'
-            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
           - IMAGE: '37'
             CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
           - IMAGE: '38'
-            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
-          - IMAGE: '38'
+            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
+          - IMAGE: '39'
+            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
+          - IMAGE: '40'
             CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
     container:
       image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.IMAGE }}
@@ -35,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: build_and_test
       run: |

.github/workflows/gendocs.yml

@@ -0,0 +1,59 @@
+name: "gendocs"
+
+on:
+  push:
+    branches: [ master ]
+  schedule:
+    - cron: '27 4 * * 2'
+  workflow_dispatch:
+    inputs:
+      docversion:
+        required: false
+        type: string
+        default: 'development'
+
+jobs:
+  ubuntu:
+    name: ubuntu Build
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - IMAGE: 'jammy'
+            CMAKE_PREFIX_PATH: '/usr/lib/x86_64-linux-gnu/cmake/Qt6'
+            SCRIPT: './tools/build_and_test_cmake.sh'
+            RELEASE: true
+    container:
+      image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_${{ matrix.IMAGE }}
+      env:
+        LC_ALL: 'C.UTF-8'
+        JOB_CMAKE_PREFIX_PATH: ${{ matrix.CMAKE_PREFIX_PATH }}
+        JOB_SCRIPT: ${{ matrix.SCRIPT }}
+        JOB_DOCVERSION: ${{ inputs.docversion }}
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: build_and_test
+      run: |
+        # when using containers manually whitelist the checkout directory to allow git commands to work
+        git config --global --add safe.directory "${GITHUB_WORKSPACE}"
+        if [ -n "${JOB_CMAKE_PREFIX_PATH}" ]; then
+          CMAKE_PREFIX_PATH="${JOB_CMAKE_PREFIX_PATH}"
+          export CMAKE_PREFIX_PATH
+        fi
+        "${JOB_SCRIPT}" "${JOB_DOCVERSION:-development}"
+
+    - name: 'Upload Artifacts'
+      if: matrix.RELEASE
+      uses: actions/upload-artifact@v4
+      with:
+        name: Documents
+        path: |
+          gpsbabel.org/
+          gpsbabel.pdf
+          gpsbabel.html
+          docbook.css
+        retention-days: 7

.github/workflows/macos.yml

@@ -18,50 +18,50 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - QT_VERSION: '5.15.2'
-            XCODE_VERSION: '12.5.1'
-            GENERATOR: 'Ninja'
-            RELEASE: false
-            os: macos-11
           - QT_VERSION: '6.2.4'
             XCODE_VERSION: '13.4.1'
-            GENERATOR: 'Xcode'
+            GENERATOR: 'Ninja'
             RELEASE: false
             os: macos-12
           - QT_VERSION: '6.2.4'
-            XCODE_VERSION: '13.4.1'
-            GENERATOR: 'Ninja'
-            RELEASE: true
-            os: macos-12
-          - QT_VERSION: '6.5.2'
-            XCODE_VERSION: '14.2'
+            XCODE_VERSION: '14.3.1'
             GENERATOR: 'Ninja'
             RELEASE: false
-            os: macos-12
+            os: macos-13
+          - QT_VERSION: '6.5.3'
+            XCODE_VERSION: '15.4'
+            GENERATOR: 'Xcode'
+            RELEASE: false
+            os: macos-14
+          - QT_VERSION: '6.5.3'
+            XCODE_VERSION: '15.4'
+            GENERATOR: 'Ninja'
+            RELEASE: true
+            os: macos-14
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Cache Qt
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       id: cache
       with:
         path: ~/Cache
         key: ${{ runner.os }}-${{ matrix.QT_VERSION }}-${{ secrets.CACHE_VERSION }}
 
     - name: Qt install setup
       if: steps.cache.outputs.cache-hit != 'true'
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: '3.12'
 
     - name: Qt install
       if: steps.cache.outputs.cache-hit != 'true'
       env:
-        TRAVIS_BUILD_DIR: ${{ github.workspace }}
+        CI_BUILD_DIR: ${{ github.workspace }}
       run: |
-        ./tools/travis_install_osx ${{ matrix.QT_VERSION }} aqt
+        ./tools/ci_install_osx.sh ${{ matrix.QT_VERSION }} aqt
 
     - name: Brew install
       if: matrix.GENERATOR == 'Ninja'
@@ -73,13 +73,22 @@ jobs:
         # https://github.com/actions/runner-images/issues/6507
         # https://github.com/actions/runner-images/issues/2322
         # brew update # skip update for now to avoid link issues AND many slow dependency upGRADES.
+        brew list -1 | grep python
+        ls -l $(brew --prefix)/bin | grep -i python
+        # workaround for https://github.com/actions/setup-python/issues/577
+        brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
+        brew list -1 | grep python
+        ls -l $(brew --prefix)/bin | grep -i python
         brew install ninja
         brew install docbook docbook-xsl fop gnu-sed
-        brew install jing-trang
+        # brew install is taking forever on macos-11, skip jing-trang and all it's dependencies.
+        if [ "${{ matrix.os }}" != "macos-11" ]; then
+          brew install jing-trang
+        fi
 
     - name: Script
       env:
-        XML_CATALOG_FILES: /usr/local/etc/xml/catalog
+        XML_CATALOG_FILES: ${{  runner.arch == 'ARM64' && '/opt/homebrew/etc/xml/catalog' || '/usr/local/etc/xml/catalog' }}
       run: |
         source ${HOME}/Cache/qt-${{ matrix.QT_VERSION }}.env
         sudo xcode-select --switch /Applications/Xcode_${{ matrix.XCODE_VERSION }}.app
@@ -97,7 +106,7 @@ jobs:
         ./tools/uploadtool/upload_github.sh gui/GPSBabel-*.dmg
 
     - name: 'Upload Artifacts'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: MacOS_Installer ${{ join(matrix.*) }}
         path: gui/GPSBabel-*.dmg