Update sub_weeklyBuild.yml

Fix `sub_weeklyBuild.yml`

.clang-tidy

@@ -1,14 +1,13 @@
 ---
 Checks:          'clang-diagnostic-*,clang-analyzer-*,boost-*,bugprone-*,
 performance-*,readability-*,portability-*,modernize-*,cppcoreguidelines-*,google-explicit-constructor,
-concurrency-*,-modernize-use-trailing-return-type, -modernize-use-nodiscard,
+concurrency-*,-modernize-use-trailing-return-type, -modernize-use-nodiscard,-readability-identifier-length,
 -readability-redundant-access-specifiers,-readability-qualified-auto,
 -cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,
 -readability-convert-member-functions-to-static,-bugprone-easily-swappable-parameters,
 -cppcoreguidelines-pro-type-static-cast-downcast'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
 FormatStyle:     file
 User:            florians
 CheckOptions:
@@ -150,8 +149,6 @@ CheckOptions:
     value:           '0'
   - key:             concurrency-mt-unsafe.FunctionSet
     value:           any
-  - key:             readability-identifier-length.IgnoredExceptionVariableNames
-    value:           '^[e]$'
   - key:             google-readability-braces-around-statements.ShortStatementLines
     value:           '1'
   - key:             bugprone-reserved-identifier.AllowedIdentifiers

.git-blame-ignore-revs

@@ -102,3 +102,4 @@ c5c2ea3498f402c0c89916c46ddb071e22756622 # Assembly: Final application of pre-co
 d472927bba7b2d8d151c99fb29cf1d8dd099ea7d # Correct PartDesign Helix feature negative angles (#11399)
 b93c02e07da4990482b9d927506901e6f5d624e1 # Black updated to 24.3.0
 cbea6b60942f8327e6105b12e8c1d5db4647984c # FEM: Apply pre-commit to FEM files
+f9d66096878c7d89c273522b9ca57bdb14fee3bc # Rearranged CommandCreateGeo.cpp

.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml

@@ -1,6 +1,6 @@
 name: Report a Problem
 description: Have you found something that does not work well, is too hard to do or is missing altogether? Please create a Problem Report.
-labels: ["Status: Needs triage"]
+labels: ["Status: Needs triage","Status: Needs confirmation"]
 body:
   - type: checkboxes
     id: existing_issue
@@ -22,7 +22,7 @@ body:
     id: full_version
     attributes:
       label: Full version info
-      description: Please use the About FreeCAD dialog to copy your full version information and paste it here.
+      description: Please use the About FreeCAD dialog to copy your full version information and paste it here. Try reproducing the issue by restarting FreeCAD in safe mode too.
       render: shell
     validations:
       required: true
@@ -40,6 +40,8 @@ body:
         - Expressions
         - FEM
         - File formats
+        - Material
+        - Measurement
         - Mesh
         - OpenSCAD
         - Part

.github/codespellignore

@@ -74,4 +74,4 @@ vas
 vertexes
 vew
 wallthickness
-zuser
+zuser

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+
+  - package-ecosystem: pip
+    directory: /
+    schedule:
+      interval: daily

.github/labels.yml

@@ -80,6 +80,10 @@
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Spreadsheet/**/*']
 
+"Mod: Start":
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Start/**/*']
+
 "Mod: Surface":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Surface/**/*/']

.github/problemMatcher/blackWarning.json

@@ -1,15 +1,15 @@
 {
-  "problemMatcher": [
-    {
-      "owner": "black-warning",
-      "severity": "warning",
-      "pattern": [
+    "problemMatcher": [
         {
-          "regexp": "^(would reformat (.*))$",
-          "file": 2,
-          "message": 1
+            "owner": "black-warning",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^(would reformat (.*))$",
+                    "file": 2,
+                    "message": 1
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }

.github/problemMatcher/clang.json

@@ -1,17 +1,17 @@
 {
-  "problemMatcher": [
-    {
-      "owner": "clang",
-      "pattern": [
+    "problemMatcher": [
         {
-          "regexp": "^(.+):([0-9]+):([0-9]+): (error|warning|note): (.+)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "severity": 4,
-          "message": 5
+            "owner": "clang",
+            "pattern": [
+                {
+                    "regexp": "^(.+):([0-9]+):([0-9]+): (error|warning|note): (.+)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }

.github/problemMatcher/codespell.json

@@ -1,16 +1,16 @@
 {
-  "problemMatcher": [
-    {
-      "owner": "codespell-matcher",
-      "severity": "warning",
-      "pattern": [
+    "problemMatcher": [
         {
-          "regexp": "^(.+):(\\d+):\\s+(.+)$",
-          "file": 1,
-          "line": 2,
-          "message": 3
+            "owner": "codespell-matcher",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^(.+):(\\d+):\\s+(.+)$",
+                    "file": 1,
+                    "line": 2,
+                    "message": 3
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }

.github/problemMatcher/cpplint.json

@@ -1,16 +1,16 @@
 {
-  "problemMatcher": [
-    {
-      "owner": "cpplint",
-      "severity": "warning",
-      "pattern": [
+    "problemMatcher": [
         {
-          "regexp": "^(.+):([0-9]+):  (.+)$",
-          "file": 1,
-          "line": 2,
-          "message": 3
+            "owner": "cpplint",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^(.+):([0-9]+):  (.+)$",
+                    "file": 1,
+                    "line": 2,
+                    "message": 3
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }

.github/problemMatcher/gcc.json

@@ -0,0 +1,18 @@
+{
+    "__comment": "Taken from vscode-cpptools's Extension/package.json gcc rule",
+    "problemMatcher": [
+        {
+            "owner": "gcc-problem-matcher",
+            "pattern": [
+                {
+                    "regexp": "^(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            ]
+        }
+    ]
+}

.github/problemMatcher/grepMatcherWarning.json

@@ -1,16 +1,16 @@
 {
-  "problemMatcher": [
-    {
-      "owner": "grepMatcher-warning",
-      "severity": "warning",
-      "pattern": [
+    "problemMatcher": [
         {
-          "regexp": "^(.+):([0-9]+):(.+)$",
-          "file": 1,
-          "line": 2,
-          "message": 3
+            "owner": "grepMatcher-warning",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^(.+):([0-9]+):(.+)$",
+                    "file": 1,
+                    "line": 2,
+                    "message": 3
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }

.github/problemMatcher/msvc.json

@@ -0,0 +1,21 @@
+{
+    "__comment":
+        "Taken from vscode's vs/workbench/contrib/tasks/common/problemMatcher.ts msCompile rule",
+    "problemMatcher": [
+        {
+            "owner": "msvc-problem-matcher",
+            "pattern": [
+                {
+                    "regexp":
+                        "^(?:\\s+\\d+\\>)?([^\\s].*)\\((\\d+),?(\\d+)?(?:,\\d+,\\d+)?\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "code": 5,
+                    "message": 6
+                }
+            ]
+        }
+    ]
+}

.github/problemMatcher/pylintError.json

@@ -1,18 +1,18 @@
 {
-  "problemMatcher": [
-    {
-      "owner": "pylint-error",
-      "severity": "error",
-      "pattern": [
+    "problemMatcher": [
         {
-          "regexp": "^(.+?):([0-9]+):([0-9]+): ([([E|F][0-9]+): (.*)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "code": 4,
-          "message": 5
+            "owner": "pylint-error",
+            "severity": "error",
+            "pattern": [
+                {
+                    "regexp": "^(.+?):([0-9]+):([0-9]+): ([([E|F][0-9]+): (.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "code": 4,
+                    "message": 5
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }

.github/problemMatcher/pylintWarning.json

@@ -1,18 +1,18 @@
 {
-  "problemMatcher": [
-    {
-      "owner": "pylint-warning",
-      "severity": "warning",
-      "pattern": [
+    "problemMatcher": [
         {
-          "regexp": "^(.+?):([0-9]+):([0-9]+): ([^E|F][0-9]+): (.*)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "code": 4,
-          "message": 5
+            "owner": "pylint-warning",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^(.+?):([0-9]+):([0-9]+): ([^E|F][0-9]+): (.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "code": 4,
+                    "message": 5
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }

.github/pull_request_template.md

@@ -0,0 +1,46 @@
+<!-- Include a brief summary of the changes. -->
+
+<!--
+The FreeCAD community thanks you for your contribution!
+By creating a Pull Request you agree to the contributing policy. The complete policy can be found in the root of the source tree (CONTRIBUTING.md) or at https://github.com/FreeCAD/FreeCAD/blob/main/CONTRIBUTING.md
+
+This template provides guidance on creating a PR that can be reviewed and approved as quickly as possible. Comments may be safely deleted.
+
+Unless you know exactly what you're doing, please leave the checkbox 'Allow edits by maintainers' enabled.  This will allow maintainers to help you.
+-->
+
+## Issues
+<!-- link to individual issues this PR closes by referencing the issue number (e.g., fixes #1234, closes #4321). -->
+
+## Before and After Images
+<!-- If your proposed changes affect the FreeCAD GUI, add before and after screenshots -->
+
+
+
+<!--  Notes on the PR Review Process
+
+The following section describes what the maintainers consider when reviewing your Pull Request.  These items may not require you to take any action.  This information is provided for context. Understanding what we consider will help you prepare your request for speedy approval.
+
+You can find additional documentation about these guidelines in the [Developers handbook](https://freecad.github.io/DevelopersHandbook).
+
+Alignment (Does the PR align with the goals and interests of the project?)
+  - Does the PR have at least one issue linked, which this PR closes?
+  - Has the conversation on the PR and related issue(s) reached consensus?
+  - If the PR affects the GUI, is the Design Working Group (DWG) aware and have they had time to review and comment?
+  - If the PR affects the GUI, did the contributor include before/after images?
+  - If the PR affects standards and workflow, is the CAD Working Group (CWG) aware and have they had time to review/comment?
+
+Impact (Does the change affect other parts of the project?)
+  - Has the impact on documentation been considered and appropriate action taken?
+  - Has the impact on translation been considered appropriate action taken?
+  - Will the PR affect existing user documents?
+
+Code Quality (Is code well-written and maintainable?)
+  - Does the PR warrant a review by the Code Quality Working Group (CQWG)?
+  - Does the change include tests?
+  - Is the PR rebased on the current main branch with unnecessary commits squashed?
+
+Release (Are there considerations related to release timing?)
+  - Has the PR been considered for backporting to the latest release branch?
+  - Have the release notes been considered/updated?
+  -->

.github/workflows/CI_cleanup.yml

@@ -57,6 +57,11 @@ jobs:
     env:
       logdir: /tmp/log/
     steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
       - name: Make needed directories
         run: |
           mkdir -p ${{ env.logdir }}
@@ -103,7 +108,7 @@ jobs:
           done
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ github.job }}-Logs
           path: |

.github/workflows/CI_master.yml

@@ -26,7 +26,7 @@
 
 name: FreeCAD master CI
 
-on: [workflow_dispatch, push, pull_request]
+on: [workflow_dispatch, push, pull_request, merge_group]
 
 concurrency:
   group: FC-CI-${{ github.head_ref || github.run_id }}
@@ -39,35 +39,17 @@ jobs:
     with:
       artifactBasename: Prepare-${{ github.run_id }}
 
-  MacOS_13_Conda_Apple:
+  Pixi:
     needs: [Prepare]
-    uses: ./.github/workflows/sub_buildMacOSCondaApple.yml
+    uses: ./.github/workflows/sub_buildPixi.yml
     with:
-      artifactBasename: MacOS_13_Conda_Apple-${{ github.run_id }}
+      artifactBasename: Pixi-${{ github.run_id }}
 
-#  MacOS_13_Conda_Intel:
-#    needs: [Prepare]
-#    uses: ./.github/workflows/sub_buildMacOSCondaIntel.yml
-#    with:
-#      artifactBasename: MacOS_13_Conda_Intel-${{ github.run_id }}
-
-  Ubuntu_20-04:
+  Ubuntu:
     needs: [Prepare]
-    uses: ./.github/workflows/sub_buildUbuntu2004.yml
+    uses: ./.github/workflows/sub_buildUbuntu.yml
     with:
-      artifactBasename: Ubuntu_20-04-${{ github.run_id }}
-
-  Ubuntu_22-04_Conda:
-    needs: [Prepare]
-    uses: ./.github/workflows/sub_buildUbuntu2204Conda.yml
-    with:
-      artifactBasename: Ubuntu_22-04_Conda-${{ github.run_id }}
-
-  Ubuntu_22-04_Conda_Qt6:
-    needs: [Prepare]
-    uses: ./.github/workflows/sub_buildUbuntu2204CondaQt6.yml
-    with:
-      artifactBasename: Ubuntu_22-04_Conda-Qt6-${{ github.run_id }}
+      artifactBasename: Ubuntu-${{ github.run_id }}
 
   Windows:
     needs: [Prepare]
@@ -75,13 +57,6 @@ jobs:
     with:
       artifactBasename: Windows-${{ github.run_id }}
 
-  ## Disable until the following issue is resolved: https://github.com/mamba-org/mamba/issues/3292
-  # Windows_Conda:
-  #   needs: [Prepare]
-  #   uses: ./.github/workflows/sub_buildWindowsConda.yml
-  #   with:
-  #     artifactBasename: Windows_Conda-${{ github.run_id }}
-
   Lint:
     needs: [Prepare]
     uses: ./.github/workflows/sub_lint.yml
@@ -94,12 +69,9 @@ jobs:
   WrapUp:
     needs: [
         Prepare,
-        MacOS_13_Conda_Apple,
-        # MacOS_13_Conda_Intel,
-        Ubuntu_20-04,
-        Ubuntu_22-04_Conda,
+        Pixi,
+        Ubuntu,
         Windows,
-        # Windows_Conda,
         Lint
       ]
     if: always()

.github/workflows/actions/linux/generateCacheKey/action.yml

@@ -28,6 +28,9 @@ inputs:
   compiler:
     description: "Binary name/path of compiler to be used"
     required: true
+  qt_major_version:
+    description: "Major version number of qt to be used"
+    required: true
 outputs:
   cacheKey:
     description: "Cache key with distro and compiler version"
@@ -39,6 +42,6 @@ runs:
     - id: generateCacheKey
       shell: bash -l {0}
       run: |
-        cacheKey=$(lsb_release -ds | tr -d ' ')-$(basename ${{ inputs.compiler }})$(${{ inputs.compiler }} -dumpfullversion -dumpversion)
+        cacheKey=$(lsb_release -ds | tr -d ' ')-$(basename ${{ inputs.compiler }})$(${{ inputs.compiler }} -dumpfullversion -dumpversion)-qt${{ inputs.qt_major_version }}
         echo "Generated cache key : $cacheKey"
         echo "cacheKey=$cacheKey" >> $GITHUB_OUTPUT

.github/workflows/actions/runCPPTests/runAllTests/action.yml

@@ -40,6 +40,13 @@ inputs:
 runs:
   using: "composite"
   steps:
+      - name: C++ Assembly tests
+        id: assembly
+        uses: ./.github/workflows/actions/runCPPTests/runSingleTest
+        with:
+          testCommand: ${{ inputs.builddir }}/tests/Assembly_tests_run --gtest_output=json:${{ inputs.reportdir }}assembly_gtest_results.json
+          testLogFile: ${{ inputs.reportdir }}assembly_gtest_test_log.txt
+          testName: Assembly
       - name: C++ core tests
         id: core
         uses: ./.github/workflows/actions/runCPPTests/runSingleTest
@@ -54,6 +61,13 @@ runs:
           testCommand: ${{ inputs.builddir }}/tests/Material_tests_run --gtest_output=json:${{ inputs.reportdir }}material_gtest_results.json
           testLogFile: ${{ inputs.reportdir }}material_gtest_test_log.txt
           testName: Material
+      - name: C++ Measure tests
+        id: measure
+        uses: ./.github/workflows/actions/runCPPTests/runSingleTest
+        with:
+          testCommand: ${{ inputs.builddir }}/tests/Material_tests_run --gtest_output=json:${{ inputs.reportdir }}measure_gtest_results.json
+          testLogFile: ${{ inputs.reportdir }}measure_gtest_test_log.txt
+          testName: Measure
       - name: C++ Mesh tests
         id: mesh
         uses: ./.github/workflows/actions/runCPPTests/runSingleTest
@@ -61,6 +75,13 @@ runs:
           testCommand: ${{ inputs.builddir }}/tests/Mesh_tests_run --gtest_output=json:${{ inputs.reportdir }}mesh_gtest_results.json
           testLogFile: ${{ inputs.reportdir }}mesh_gtest_test_log.txt
           testName: Mesh
+      - name: C++ MeshPart tests
+        id: meshpart
+        uses: ./.github/workflows/actions/runCPPTests/runSingleTest
+        with:
+          testCommand: ${{ inputs.builddir }}/tests/Mesh_tests_run --gtest_output=json:${{ inputs.reportdir }}meshpart_gtest_results.json
+          testLogFile: ${{ inputs.reportdir }}meshpart_gtest_test_log.txt
+          testName: MeshPart
       - name: C++ Part tests
         id: part
         uses: ./.github/workflows/actions/runCPPTests/runSingleTest
@@ -89,6 +110,20 @@ runs:
           testCommand: ${{ inputs.builddir }}/tests/Sketcher_tests_run --gtest_output=json:${{ inputs.reportdir }}sketcher_gtest_results.json
           testLogFile: ${{ inputs.reportdir }}sketcher_gtest_test_log.txt
           testName: Sketcher
+      - name: C++ Spreadsheet tests
+        id: spreadsheet
+        uses: ./.github/workflows/actions/runCPPTests/runSingleTest
+        with:
+          testCommand: ${{ inputs.builddir }}/tests/Sketcher_tests_run --gtest_output=json:${{ inputs.reportdir }}spreadsheet_gtest_results.json
+          testLogFile: ${{ inputs.reportdir }}spreadsheet_gtest_test_log.txt
+          testName: Spreadsheet
+      - name: C++ Start tests
+        id: start
+        uses: ./.github/workflows/actions/runCPPTests/runSingleTest
+        with:
+          testCommand: ${{ inputs.builddir }}/tests/Start_tests_run --gtest_output=json:${{ inputs.reportdir }}start_gtest_results.json
+          testLogFile: ${{ inputs.reportdir }}start_gtest_test_log.txt
+          testName: Start
       - name: Compose summary report based on test results
         if: always()
         shell: bash -l {0}

.github/workflows/actions/windows/getCcache/action.yml

@@ -59,7 +59,7 @@ runs:
       id: getCached
       with:
         path: ${{ inputs.ccachebindir }}
-        key: ccacheforwin
+        key: ccacheforwin-${{ inputs.ccacheversion }}
     - name: Download ccache
       shell: bash
       if: steps.getCached.outputs.cache-hit != 'true'

.github/workflows/actions/windows/getLibpack/action.yml

@@ -41,11 +41,11 @@ inputs:
   libpackdownloadurl:
     description: "URL where to download libpack"
     required: false
-    default: https://github.com/FreeCAD/FreeCAD-LibPack/releases/download/3.0.0RC4/LibPack-1.0.0-v3.0.0RC4-Release.7z
+    default: https://github.com/FreeCAD/FreeCAD-LibPack/releases/download/3.1.1.3/LibPack-1.1.0-v3.1.1.3-Release.7z
   libpackname:
     description: "Libpack name (once downloaded)"
     required: false
-    default: LibPack-1.0.0-v3.0.0RC4-Release
+    default: LibPack-1.1.0-v3.1.1.3-Release
 
 runs:
   using: "composite"
@@ -59,7 +59,7 @@ runs:
       id: getCached
       with:
         path: ${{ inputs.libpackdir }}
-        key: libpackforwin
+        key: libpackforwin-${{ inputs.libpackname }}
     - name: Download libpack
       shell: bash
       if: steps.getCached.outputs.cache-hit != 'true'

.github/workflows/auto-close_stale_issues_and_pull-requests.yml

@@ -0,0 +1,137 @@
+# This workflow warns and then closes issues that have had no activity for a
+# specified amount of time. You can adjust the behavior by modifying this file.
+# For more information, see:
+#   https://github.com/marketplace/actions/close-stale-issues
+#   https://github.com/actions/stale/blob/master/action.yml
+#   https://github.com/actions/stale
+---
+name: 'Stale Issues'
+on:  # yamllint disable-line rule:truthy
+  schedule:
+    - cron: '0 0 * * *'  # Run at 00:00 UTC every day
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  issues: write  # for actions/stale to close stale issues
+  pull-requests: write # for actions/stale to close stale pull requests
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
+      - name: '🧹 Tag & close stale unconfirmed bugs'
+        id: stale_issues
+        uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-stale: -1
+          days-before-issue-stale: 90
+          days-before-issue-close: 20
+          days-before-pr-stale: -1
+          day-before-pr-close: -1
+          operations-per-run: 100  # max num of ops per run
+          stale-issue-label: 'Status: Stale'
+          close-issue-label: 'Status: Auto-closing'
+          exempt-issue-labels: 'Status: Confirmed,Priority: High,Priority: Critical,Blocker,Type: Feature,no-auto-close'
+          remove-stale-when-updated: true
+          ascending: true
+          stale-issue-message: |
+            Hi! This issue hasn’t seen activity in a while. If it’s still relevant, please update to the latest FreeCAD weekly build [download here](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds) to see if the problem is resolved.
+
+            If the issue persists, let us know by adding a comment with any updates or details. Otherwise, we’ll close this issue automatically in 20 days to keep our backlog tidy. Feel free to comment anytime to keep it open. Closed issues can always be reopened.
+            Thanks for helping improve FreeCAD!
+
+            Access additional [FreeCAD](https://freecad.org) resources:
+              - **Forum**: https://forum.freecad.org
+              - **Blog**: https://blog.freecad.org
+              - **Wiki**: https://wiki.freecad.org
+
+      - name: '🧹 Close stale requested feedback issues'
+        id: awaiting_issues
+        uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-stale: -1
+          days-before-issue-stale: 20
+          days-before-issue-close: 20
+          days-before-pr-stale: -1
+          day-before-pr-close: -1
+          operations-per-run: 30  # max num of ops per run
+          stale-issue-label: 'Status: Stale'
+          close-issue-label: 'Status: Auto-closing'
+          only-labels: 'Status: Needs feedback,Status: Needs test on dev version,Status: Needs steps to reproduce'
+          remove-stale-when-updated: true
+          ascending: true
+          stale-issue-message: |
+            Hi! This issue hasn’t seen activity in a while despite the need for further feedback.
+            If it’s still relevant, please update to the latest FreeCAD weekly build [download here](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds) to see if the problem is resolved.
+
+            If the issue persists, let us know by adding a comment with any updates or details. Otherwise, we’ll close this issue automatically in 20 days to keep our backlog tidy. Feel free to comment anytime to keep it open. Closed issues can always be reopened.
+            Thanks for helping improve FreeCAD!
+
+            Access additional [FreeCAD](https://freecad.org) resources:
+              - **Forum**: https://forum.freecad.org
+              - **Blog**: https://blog.freecad.org
+              - **Wiki**: https://wiki.freecad.org
+
+      - name: '🧹 Tag & close inactive issues'
+        id: inactive_issues
+        uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-stale: -1
+          days-before-issue-stale: 190
+          days-before-issue-close: 60
+          days-before-pr-stale: -1
+          day-before-pr-close: -1
+          operations-per-run: 30  # max num of ops per run
+          stale-issue-label: 'Status: Stale'
+          close-issue-label: 'Status: Auto-closing'
+          exempt-issue-labels: 'Priority: High,Priority: Critical,Blocker,Type: Feature,no-auto-close'
+          remove-stale-when-updated: true
+          ascending: true
+          stale-issue-message: |
+            Hi! This issue hasn’t seen activity in a while. We automatically check each issue after 190 days without activity to keep the backlog tidy.
+            If it’s still relevant, please update to the latest FreeCAD weekly build [download here](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds) to see if the issue is already resolved.
+
+            If the issue is still relevant, let us know by adding a comment.
+            Otherwise, we’ll close this issue automatically in 60 days.
+
+            Feel free to comment anytime to keep it open. Closed issues can always be reopened.
+            Thanks for helping improve FreeCAD!
+
+            Access additional [FreeCAD](https://freecad.org) resources:
+              - **Forum**: https://forum.freecad.org
+              - **Blog**: https://blog.freecad.org
+              - **Wiki**: https://wiki.freecad.org
+
+      - name: '🧹 Tag & close inactive PRs'
+        id: inactive_pr
+        uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-stale: -1
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          days-before-pr-stale: 150
+          days-before-pr-close: 90
+          operations-per-run: 30  # max num of ops per run
+          stale-pr-label: 'Status: Stale'
+          close-pr-label: 'Status: Auto-closing'
+          exempt-pr-labels: 'Needs backport,Priority: High,Priority: Critical,no-auto-close'
+          remove-stale-when-updated: true
+          ascending: true
+          stale-pr-message: |
+            Thanks for helping improve FreeCAD!
+            This pull request hasn’t seen activity in a while. We automatically check each PR after 160 days without activity to keep the repository tidy.
+
+            If the PR is still relevant, let us know by adding a comment.
+            Otherwise, we’ll close this PR automatically in 90 days.
+
+            If you would like to keep working on this pull request, we advice to rebase it on current main branch, ask feedback from users or maintainers and engage with the community to get it forward.

.github/workflows/dependency-review.yml

@@ -0,0 +1,27 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request,
+# surfacing known-vulnerable versions of the packages declared or updated in the PR.
+# Once installed, if the workflow run is marked as required,
+# PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
+      - name: 'Checkout Repository'
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@8805179dc9a63c54224914839d370dd93bd37b2e # v4

.github/workflows/issue-metrics.yml

@@ -16,6 +16,11 @@ jobs:
 
     steps:
 
+    - name: Harden the runner (Audit all outbound calls)
+      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+      with:
+        egress-policy: audit
+
     - name: Get dates for last month
       shell: bash
       run: |
@@ -30,13 +35,13 @@ jobs:
         echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
 
     - name: Run issue-metrics tool
-      uses: github/issue-metrics@v3
+      uses: github/issue-metrics@6a0f49b4e14363b63e65ec698b43715b69d21f6d # v3.20.0
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SEARCH_QUERY: 'repo:FreeCAD/FreeCAD is:issue created:${{ env.last_month }}'
 
     - name: Create issue
-      uses: peter-evans/create-issue-from-file@v4
+      uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5.0.1
       with:
         title: Monthly issue metrics report
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/labeler.yml

@@ -9,6 +9,9 @@ on:
   pull_request_target:
     types: [opened, reopened]
 
+permissions:
+  contents: read
+
 jobs:
   label:
     runs-on: ubuntu-latest
@@ -17,7 +20,12 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/labeler@v5
+    - name: Harden the runner (Audit all outbound calls)
+      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+      with:
+        egress-policy: audit
+
+    - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         configuration-path: ".github/labels.yml"

.github/workflows/scorecards.yml

@@ -0,0 +1,81 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '20 7 * * 2'
+  push:
+    branches: ["main"]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      contents: read
+      actions: read
+      # To allow GraphQL ListCommits to work
+      issues: read
+      pull-requests: read
+      # To detect SAST tools
+      checks: read
+
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
+      - name: "Checkout code"
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecards on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        with:
+          sarif_file: results.sarif

.github/workflows/sub_buildMacOSCondaApple.yml

@@ -1,171 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# *                                                                         *
-# *   Copyright (c) 2023 0penBrain.                                         *
-# *                                                                         *
-# *   This file is part of FreeCAD.                                         *
-# *                                                                         *
-# *   FreeCAD is free software: you can redistribute it and/or modify it    *
-# *   under the terms of the GNU Lesser General Public License as           *
-# *   published by the Free Software Foundation, either version 2.1 of the  *
-# *   License, or (at your option) any later version.                       *
-# *                                                                         *
-# *   FreeCAD is distributed in the hope that it will be useful, but        *
-# *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
-# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      *
-# *   Lesser General Public License for more details.                       *
-# *                                                                         *
-# *   You should have received a copy of the GNU Lesser General Public      *
-# *   License along with FreeCAD. If not, see                               *
-# *   <https://www.gnu.org/licenses/>.                                      *
-# *                                                                         *
-# ***************************************************************************
-
-# This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD on a Conda environment on macOS.
-
-name: Build macOS 13 (Apple Silicon)
-on:
-  workflow_call:
-    inputs:
-      artifactBasename:
-        type: string
-        required: true
-      testOnBuildDir:
-        default: false
-        type: boolean
-        required: false
-      allowedToFail:
-        default: false
-        type: boolean
-        required: false
-    outputs:
-      reportFile:
-        value: ${{ jobs.Build.outputs.reportFile }}
-
-jobs:
-  Build:
-    runs-on: macos-14
-    continue-on-error: ${{ inputs.allowedToFail }}
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/ccache
-      CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config
-      CCACHE_MAXSIZE: 1G
-      CCACHE_COMPILERCHECK: "%compiler% -dumpfullversion -dumpversion" # default:mtime
-      CCACHE_COMPRESS: true
-      CCACHE_COMPRESSLEVEL: 1
-      CC: arm64-apple-darwin20.0.0-clang
-      CXX: arm64-apple-darwin20.0.0-clang++
-      builddir: ${{ github.workspace }}/build/release/
-      logdir: /tmp/logs/
-      reportdir: /tmp/report/
-      reportfilename: ${{ inputs.artifactBasename }}-report.md
-    defaults:
-      run:
-        shell: bash -l {0}
-    outputs:
-      reportFile: ${{ steps.Init.outputs.reportFile }}
-
-    steps:
-      - name: Checking out source code
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup Miniconda
-        env:
-          CONDA_VERBOSITY: 2
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: .conda/freecad
-          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
-          channel-priority: true
-          miniforge-version: latest
-      - name: Install FreeCAD dependencies
-        env:
-          CONDA_VERBOSITY: 2
-        run: |
-          ./conda/setup-environment.sh
-      - name: Set Environment Variables
-        run: |
-          echo "CC=$CC" >> "$GITHUB_ENV"
-          echo "CXX=$CXX" >> "$GITHUB_ENV"
-      - name: Make needed directories, files and initializations
-        id: Init
-        run: |
-          mkdir -p ${{ env.CCACHE_DIR }}
-          mkdir -p ${{ env.CCACHE_CONFIGPATH }}
-          mkdir -p ${{ env.builddir }}
-          mkdir -p ${{ env.logdir }}
-          mkdir -p ${{ env.reportdir }}
-          echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
-      - name: Generate cache key
-        id: genCacheKey
-        uses: ./.github/workflows/actions/macos/generateCacheKey
-        with:
-          compiler: ${{ env.CXX }}
-      - name: Restore Compiler Cache
-        uses: actions/cache@v4
-        with:
-          save-always: true
-          path: ${{ env.CCACHE_DIR }}
-          key: FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
-          restore-keys: |
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-
-      - name: Print CCache statistics before build, reset stats and print config
-        run: |
-          ccache -s
-          ccache -z
-          ccache -p
-      - name: CMake Configure
-        run: |
-          mamba run --live-stream -p .conda/freecad cmake --preset conda-macos-release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.conda/freecad/opt/freecad
-      - name: CMake Build
-        run: |
-          mamba run --live-stream -p .conda/freecad cmake --build build/release
-      - name: Print ccache statistics after Build
-        run: |
-          ccache -s
-      - name: FreeCAD CLI tests on build dir
-        if: inputs.testOnBuildDir
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on build dir"
-          testCommand: ${{ env.builddir }}/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIBuild.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: C++ tests
-        timeout-minutes: 1
-        uses: ./.github/workflows/actions/runCPPTests/runAllTests
-        with:
-          reportdir: ${{ env.reportdir }}
-          builddir: ${{ env.builddir }}
-          reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
-      - name: CMake Install
-        run: |
-          mamba run --live-stream -p .conda/freecad cmake --install build/release
-      - name: FreeCAD CLI tests on install
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on install"
-          testCommand: ${{ github.workspace }}/.conda/freecad/opt/freecad/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIInstall.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: Upload logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.artifactBasename }}-Logs
-          path: |
-            ${{ env.logdir }}
-            /var/crash/*FreeCAD*
-      - name: Upload report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.reportfilename }}
-          path: |
-            ${{env.reportdir}}${{ env.reportfilename }}

.github/workflows/sub_buildMacOSCondaIntel.yml

@@ -1,171 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# *                                                                         *
-# *   Copyright (c) 2023 0penBrain.                                         *
-# *                                                                         *
-# *   This file is part of FreeCAD.                                         *
-# *                                                                         *
-# *   FreeCAD is free software: you can redistribute it and/or modify it    *
-# *   under the terms of the GNU Lesser General Public License as           *
-# *   published by the Free Software Foundation, either version 2.1 of the  *
-# *   License, or (at your option) any later version.                       *
-# *                                                                         *
-# *   FreeCAD is distributed in the hope that it will be useful, but        *
-# *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
-# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      *
-# *   Lesser General Public License for more details.                       *
-# *                                                                         *
-# *   You should have received a copy of the GNU Lesser General Public      *
-# *   License along with FreeCAD. If not, see                               *
-# *   <https://www.gnu.org/licenses/>.                                      *
-# *                                                                         *
-# ***************************************************************************
-
-# This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD on a Conda environment on macOS.
-
-name: Build macOS 13 (Intel)
-on:
-  workflow_call:
-    inputs:
-      artifactBasename:
-        type: string
-        required: true
-      testOnBuildDir:
-        default: false
-        type: boolean
-        required: false
-      allowedToFail:
-        default: false
-        type: boolean
-        required: false
-    outputs:
-      reportFile:
-        value: ${{ jobs.Build.outputs.reportFile }}
-
-jobs:
-  Build:
-    runs-on: macos-13
-    continue-on-error: ${{ inputs.allowedToFail }}
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/ccache
-      CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config
-      CCACHE_MAXSIZE: 1G
-      CCACHE_COMPILERCHECK: "%compiler% -dumpfullversion -dumpversion" # default:mtime
-      CCACHE_COMPRESS: true
-      CCACHE_COMPRESSLEVEL: 1
-      CC: x86_64-apple-darwin13.4.0-clang
-      CXX: x86_64-apple-darwin13.4.0-clang++
-      builddir: ${{ github.workspace }}/build/release/
-      logdir: /tmp/logs/
-      reportdir: /tmp/report/
-      reportfilename: ${{ inputs.artifactBasename }}-report.md
-    defaults:
-      run:
-        shell: bash -l {0}
-    outputs:
-      reportFile: ${{ steps.Init.outputs.reportFile }}
-
-    steps:
-      - name: Checking out source code
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup Miniconda
-        env:
-          CONDA_VERBOSITY: 2
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: .conda/freecad
-          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
-          channel-priority: true
-          miniforge-version: latest
-      - name: Install FreeCAD dependencies
-        env:
-          CONDA_VERBOSITY: 2
-        run: |
-          ./conda/setup-environment.sh
-      - name: Set Environment Variables
-        run: |
-          echo "CC=$CC" >> "$GITHUB_ENV"
-          echo "CXX=$CXX" >> "$GITHUB_ENV"
-      - name: Make needed directories, files and initializations
-        id: Init
-        run: |
-          mkdir -p ${{ env.CCACHE_DIR }}
-          mkdir -p ${{ env.CCACHE_CONFIGPATH }}
-          mkdir -p ${{ env.builddir }}
-          mkdir -p ${{ env.logdir }}
-          mkdir -p ${{ env.reportdir }}
-          echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
-      - name: Generate cache key
-        id: genCacheKey
-        uses: ./.github/workflows/actions/macos/generateCacheKey
-        with:
-          compiler: ${{ env.CXX }}
-      - name: Restore Compiler Cache
-        uses: actions/cache@v4
-        with:
-          save-always: true
-          path: ${{ env.CCACHE_DIR }}
-          key: FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
-          restore-keys: |
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-
-      - name: Print CCache statistics before build, reset stats and print config
-        run: |
-          ccache -s
-          ccache -z
-          ccache -p
-      - name: CMake Configure
-        run: |
-          mamba run --live-stream -p .conda/freecad cmake --preset conda-macos-release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.conda/freecad/opt/freecad
-      - name: CMake Build
-        run: |
-          mamba run --live-stream -p .conda/freecad cmake --build build/release
-      - name: Print ccache statistics after Build
-        run: |
-          ccache -s
-      - name: FreeCAD CLI tests on build dir
-        if: inputs.testOnBuildDir
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on build dir"
-          testCommand: ${{ env.builddir }}/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIBuild.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: C++ tests
-        timeout-minutes: 1
-        uses: ./.github/workflows/actions/runCPPTests/runAllTests
-        with:
-          reportdir: ${{ env.reportdir }}
-          builddir: ${{ env.builddir }}
-          reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
-      - name: CMake Install
-        run: |
-          mamba run --live-stream -p .conda/freecad cmake --install build/release
-      - name: FreeCAD CLI tests on install
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on install"
-          testCommand: ${{ github.workspace }}/.conda/freecad/opt/freecad/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIInstall.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: Upload logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.artifactBasename }}-Logs
-          path: |
-            ${{ env.logdir }}
-            /var/crash/*FreeCAD*
-      - name: Upload report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.reportfilename }}
-          path: |
-            ${{env.reportdir}}${{ env.reportfilename }}

.github/workflows/sub_buildPixi.yml

@@ -0,0 +1,223 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# ***************************************************************************
+# *                                                                         *
+# *   Copyright (c) 2024 0penBrain, Lorenz Lechner and Jacob Oursland.      *
+# *                                                                         *
+# *   This file is part of FreeCAD.                                         *
+# *                                                                         *
+# *   FreeCAD is free software: you can redistribute it and/or modify it    *
+# *   under the terms of the GNU Lesser General Public License as           *
+# *   published by the Free Software Foundation, either version 2.1 of the  *
+# *   License, or (at your option) any later version.                       *
+# *                                                                         *
+# *   FreeCAD is distributed in the hope that it will be useful, but        *
+# *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      *
+# *   Lesser General Public License for more details.                       *
+# *                                                                         *
+# *   You should have received a copy of the GNU Lesser General Public      *
+# *   License along with FreeCAD. If not, see                               *
+# *   <https://www.gnu.org/licenses/>.                                      *
+# *                                                                         *
+# ***************************************************************************
+
+# This is a build and test workflow for CI of FreeCAD.
+# This workflow aims at building and testing FreeCAD on a Conda environment on macOS.
+
+name: Pixi Builds
+
+on:
+  workflow_call:
+    inputs:
+      artifactBasename:
+        type: string
+        required: true
+      testOnBuildDir:
+        default: false
+        type: boolean
+        required: false
+      allowedToFail:
+        default: false
+        type: boolean
+        required: false
+    outputs:
+      reportFile:
+        value: ${{ jobs.Build.outputs.reportFile }}
+
+jobs:
+  build_with_pixi:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ inputs.allowedToFail }}
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/ccache
+      CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config
+      CCACHE_MAXSIZE: 1G
+      CCACHE_COMPRESS: true
+      CCACHE_COMPRESSLEVEL: 5
+      builddir: ${{ github.workspace }}/build/
+      cacheKey: pixi-${{ matrix.os }}
+      logdir: ${{ github.workspace }}/logs/
+      reportdir: ${{ github.workspace }}/report/
+      reportfilename: ${{ inputs.artifactBasename }}-${{ matrix.os }}-report.md
+    outputs:
+      reportFile: ${{ steps.Init.outputs.reportFile }}
+
+    strategy:
+      max-parallel: 6
+      fail-fast: false
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+
+    steps:
+    - name: Harden the runner (Audit all outbound calls)
+      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+      with:
+        egress-policy: audit
+
+    - name: Set Platform Environment Variables
+      shell: bash -l {0}
+      env:
+        OPERATING_SYSTEM: ${{ runner.os }}
+      run: |
+        if [[ $OPERATING_SYSTEM == 'Windows' ]]; then
+          echo 'CCACHE_COMPILERCHECK=%compiler%' >> "$GITHUB_ENV"
+        else
+          echo 'CCACHE_COMPILERCHECK=%compiler% -dumpfullversion -dumpversion' >> "$GITHUB_ENV"
+        fi
+
+    - name: Checkout
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+    - name: Add GCC Problem Matcher
+      if: runner.os == 'Linux'
+      run: |
+        echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/gcc.json"
+
+    - name: Add Clang Problem Matcher
+      if: runner.os == 'macOS'
+      run: |
+        echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/clang.json"
+
+    - name: Add MSVC++ Problem Matcher
+      if: runner.os == 'Windows'
+      run: |
+        echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/msvc.json"
+
+    - name: Make needed directories, files and initializations
+      id: Init
+      run: |
+        mkdir -p ${{ env.builddir }}
+        mkdir -p ${{ env.logdir }}
+        mkdir -p ${{ env.reportdir }}
+        echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
+
+    - uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
+      with:
+        pixi-version: v0.45.0
+        cache: false
+
+    - name: Restore Compiler Cache
+      uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      with:
+        path: ${{ env.CCACHE_DIR }}
+        key: FC-${{ env.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
+        restore-keys: |
+          FC-${{ env.cacheKey }}-${{ github.ref }}-
+          FC-${{ env.cacheKey }}-
+
+    - name: Print CCache statistics before build, reset stats and print config
+      run: |
+        pixi run ccache -s
+        pixi run ccache -z
+        pixi run ccache -p
+
+    - name: CMake Configure
+      run: |
+        pixi run configure-release
+
+    - name: CMake Build
+      run: |
+        pixi run build
+
+    - name: Print ccache statistics after Build
+      run: |
+        pixi run ccache -s
+
+    - name: FreeCAD CLI tests on build dir
+      if: inputs.testOnBuildDir
+      timeout-minutes: 10
+      uses: ./.github/workflows/actions/runPythonTests
+      with:
+        testDescription: "CLI tests on build dir"
+        testCommand: pixi run ${{ env.builddir }}/bin/FreeCADCmd -t 0
+        logFile: ${{ env.logdir }}TestCLIBuild.log
+        reportFile: ${{env.reportdir}}${{ env.reportfilename }}
+
+    - name: FreeCAD GUI tests on build dir
+      if: runner.os == 'Linux' && inputs.testOnBuildDir
+      timeout-minutes: 15
+      uses: ./.github/workflows/actions/runPythonTests
+      with:
+        testDescription: "GUI tests on build dir"
+        testCommand: pixi run xvfb-run ${{ env.builddir }}/bin/FreeCAD -t 0
+        logFile: ${{ env.logdir }}TestGUIBuild.log
+        reportFile: ${{env.reportdir}}${{ env.reportfilename }}
+
+    - name: C++ tests
+      timeout-minutes: 10
+      if: runner.os != 'Windows'
+      uses: ./.github/workflows/actions/runCPPTests/runAllTests
+      with:
+        reportdir: ${{ env.reportdir }}
+        builddir: ${{ env.builddir }}
+        reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
+
+    - name: CMake Install
+      run: |
+        pixi run install
+
+    - name: FreeCAD CLI tests on install
+      if: runner.os != 'Windows'
+      timeout-minutes: 10
+      uses: ./.github/workflows/actions/runPythonTests
+      with:
+        testDescription: "CLI tests on install"
+        testCommand: pixi run FreeCADCmd -t 0
+        logFile: ${{ env.logdir }}TestCLIInstall.log
+        reportFile: ${{env.reportdir}}${{ env.reportfilename }}
+
+    - name: FreeCAD GUI tests on install
+      # if: runner.os == 'Linux'
+      # currently broken on Qt6 builds
+      if: false
+      timeout-minutes: 15
+      uses: ./.github/workflows/actions/runPythonTests
+      with:
+        testDescription: "GUI tests on install"
+        testCommand: pixi run xvfb-run FreeCAD -t 0
+        logFile: ${{ env.logdir }}TestGUIInstall.log
+        reportFile: ${{env.reportdir}}${{ env.reportfilename }}
+
+    - name: Save Compiler Cache
+      if: always()
+      uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      with:
+        path: ${{ env.CCACHE_DIR }}
+        key: FC-${{ env.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
+
+    - name: Upload logs
+      if: always()
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      with:
+        name: ${{ inputs.artifactBasename }}-${{ matrix.os }}-Logs
+        path: |
+          ${{ env.logdir }}
+          /var/crash/*FreeCAD*
+
+    - name: Upload report
+      if: always()
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      with:
+        name: ${{ env.reportfilename }}
+        path: |
+          ${{env.reportdir}}${{ env.reportfilename }}

.github/workflows/sub_buildUbuntu.yml

@@ -22,9 +22,10 @@
 # ***************************************************************************
 
 # This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD on a Conda environment on Linux.
+# This workflow aims at building and testing FreeCAD on Ubuntu 22.04 using GCC.
+
+name: Build Ubuntu 22.04
 
-name: Build Ubuntu 22.04 (Conda)
 on:
   workflow_call:
     inputs:
@@ -44,6 +45,7 @@ on:
         value: ${{ jobs.Build.outputs.reportFile }}
 
 jobs:
+
   Build:
     runs-on: ubuntu-22.04
     continue-on-error: ${{ inputs.allowedToFail }}
@@ -54,40 +56,33 @@ jobs:
       CCACHE_COMPILERCHECK: "%compiler% -dumpfullversion -dumpversion" # default:mtime
       CCACHE_COMPRESS: true
       CCACHE_COMPRESSLEVEL: 1
+      CC: /usr/bin/gcc
+      CXX: /usr/bin/g++
+      #CC: /usr/bin/clang
+      #CXX: /usr/bin/clang++
       builddir: ${{ github.workspace }}/build/release/
       logdir: /tmp/logs/
       reportdir: /tmp/report/
       reportfilename: ${{ inputs.artifactBasename }}-report.md
     defaults:
       run:
-        shell: bash -l {0}
+        shell: bash
     outputs:
       reportFile: ${{ steps.Init.outputs.reportFile }}
 
     steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
       - name: Checking out source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: true
-      - name: Setup Miniconda
-        env:
-          CONDA_VERBOSITY: 2
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: .conda/freecad
-          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
-          channel-priority: true
-          miniforge-version: latest
       - name: Install FreeCAD dependencies
-        env:
-          CONDA_VERBOSITY: 2
-        run: |
-          ./conda/setup-environment.sh
-      - name: Set Environment Variables
-        run: |
-          echo "CC=$CC" >> "$GITHUB_ENV"
-          echo "CXX=$CXX" >> "$GITHUB_ENV"
+        run: ./package/ubuntu/install-apt-packages.sh
+
       - name: Make needed directories, files and initializations
         id: Init
         run: |
@@ -102,8 +97,9 @@ jobs:
         uses: ./.github/workflows/actions/linux/generateCacheKey
         with:
           compiler: ${{ env.CXX }}
+          qt_major_version: 5
       - name: Restore Compiler Cache
-        uses: actions/cache@v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           save-always: true
           path: ${{ env.CCACHE_DIR }}
@@ -116,10 +112,14 @@ jobs:
           ccache -s
           ccache -z
           ccache -p
+      - name: Install cmake
+        uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be # v2.0.2
+        with:
+          cmake-version: '3.31.6'
       - name: CMake Configure
         uses: ./.github/workflows/actions/linux/configure
         with:
-          extraParameters: --preset conda-linux-release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.conda/freecad/opt/freecad
+          extraParameters: -G Ninja --preset release
           builddir: ${{ env.builddir }}
           logFile: ${{ env.logdir }}Cmake.log
           errorFile: ${{ env.logdir }}CmakeErrors.log
@@ -171,7 +171,7 @@ jobs:
         uses: ./.github/workflows/actions/runPythonTests
         with:
           testDescription: "CLI tests on install"
-          testCommand: ${{ github.workspace }}/.conda/freecad/opt/freecad/bin/FreeCADCmd -t 0
+          testCommand: FreeCADCmd -t 0
           logFile: ${{ env.logdir }}TestCLIInstall.log
           reportFile: ${{env.reportdir}}${{ env.reportfilename }}
       - name: FreeCAD GUI tests on install
@@ -179,12 +179,12 @@ jobs:
         uses: ./.github/workflows/actions/runPythonTests
         with:
           testDescription: "GUI tests on install"
-          testCommand: xvfb-run ${{ github.workspace }}/.conda/freecad/opt/freecad/bin/FreeCAD -t 0
+          testCommand: xvfb-run FreeCAD -t 0
           logFile: ${{ env.logdir }}TestGUIInstall.log
           reportFile: ${{env.reportdir}}${{ env.reportfilename }}
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |
@@ -192,7 +192,7 @@ jobs:
             /var/crash/*FreeCAD*
       - name: Upload report
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ env.reportfilename }}
           path: |

.github/workflows/sub_buildUbuntu2004.yml

@@ -1,249 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# *                                                                         *
-# *   Copyright (c) 2023 0penBrain.                                         *
-# *                                                                         *
-# *   This file is part of FreeCAD.                                         *
-# *                                                                         *
-# *   FreeCAD is free software: you can redistribute it and/or modify it    *
-# *   under the terms of the GNU Lesser General Public License as           *
-# *   published by the Free Software Foundation, either version 2.1 of the  *
-# *   License, or (at your option) any later version.                       *
-# *                                                                         *
-# *   FreeCAD is distributed in the hope that it will be useful, but        *
-# *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
-# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      *
-# *   Lesser General Public License for more details.                       *
-# *                                                                         *
-# *   You should have received a copy of the GNU Lesser General Public      *
-# *   License along with FreeCAD. If not, see                               *
-# *   <https://www.gnu.org/licenses/>.                                      *
-# *                                                                         *
-# ***************************************************************************
-
-# This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD on Ubuntu 20.04 using GCC.
-
-name: Build Ubuntu 20.04
-
-on:
-  workflow_call:
-    inputs:
-      artifactBasename:
-        type: string
-        required: true
-      testOnBuildDir:
-        default: false
-        type: boolean
-        required: false
-      allowedToFail:
-        default: false
-        type: boolean
-        required: false
-    outputs:
-      reportFile:
-        value: ${{ jobs.Build.outputs.reportFile }}
-
-jobs:
-
-  Build:
-    runs-on: ubuntu-20.04
-    continue-on-error: ${{ inputs.allowedToFail }}
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/ccache
-      CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config
-      CCACHE_MAXSIZE: 1G
-      CCACHE_COMPILERCHECK: "%compiler% -dumpfullversion -dumpversion" # default:mtime
-      CCACHE_COMPRESS: true
-      CCACHE_COMPRESSLEVEL: 1
-      CC: /usr/bin/gcc
-      CXX: /usr/bin/g++
-      #CC: /usr/bin/clang
-      #CXX: /usr/bin/clang++
-      builddir: ${{ github.workspace }}/build/release/
-      logdir: /tmp/logs/
-      reportdir: /tmp/report/
-      reportfilename: ${{ inputs.artifactBasename }}-report.md
-    defaults:
-      run:
-        shell: bash
-    outputs:
-      reportFile: ${{ steps.Init.outputs.reportFile }}
-
-    steps:
-      - name: Checking out source code
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Install FreeCAD dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends               \
-                            ccache                                      \
-                            doxygen                                     \
-                            graphviz                                    \
-                            imagemagick                                 \
-                            libboost-date-time-dev                      \
-                            libboost-dev                                \
-                            libboost-filesystem-dev                     \
-                            libboost-graph-dev                          \
-                            libboost-iostreams-dev                      \
-                            libboost-program-options-dev                \
-                            libboost-python-dev                         \
-                            libboost-regex-dev                          \
-                            libboost-serialization-dev                  \
-                            libboost-thread-dev                         \
-                            libcoin-dev                                 \
-                            libeigen3-dev                               \
-                            libgts-bin                                  \
-                            libgts-dev                                  \
-                            libkdtree++-dev                             \
-                            libmedc-dev                                 \
-                            libocct-data-exchange-dev                   \
-                            libocct-ocaf-dev                            \
-                            libocct-visualization-dev                   \
-                            libopencv-dev                               \
-                            libproj-dev                                 \
-                            libpyside2-dev                              \
-                            libqt5opengl5-dev                           \
-                            libqt5svg5-dev                              \
-                            libqt5x11extras5-dev                        \
-                            libshiboken2-dev                            \
-                            libspnav-dev                                \
-                            libvtk7-dev                                 \
-                            libx11-dev                                  \
-                            libxerces-c-dev                             \
-                            libyaml-cpp-dev                             \
-                            libzipios++-dev                             \
-                            netgen                                      \
-                            netgen-headers                              \
-                            ninja-build                                 \
-                            occt-draw                                   \
-                            pyqt5-dev-tools                             \
-                            pyside2-tools                               \
-                            python3-dev                                 \
-                            python3-git                                 \
-                            python3-markdown                            \
-                            python3-matplotlib                          \
-                            python3-packaging                           \
-                            python3-pivy                                \
-                            python3-ply                                 \
-                            python3-pyside2.qtcore                      \
-                            python3-pyside2.qtgui                       \
-                            python3-pyside2.qtnetwork                   \
-                            python3-pyside2.qtsvg                       \
-                            python3-pyside2.qtwidgets                   \
-                            qtbase5-dev                                 \
-                            qttools5-dev                                \
-                            shiboken2                                   \
-                            swig                                        \
-                            xvfb
-      - name: Make needed directories, files and initializations
-        id: Init
-        run: |
-          mkdir -p ${{ env.CCACHE_DIR }}
-          mkdir -p ${{ env.CCACHE_CONFIGPATH }}
-          mkdir -p ${{ env.builddir }}
-          mkdir -p ${{ env.logdir }}
-          mkdir -p ${{ env.reportdir }}
-          echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
-      - name: Generate cache key
-        id: genCacheKey
-        uses: ./.github/workflows/actions/linux/generateCacheKey
-        with:
-          compiler: ${{ env.CXX }}
-      - name: Restore Compiler Cache
-        uses: actions/cache@v4
-        with:
-          save-always: true
-          path: ${{ env.CCACHE_DIR }}
-          key: FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
-          restore-keys: |
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-
-      - name: Print CCache statistics before build, reset stats and print config
-        run: |
-          ccache -s
-          ccache -z
-          ccache -p
-      - name: CMake Configure
-        uses: ./.github/workflows/actions/linux/configure
-        with:
-          extraParameters: -G Ninja --preset release
-          builddir: ${{ env.builddir }}
-          logFile: ${{ env.logdir }}Cmake.log
-          errorFile: ${{ env.logdir }}CmakeErrors.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: CMake Build
-        uses: ./.github/workflows/actions/linux/build
-        with:
-          builddir: ${{ env.builddir }}
-          logFile: ${{ env.logdir }}Build.log
-          errorFile: ${{ env.logdir }}BuildErrors.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: Print ccache statistics after Build
-        run: |
-          ccache -s
-      - name: FreeCAD CLI tests on build dir
-        if: inputs.testOnBuildDir
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on build dir"
-          testCommand: ${{ env.builddir }}/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIBuild.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: FreeCAD GUI tests on build dir
-        if: inputs.testOnBuildDir
-        timeout-minutes: 15
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "GUI tests on build dir"
-          testCommand: xvfb-run ${{ env.builddir }}/bin/FreeCAD -t 0
-          logFile: ${{ env.logdir }}TestGUIBuild.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: C++ tests
-        timeout-minutes: 1
-        uses: ./.github/workflows/actions/runCPPTests/runAllTests
-        with:
-          reportdir: ${{ env.reportdir }}
-          builddir: ${{ env.builddir }}
-          reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
-      - name: CMake Install
-        uses: ./.github/workflows/actions/linux/install
-        with:
-          builddir: ${{ env.builddir }}
-          logFile: ${{ env.logdir }}Install.log
-          errorFile: ${{ env.logdir }}InstallErrors.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: FreeCAD CLI tests on install
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on install"
-          testCommand: FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIInstall.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: FreeCAD GUI tests on install
-        timeout-minutes: 15
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "GUI tests on install"
-          testCommand: xvfb-run FreeCAD -t 0
-          logFile: ${{ env.logdir }}TestGUIInstall.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: Upload logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.artifactBasename }}-Logs
-          path: |
-            ${{ env.logdir }}
-            /var/crash/*FreeCAD*
-      - name: Upload report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.reportfilename }}
-          path: |
-            ${{env.reportdir}}${{ env.reportfilename }}

.github/workflows/sub_buildUbuntu2204CondaQt6.yml

@@ -1,210 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# *                                                                         *
-# *   Copyright (c) 2023 0penBrain.                                         *
-# *                                                                         *
-# *   This file is part of FreeCAD.                                         *
-# *                                                                         *
-# *   FreeCAD is free software: you can redistribute it and/or modify it    *
-# *   under the terms of the GNU Lesser General Public License as           *
-# *   published by the Free Software Foundation, either version 2.1 of the  *
-# *   License, or (at your option) any later version.                       *
-# *                                                                         *
-# *   FreeCAD is distributed in the hope that it will be useful, but        *
-# *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
-# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      *
-# *   Lesser General Public License for more details.                       *
-# *                                                                         *
-# *   You should have received a copy of the GNU Lesser General Public      *
-# *   License along with FreeCAD. If not, see                               *
-# *   <https://www.gnu.org/licenses/>.                                      *
-# *                                                                         *
-# ***************************************************************************
-
-# This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD on a Conda environment on Linux.
-
-name: Build Ubuntu 22.04 (Conda)
-on:
-  workflow_call:
-    inputs:
-      artifactBasename:
-        type: string
-        required: true
-      testOnBuildDir:
-        default: false
-        type: boolean
-        required: false
-      allowedToFail:
-        default: false
-        type: boolean
-        required: false
-    outputs:
-      reportFile:
-        value: ${{ jobs.Build.outputs.reportFile }}
-
-jobs:
-  Build:
-    runs-on: ubuntu-22.04
-    continue-on-error: ${{ inputs.allowedToFail }}
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/ccache
-      CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config
-      CCACHE_MAXSIZE: 1G
-      CCACHE_COMPILERCHECK: "%compiler% -dumpfullversion -dumpversion" # default:mtime
-      CCACHE_COMPRESS: true
-      CCACHE_COMPRESSLEVEL: 1
-      builddir: ${{ github.workspace }}/build/release/
-      logdir: /tmp/logs/
-      reportdir: /tmp/report/
-      reportfilename: ${{ inputs.artifactBasename }}-report.md
-    defaults:
-      run:
-        shell: bash -l {0}
-    outputs:
-      reportFile: ${{ steps.Init.outputs.reportFile }}
-
-    steps:
-      - name: Checking out source code
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup Miniconda
-        env:
-          CONDA_VERBOSITY: 2
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: .conda/freecad
-          environment-file: conda/conda-env-qt6.yaml
-          channels: conda-forge,defaults
-          channel-priority: true
-          miniforge-version: latest
-      - name: Install FreeCAD dependencies
-        env:
-          CONDA_VERBOSITY: 2
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends \
-            libegl1                                       \
-            libgl1                                        \
-            libglx0                                       \
-            libopengl0
-          ./conda/setup-environment-qt6.sh
-      - name: Set Environment Variables
-        run: |
-          echo "CC=$CC" >> "$GITHUB_ENV"
-          echo "CXX=$CXX" >> "$GITHUB_ENV"
-      - name: Make needed directories, files and initializations
-        id: Init
-        run: |
-          mkdir -p ${{ env.CCACHE_DIR }}
-          mkdir -p ${{ env.CCACHE_CONFIGPATH }}
-          mkdir -p ${{ env.builddir }}
-          mkdir -p ${{ env.logdir }}
-          mkdir -p ${{ env.reportdir }}
-          echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
-      - name: Generate cache key
-        id: genCacheKey
-        uses: ./.github/workflows/actions/linux/generateCacheKey
-        with:
-          compiler: ${{ env.CXX }}
-      - name: Restore Compiler Cache
-        uses: actions/cache@v4
-        with:
-          save-always: true
-          path: ${{ env.CCACHE_DIR }}
-          key: FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-${{ github.run_id }}-qt6
-          restore-keys: |
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-qt6-
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-qt6-
-      - name: Print CCache statistics before build, reset stats and print config
-        run: |
-          ccache -s
-          ccache -z
-          ccache -p
-      - name: CMake Configure
-        uses: ./.github/workflows/actions/linux/configure
-        with:
-          extraParameters: >
-            --preset conda-linux-release
-            -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.conda/freecad/opt/freecad
-            -DQT_HOST_PATH=${{ github.workspace }}/.conda/freecad/
-            -DFREECAD_QT_VERSION=6
-            -DBUILD_REVERSEENGINEERING=OFF
-          builddir: ${{ env.builddir }}
-          logFile: ${{ env.logdir }}Cmake.log
-          errorFile: ${{ env.logdir }}CmakeErrors.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: CMake Build
-        uses: ./.github/workflows/actions/linux/build
-        with:
-          builddir: ${{ env.builddir }}
-          logFile: ${{ env.logdir }}Build.log
-          errorFile: ${{ env.logdir }}BuildErrors.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: Print ccache statistics after Build
-        run: |
-          ccache -s
-      - name: FreeCAD CLI tests on build dir
-        if: inputs.testOnBuildDir
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on build dir"
-          testCommand: ${{ env.builddir }}/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIBuild.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: FreeCAD GUI tests on build dir
-        if: inputs.testOnBuildDir
-        timeout-minutes: 15
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "GUI tests on build dir"
-          testCommand: xvfb-run ${{ env.builddir }}/bin/FreeCAD -t 0
-          logFile: ${{ env.logdir }}TestGUIBuild.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: C++ tests
-        timeout-minutes: 1
-        uses: ./.github/workflows/actions/runCPPTests/runAllTests
-        with:
-          reportdir: ${{ env.reportdir }}
-          builddir: ${{ env.builddir }}
-          reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
-      - name: CMake Install
-        uses: ./.github/workflows/actions/linux/install
-        with:
-          builddir: ${{ env.builddir }}
-          logFile: ${{ env.logdir }}Install.log
-          errorFile: ${{ env.logdir }}InstallErrors.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: FreeCAD CLI tests on install
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on install"
-          testCommand: ${{ github.workspace }}/.conda/freecad/opt/freecad/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIInstall.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: FreeCAD GUI tests on install
-        timeout-minutes: 15
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "GUI tests on install"
-          testCommand: xvfb-run ${{ github.workspace }}/.conda/freecad/opt/freecad/bin/FreeCAD -t 0
-          logFile: ${{ env.logdir }}TestGUIInstall.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: Upload logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.artifactBasename }}-Logs
-          path: |
-            ${{ env.logdir }}
-            /var/crash/*FreeCAD*
-      - name: Upload report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.reportfilename }}
-          path: |
-            ${{env.reportdir}}${{ env.reportfilename }}

.github/workflows/sub_buildWindows.yml

@@ -62,8 +62,13 @@ jobs:
       reportFile: ${{ steps.Init.outputs.reportFile }}
 
     steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
       - name: Checking out source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: true
       - name: Make needed directories, files and initializations
@@ -85,7 +90,7 @@ jobs:
         with:
           libpackdir: ${{ env.libpackdir }}
       - name: Restore compiler cache
-        uses: actions/cache@v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           save-always: true
           path: ${{ env.CCACHE_DIR }}
@@ -98,6 +103,10 @@ jobs:
           . $env:ccachebindir\ccache -s
           . $env:ccachebindir\ccache -z
           . $env:ccachebindir\ccache -p
+      - name: Install cmake
+        uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be # v2.0.2
+        with:
+          cmake-version: '3.31.6'
       - name: Configuring CMake
         run: >
           cmake -B"${{ env.builddir }}" .
@@ -111,7 +120,7 @@ jobs:
           -DFREECAD_COPY_LIBPACK_BIN_TO_BUILD=ON
           -DFREECAD_COPY_PLUGINS_BIN_TO_BUILD=ON
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
       - name: Compiling sources
         run: |
           cd $env:builddir
@@ -129,7 +138,7 @@ jobs:
           . ${{ env.builddir }}\bin\FreeCADCmd -t 0 # 2>&1 | tee -filepath ${{ env.logdir }}\integrationTests.log
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |

.github/workflows/sub_buildWindowsConda.yml

@@ -1,133 +0,0 @@
-# ***************************************************************************
-# *   Copyright (c) 2023 0penBrain                               *
-# *                                                                         *
-# *   This program is free software; you can redistribute it and/or modify  *
-# *   it under the terms of the GNU Lesser General Public License (LGPL)    *
-# *   as published by the Free Software Foundation; either version 2 of     *
-# *   the License, or (at your option) any later version.                   *
-# *   for detail see the LICENCE text file.                                 *
-# *                                                                         *
-# *   This program is distributed in the hope that it will be useful,       *
-# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-# *   GNU Library General Public License for more details.                  *
-# *                                                                         *
-# *   You should have received a copy of the GNU Library General Public     *
-# *   License along with this program; if not, write to the Free Software   *
-# *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
-# *   USA                                                                   *
-# *                                                                         *
-# ***************************************************************************
-
-# This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD using a Conda environment on Windows with MSVC.
-
-name: Build Windows (Conda)
-on:
-  workflow_call:
-    inputs:
-      artifactBasename:
-        type: string
-        required: true
-      allowedToFail:
-        default: false
-        type: boolean
-        required: false
-    outputs:
-      reportFile:
-        value: ${{ jobs.Build.outputs.reportFile }}
-
-jobs:
-  Build:
-    runs-on: windows-latest
-    continue-on-error: ${{ inputs.allowedToFail }}
-    env:
-      CCACHE_DIR: C:/FC/cache/
-      CCACHE_COMPILERCHECK: "%compiler%" # default:mtime
-      CCACHE_MAXSIZE: 1G
-      CCACHE_COMPRESS: true
-      CCACHE_COMPRESSLEVEL: 1
-      CCACHE_NOHASHDIR: true
-      CCACHE_DIRECT: true
-      #CCACHE_SLOPPINESS: "pch_defines,time_macros" # Can't get PCH to work on Windows
-      CCACHE_LOGFILE: C:/logs/ccache.log
-      ## Have to use C:\ because not enough space on workspace drive
-      builddir: C:/FC/build/
-      logdir: C:/logs/
-      reportdir: C:/report/
-      reportfilename: ${{ inputs.artifactBasename }}-report.md
-    outputs:
-      reportFile: ${{ steps.Init.outputs.reportFile }}
-
-    steps:
-      - name: Checking out source code
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup Miniconda
-        env:
-          CONDA_VERBOSITY: 2
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: .conda/freecad
-          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
-          channel-priority: true
-          miniforge-version: latest
-      - name: Install FreeCAD dependencies
-        env:
-          CONDA_VERBOSITY: 2
-        run: |
-          conda config --add envs_dirs $PWD/.conda
-          mamba-devenv --no-prune -f conda/environment.devenv.yml
-      - name: Make needed directories, files and initializations
-        id: Init
-        run: |
-          mkdir ${{ env.CCACHE_DIR }}
-          mkdir ${{ env.builddir }}
-          mkdir ${{ env.logdir }}
-          mkdir ${{ env.reportdir }}
-          echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
-      - name: Restore compiler cache
-        uses: actions/cache@v4
-        with:
-          save-always: true
-          path: ${{ env.CCACHE_DIR }}
-          key: FC-Windows-Conda-${{ github.ref }}-${{ github.run_id }}
-          restore-keys: |
-            FC-Windows-Conda-${{ github.ref }}-
-            FC-Windows-Conda-
-      - name: Print Ccache statistics before build, reset stats and print config
-        run: |
-          ccache -s
-          ccache -z
-          ccache -p
-      - name: Configuring CMake
-        shell: cmd /C CALL {0}
-        run: >
-          conda\cmake.cmd --preset conda-windows-release -DFREECAD_USE_PCH:BOOL=OFF -DFREECAD_RELEASE_PDB:BOOL=OFF -DFREECAD_USE_CCACHE:BOOL=ON
-      - name: Compiling sources
-        shell: cmd /C CALL {0}
-        run: >
-          conda\cmake.cmd --build build\release
-      - name: Print Ccache statistics after build
-        run: |
-          ccache -s
-      - name: CMake Install
-        shell: cmd /C CALL {0}
-        run: |
-          conda\cmake.cmd  --install build\release
-      - name: C++ unit tests
-        timeout-minutes: 1
-        run: |
-          . build\release\tests\Tests_run --gtest_output=json:${{ env.reportdir }}gtest_results.json # 2>&1 | tee -filepath ${{ env.logdir }}/unitTests.log
-      - name: FreeCAD CLI tests
-        run: |
-          . build\release\bin\FreeCADCmd -t 0 # 2>&1 | tee -filepath ${{ env.logdir }}/integrationTests.log
-      - name: Upload logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.artifactBasename }}-Logs
-          path: |
-            ${{ env.logdir }}

.github/workflows/sub_lint.yml

@@ -76,14 +76,6 @@ on:
         default: true
         type: boolean
         required: false
-      cpplintFilters:
-        default: -whitespace-*
-        type: string
-        required: false
-      cpplintLineLength:
-        default: 120
-        type: string
-        required: false
       cpplintFailSilent:
         default: true
         type: boolean
@@ -129,7 +121,7 @@ on:
         type: string
         required: false
       spellingIgnore:
-        default: ./.git,*.po,*.ts,*.svg,./ChangeLog.txt,./src/3rdParty,./src/Mod/Assembly/App/opendcm,./src/CXX,./src/zipios++,./src/Base/swig*,./src/Mod/Robot/App/kdl_cp,./src/Mod/Import/App/SCL*,./src/WindowsInstaller,./src/Doc/FreeCAD.uml,./build/
+        default: ./.git*,*.po,*.ts,*.svg,./src/3rdParty,./src/Base/swig*,./src/Mod/Robot/App/kdl_cp,./src/Mod/Import/App/SCL*,./src/Doc/FreeCAD.uml,./build/
         type: string
         required: false
       codespellFailSilent:
@@ -140,16 +132,12 @@ on:
         default: true
         type: boolean
         required: false
-      clangTidyChecks:
-        default: # empty to use the .clang-tidy file
-        type: string
-        required: false
       clangTidyFailSilent:
         default: true # warnings or notes will never fail the CI, only errors
         type: boolean
         required: false
       checkClazy: # for the Message codes see: https://invent.kde.org/sdk/clazy#list-of-checks
-        default: true
+        default: false
         type: boolean
         required: false
       clazyChecks:
@@ -161,7 +149,7 @@ on:
         type: boolean
         required: false
       checkClazyQT6:
-        default: true
+        default: false
         type: boolean
         required: false
       clazyQT6Checks:
@@ -180,6 +168,9 @@ on:
       reportFile:
         value: ${{ jobs.Lint.outputs.reportFile }}
 
+permissions:
+  contents: read
+
 jobs:
 
   Lint:
@@ -197,10 +188,16 @@ jobs:
       reportFile: ${{ steps.Init.outputs.reportFile }}
 
     steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: true
+
       - name: Make needed directories, files and initializations
         id: Init
         run: |
@@ -208,562 +205,156 @@ jobs:
           mkdir -p ${{ env.fixesdir }}
           mkdir -p ${{ env.reportdir }}
           echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
-    # Run generic lints
+
+    # Generic lints steps
+      - name: Check File Case Sensitivity
+        uses: credfeto/action-case-checker@cb652aeab29ed363bbdb7d9ee1bfcc010c46cac5 # v1.3.0
+
       - name: Check for non Unix line ending
         if: inputs.checkLineendings && always()
         continue-on-error: ${{ inputs.lineendingsFailSilent }}
         run: |
-          lineendings=0
-          for file in ${{ inputs.changedFiles }}
-          do
-            # Check for DOS or MAC line endings
-            if [[ $(file -b $file) =~ "with CR" ]]
-            then
-              echo "::warning file=$file,title=$file::File has non Unix line endings"
-              echo "$file has non Unix line endings" >> ${{ env.logdir }}lineendings.log
-              ((lineendings=lineendings+1))
-            fi
-          done
-          echo "Found $lineendings line ending errors"
-          # Write the report
-          if [ $lineendings -gt 0 ]
-          then
-            echo "<details><summary>:information_source: Found $lineendings problems with line endings</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-            cat ${{ env.logdir }}lineendings.log >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo ":heavy_check_mark: No line ending problem found  " >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $lineendings -eq 0 ]
+          python3 tools/lint/generic_checks.py \
+            --lineendings-check \
+            --files "${{ inputs.changedFiles }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}" \
+            --log-dir "${{ env.logdir }}"
+
       - name: Check for trailing whitespaces
         if: inputs.checkWhitespace && always()
         continue-on-error: ${{ inputs.whitespaceFailSilent }}
         run: |
-          whitespaceErrors=0
-          exclude="*[.md]"
-          for file in ${{ inputs.changedFiles }}
-          do
-            # Check for trailing whitespaces
-            grep -nIHE --exclude="$exclude" " $" $file | sed -e "s/$/<-- trailing whitespace/" >> ${{ env.logdir }}whitespace.log || true
-          done
-          # Write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}whitespace.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/grepMatcherWarning.json"
-            cat ${{ env.logdir }}whitespace.log
-            echo "::remove-matcher owner=grepMatcher-warning::"
-            whitespaceErrors=$(wc -l < ${{ env.logdir }}whitespace.log)
-          fi
-          echo "Found $whitespaceErrors whitespace errors"
-          # Write the report
-          if [ $whitespaceErrors -gt 0 ]
-          then
-            echo "<details><summary>:information_source: Found $whitespaceErrors trailing whitespace</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-            cat ${{ env.logdir }}whitespace.log >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo ":heavy_check_mark: No trailing whitespace found  " >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $whitespaceErrors -eq 0 ]
+          python3 tools/lint/generic_checks.py \
+            --whitespace-check \
+            --files "${{ inputs.changedFiles }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}" \
+            --log-dir "${{ env.logdir }}"
+
       - name: Check for Tab usage
         if: inputs.checkTabs && always()
         continue-on-error: ${{ inputs.tabsFailSilent }}
         run: |
-          tabErrors=0
-          exclude="*[.md]"
-          # Check for Tab usage
-          for file in ${{ steps.changed-files.outputs.all_changed_files }}
-          do
-            grep -nIHE --exclude="$exclude" $'\t' $file | sed -e "s/$/ <-- contains tab/" >> ${{ env.logdir }}tab.log || true
-          done
-          # Write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}tab.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/grepMatcherWarning.json"
-            cat ${{ env.logdir }}tab.log
-            echo "::remove-matcher owner=grepMatcher-warning::"
-            tabErrors=$(wc -l < ${{ env.logdir }}tab.log)
-          fi
-          echo "Found $tabErrors tab errors"
-          # Write the report
-          if [ $tabErrors -gt 0 ]; then
-            echo "<details><summary>:information_source: Found $tabErrors tabs, better to use spaces</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-            cat ${{ env.logdir }}tab.log >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo ":heavy_check_mark: No tabs found" >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $tabErrors -eq 0 ]
-    # Run Python lints
+          python3 tools/lint/generic_checks.py \
+            --tabs-check \
+            --files "${{ inputs.changedFiles }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}" \
+            --log-dir "${{ env.logdir }}"
+
+    # Python linting steps
+
       - name: Pylint
         if: inputs.checkPylint && inputs.changedPythonFiles != '' && always()
         continue-on-error: ${{ inputs.pylintFailSilent }}
         run: |
-          pylintErrors=0
-          pylintWarnings=0
-          pylintRefactorings=0
-          pylintConventions=0
-          pip install pylint
-          # List enabled pylint checks
-          pylint --list-msgs-enabled > ${{ env.logdir }}pylint-enabled-checks.log
-          # Run pylint on all python files
-          set +e
-          pylint --disable=${{ inputs.pylintDisable }} ${{ inputs.changedPythonFiles }} > ${{ env.logdir }}pylint.log
-          exitCode=$?
-          set -e
-          # If pylint has run successfully, write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}pylint.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/pylintError.json"
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/pylintWarning.json"
-            cat ${{ env.logdir }}pylint.log
-            echo "::remove-matcher owner=pylint-error::"
-            echo "::remove-matcher owner=pylint-warning::"
-            pylintErrors=$( grep -oP '(?<=error      \|)\d+' ${{ env.logdir }}pylint.log) || true # grep returns 0 if no match is found
-            pylintWarnings=$( grep -oP '(?<=warning    \|)\d+' ${{ env.logdir }}pylint.log) || true
-            pylintRefactorings=$( grep -oP '(?<=refactor   \|)\d+' ${{ env.logdir }}pylint.log) || true
-            pylintConventions=$( grep -oP '(?<=convention \|)\d+' ${{ env.logdir }}pylint.log) || true
-          fi
-          echo "Found $pylintErrors errors, $pylintWarnings warnings, $pylintRefactorings refactorings, $pylintConventions conventions"
-          # Write the report
-          if [ $pylintErrors -gt 0 ]
-          then
-            echo "<details><summary>:fire: Pylint found :fire: $pylintErrors errors, :warning: $pylintWarnings warnings, :construction: $pylintRefactorings refactorings and :pencil2: $pylintConventions conventions</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          elif [ $pylintWarnings -gt 0 ]
-          then
-            echo "<details><summary>:warning: Pylint found :warning: $pylintWarnings warnings, :construction: $pylintRefactorings refactorings and :pencil2: $pylintConventions conventions</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          elif [ $pylintRefactorings -gt 0 ]
-          then
-            echo "<details><summary>:construction: Pylint found :construction: $pylintRefactorings refactorings and :pencil2: $pylintConventions conventions</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          elif [ $pylintConventions -gt 0 ]
-          then
-            echo "<details><summary>:pencil2: Pylint found :pencil2: $pylintConventions conventions</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo "<details><summary>:heavy_check_mark: No pylint errors found </summary>  " >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # List enabled checks in the report
-          echo "<details><summary>:information_source: Enabled checks</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}pylint-enabled-checks.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}pylint.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $pylintErrors -eq 0 ]
-      - name: Black (Python)
+          python3 tools/lint/pylint.py \
+            --files "${{ inputs.changedPythonFiles }}" \
+            --disable "${{ inputs.pylintDisable }}" \
+            --log-dir "${{ env.logdir }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}"
+
+      - name: Black
         if: inputs.checkBlack && inputs.changedPythonFiles != '' && always()
         continue-on-error: ${{ inputs.blackFailSilent }}
         run: |
-          blackReformats=0
-          blackFails=0
-          pip install black
-          set +e
-          black --check ${{ inputs.changedPythonFiles }} &> ${{ env.logdir }}black.log
-          exitCode=$?
-          set -e
-          # If black has run successfully, write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}black.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/blackWarning.json"
-            cat ${{ env.logdir }}black.log
-            echo "::remove-matcher owner=black-warning::"
-            blackReformats=$( grep -oP '\d+(?= fil.+ would be reformatted)' ${{ env.logdir }}black.log) || true # grep returns 0 if no match is found
-            blackFails=$( grep -oP '\d+(?= fil.+ would fail to reformat)' ${{ env.logdir }}black.log) || true
-          fi
-          echo "Found $blackReformats files would be reformatted and $blackFails files would fail to reformat"
-          # Write the report
-          if [ $blackReformats -gt 0 ] || [ $blackFails -gt 0 ] #FIXME purpose of testing $blackFails as we don't use it then
-          then
-            echo "<details><summary>:pencil2: Black would reformat $blackReformats files</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo "<details><summary>:heavy_check_mark: Black would reformat no file</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}black.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $exitCode -eq 0 ]
-    # Run C++ lints
+          python3 tools/lint/black.py \
+            --files "${{ inputs.changedPythonFiles }}" \
+            --log-dir "${{ env.logdir }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}"
+
+    # C++ linting steps
+
       - name: Install FreeCAD dependencies
         if: inputs.changedCppFiles != '' && always()
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends               \
-                            doxygen                                     \
-                            graphviz                                    \
-                            imagemagick                                 \
-                            libboost-date-time-dev                      \
-                            libboost-dev                                \
-                            libboost-filesystem-dev                     \
-                            libboost-graph-dev                          \
-                            libboost-iostreams-dev                      \
-                            libboost-program-options-dev                \
-                            libboost-python-dev                         \
-                            libboost-regex-dev                          \
-                            libboost-serialization-dev                  \
-                            libboost-thread-dev                         \
-                            libcoin-dev                                 \
-                            libeigen3-dev                               \
-                            libgts-bin                                  \
-                            libgts-dev                                  \
-                            libkdtree++-dev                             \
-                            libmedc-dev                                 \
-                            libocct-data-exchange-dev                   \
-                            libocct-ocaf-dev                            \
-                            libocct-visualization-dev                   \
-                            libopencv-dev                               \
-                            libproj-dev                                 \
-                            libpyside2-dev                              \
-                            libqt5opengl5-dev                           \
-                            libqt5svg5-dev                              \
-                            libqt5x11extras5-dev                        \
-                            libshiboken2-dev                            \
-                            libspnav-dev                                \
-                            libvtk7-dev                                 \
-                            libx11-dev                                  \
-                            libxerces-c-dev                             \
-                            libyaml-cpp-dev                             \
-                            libzipios++-dev                             \
-                            netgen                                      \
-                            netgen-headers                              \
-                            occt-draw                                   \
-                            pyqt5-dev-tools                             \
-                            pyside2-tools                               \
-                            python3-dev                                 \
-                            python3-git                                 \
-                            python3-markdown                            \
-                            python3-matplotlib                          \
-                            python3-packaging                           \
-                            python3-pivy                                \
-                            python3-ply                                 \
-                            python3-pyside2.qtcore                      \
-                            python3-pyside2.qtgui                       \
-                            python3-pyside2.qtnetwork                   \
-                            python3-pyside2.qtsvg                       \
-                            python3-pyside2.qtwidgets                   \
-                            qtbase5-dev                                 \
-                            qttools5-dev                                \
-                            shiboken2                                   \
-                            swig                                        \
-                            ccache                                      \
-                            xvfb
+        run: ./package/ubuntu/install-apt-packages.sh
+
       - name: Run CMake # This is needed for Clang tools to work correctly
         if: inputs.changedCppFiles != '' && always()
         run: |
           mkdir build && cmake -S ./ -B ./build/ -D CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE
+
       - name: Check old Qt string-based connections (https://wiki.qt.io/New_Signal_Slot_Syntax)
         if: inputs.checkQtConnections && inputs.changedCppFiles != '' && always()
         continue-on-error: ${{ inputs.qtConnectionsFailSilent }}
         run: |
-          qtconnectionSyntax=0
-          exclude="*[.md,.log,.ts,.git]"
-          # Check all files for QT string-based connections
-          for file in ${{ inputs.changedFiles }} #TODO does this makes sense in Python files ?
-          do
-            grep -nIHE --exclude="$exclude" $' SIGNAL| SLOT' $file | sed -e "s/$/ <--Consider using Functor-Based Connections/" >> ${{ env.logdir }}qtConnections.log || true #TODO seems to trigger false positives
-          done
-          # Write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}qtConnections.log ]; then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/grepMatcherWarning.json"
-            cat ${{ env.logdir }}qtConnections.log
-            echo "::remove-matcher owner=grepMatcher-warning::"
-            qtconnectionSyntax=$(wc -l < ${{ env.logdir }}qtConnections.log)
-          fi
-          echo "Found $qtconnectionSyntax QT string-based connections"
-          # Write the report
-          if [ $qtconnectionSyntax -gt 0 ]; then
-            echo "<details><summary>:information_source: Found $qtconnectionSyntax QT string-based connections :arrow_right: consider using QT functor-Based Connections</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-            # documentation link
-            echo "For more information see: https://wiki.qt.io/New_Signal_Slot_Syntax or https://github.com/FreeCAD/FreeCAD/issues/6166" >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-            cat ${{ env.logdir }}qtConnections.log >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-            echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo ":heavy_check_mark: No string-based connections found  " >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $qtconnectionSyntax -eq 0 ]
+          python3 tools/lint/qt_connections.py \
+            --files "${{ inputs.changedFiles }}" \
+            --log-dir "${{ env.logdir }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}"
+
       - name: Cpplint
         if: inputs.checkCpplint && inputs.changedCppFiles != '' && always()
         continue-on-error: ${{ inputs.cpplintFailSilent }}
         run: |
-          cpplintErrors=0
-          pip install cpplint
-          # Run cpplint
-          for file in ${{ inputs.changedCppFiles }}
-          do
-            cpplint --filter=${{ inputs.cpplintFilters }} --linelength=${{ inputs.cpplintLineLength }} $file &>> ${{ env.logdir }}cpplint.log || true
-          done
-          # If cpplint has run successfully, write the Log to the console with the Problem Matchers
-          if [ ${{ env.logdir }}cpplint.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/cpplint.json"
-            cat ${{ env.logdir }}cpplint.log
-            echo "::remove-matcher owner=cpplint::"
-            cpplintErrors=$(grep -nIHE "\[[0-9]\]$" ${{ env.logdir }}cpplint.log | wc -l ) || true
-          fi
-          echo "Found $cpplintErrors cpplint errors"
-          # Write the report
-          if [ $cpplintErrors -gt 0 ]
-          then
-            echo "<details><summary>:warning: CppLint found $cpplintErrors errors / warnings</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo "<details><summary>:heavy_check_mark: No cpplint errors found </summary>  " >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}cpplint.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $cpplintErrors -eq 0 ]
+          python3 tools/lint/cpplint.py \
+            --files "${{ inputs.changedCppFiles }}" \
+            --log-dir "${{ env.logdir }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}"
+
       - name: Clang-format
         if: inputs.checkClangFormat && inputs.changedCppFiles != '' && always()
         continue-on-error: ${{ inputs.clangFormatFailSilent }}
         run: |
-          clangFormatErrors=0
-          # Run clang-format on all cpp files
-          clang-format --dry-run --ferror-limit=1 --verbose --style=${{ inputs.clangStyle }} ${{ inputs.changedCppFiles }} &>> ${{ env.logdir }}clang-format.log  || true
-          # If clang-format has run successfully, write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}clang-format.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/clang.json"
-            cat ${{ env.logdir }}clang-format.log
-            echo "::remove-matcher owner=clang::"
-            clangFormatErrors=$(grep -nIHE "\[-Wclang-format-violations]$" ${{ env.logdir }}clang-format.log | wc -l ) || true
-          fi
-          echo "Found $clangFormatErrors clang-format errors"
-          # Write the report
-          if [ $clangFormatErrors -gt 0 ]
-          then
-            echo "<details><summary>:pencil2: Clang-format would reformat $clangFormatErrors files</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo "<details><summary>:heavy_check_mark: Clang-format would reformat no file</summary>  " >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}clang-format.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $clangFormatErrors -eq 0 ]
+          python3 tools/lint/clang_format.py \
+            --files "${{ inputs.changedCppFiles }}" \
+            --clang-style "${{ inputs.clangStyle }}" \
+            --log-dir "${{ env.logdir }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}"
+
       - name: Codespell
         if: inputs.checkSpelling && always()
         continue-on-error: ${{ inputs.codespellFailSilent }}
         run: |
-          pip install codespell
-          wget https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary.txt
-          #wget https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary_rare.txt
-          set +e
-          misspellings=$( { codespell --quiet-level 3 --summary --count --ignore-words ${{ inputs.listIgnoredMisspelling }} --skip ${{ inputs.spellingIgnore }} -D dictionary.txt ${{ inputs.changedFiles }} > ${{ env.logdir }}codespell.log ; } 2>&1 )
-          set -e
-          # If codespell has run successfully, write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}codespell.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/codespell.json"
-            cat ${{ env.logdir }}codespell.log
-            echo "::remove-matcher owner=codespell::"
-          fi
-          echo "Found $misspellings misspellings"
-          # Write the report
-          if [ $misspellings -gt 0 ]
-          then
-            echo "<details><summary>:pencil2: Codespell found $misspellings misspellings</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo "<details><summary>:heavy_check_mark: Codespell found no misspellings</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "To ignore false positives, append the word to the [.github/codespellignore](https://github.com/FreeCAD/FreeCAD/blob/master/.github/codespellignore) file (lowercase)" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}codespell.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $misspellings -eq 0 ]
+          python3 tools/lint/codespell.py \
+            --files ${{ inputs.changedFiles }} \
+            --ignore-words "${{ inputs.listIgnoredMisspelling }}" \
+            --skip "${{ inputs.spellingIgnore }}" \
+            --log-dir "${{ env.logdir }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}"
+
       - name: Clang-tidy
         if: inputs.checkClangTidy && inputs.changedCppFiles != '' && always()
         continue-on-error: ${{ inputs.clangTidyFailSilent }}
         run: |
-          clangTidyErrors=0
-          clangTidyWarnings=0
-          clangTidyNotes=0
-          sudo apt-get install -y --no-install-recommends clang-tidy
-          #TODO: check where this "clang-tidy.yaml" goes ; shall this be put in the fixes ?
-          clang-tidy --quiet --format-style=${{ inputs.clangStyle }} --export-fixes=clang-tidy.yaml -checks=${{ inputs.clangTidyChecks }} -p build/ --explain-config &>> ${{ env.logdir }}clang-tidy-enabled-checks.log
-          # Run clang-tidy on all cpp files
-          set +e
-          clang-tidy --quiet --format-style=${{ inputs.clangStyle }} --export-fixes=clang-tidy.yaml -checks=${{ inputs.clangTidyChecks }} -p build/ ${{ inputs.changedCppFiles }} &>> ${{ env.logdir }}clang-tidy.log
-          exitCode=$?
-          set -e
-          # If clang-tidy has run successfully, write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}clang-tidy.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/clang.json"
-            cat ${{ env.logdir }}clang-tidy.log
-            echo "::remove-matcher owner=clang::"
-            clangTidyErrors=$(grep -nIHE "^(.+):([0-9]+):([0-9]+): error: .+$" ${{ env.logdir }}clang-tidy.log | wc -l ) || true
-            clangTidyWarnings=$(grep -nIHE "^(.+):([0-9]+):([0-9]+): warning: .+$" ${{ env.logdir }}clang-tidy.log | wc -l ) || true
-            clangTidyNotes=$(grep -nIHE "^(.+):([0-9]+):([0-9]+): note: .+$" ${{ env.logdir }}clang-tidy.log | wc -l ) || true
-          fi
-          echo "Found $clangTidyErrors errors, $clangTidyWarnings warnings, $clangTidyNotes notes"
-          # Write the report
-          if [ $clangTidyErrors -gt 0 ]
-          then
-            echo "<details><summary>:fire: Clang-Tidy found :fire: $clangTidyErrors errors, :warning: $clangTidyWarnings warnings and :pencil2: $clangTidyNotes notes</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          elif [ $clangTidyWarnings -gt 0 ]
-          then
-            echo "<details><summary>:warning: Clang-Tidy found :warning: $clangTidyWarnings warnings and :pencil2: $clangTidyNotes notes</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          elif [ $clangTidyNotes -gt 0 ]
-          then
-            echo "<details><summary>:pencil2: Clang-Tidy found :pencil2: $clangTidyNotes notes</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo "<details><summary>:heavy_check_mark: Clang-Tidy found no errors, warnings or notes</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # List enabled checks in the report
-          echo "<details><summary>:information_source: Enabled checks</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}clang-tidy-enabled-checks.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}clang-tidy.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $clangTidyErrors -eq 0 ]
+          python3 tools/lint/clang_tidy.py \
+            --files "${{ inputs.changedCppFiles }}" \
+            --clang-style "${{ inputs.clangStyle }}" \
+            --log-dir "${{ env.logdir }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}"
+
       - name: Clazy
         if: inputs.checkClazy && inputs.changedCppFiles != '' && always()
         continue-on-error: ${{ inputs.clazyFailSilent }}
         run: |
-          clazyErrors=0
-          clazyWarnings=0
-          clazyNotes=0
-          sudo apt-get install -y --no-install-recommends clazy
-          #TODO: check where this "clazy.yaml" goes ; shall this be put in the fixes ?
-          # Run clazy on all cpp files
-          clazy-standalone --export-fixes=clazy.yaml -checks=${{ inputs.clazyChecks }} -p build/ ${{ inputs.changedCppFiles }} &>> ${{ env.logdir }}clazy.log  || true
-          # If clazy has run successfully, write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}clazy.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/clang.json"
-            cat ${{ env.logdir }}clazy.log
-            echo "::remove-matcher owner=clang::"
-            clazyErrors=$(grep -nIHE "^(.+):([0-9]+):([0-9]+): error: .+$" ${{ env.logdir }}clazy.log | wc -l ) || true
-            clazyWarnings=$(grep -nIHE "^(.+):([0-9]+):([0-9]+): warning: .+$" ${{ env.logdir }}clazy.log | wc -l ) || true
-            clazyNotes=$(grep -nIHE "^(.+):([0-9]+):([0-9]+): note: .+$" ${{ env.logdir }}clazy.log | wc -l ) || true
-          fi
-          echo "Found $clazyErrors errors, $clazyWarnings warnings, $clazyNotes notes"
-          # Write the report
-          if [ "$clazyErrors" -gt 0 ]
-          then
-            echo "<details><summary>:fire: Clazy found :fire: $clazyErrors errors, :warning: $clazyWarnings warnings and :pencil2: $clazyNotes notes</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          elif [ "$clazyWarnings" -gt 0 ]
-          then
-            echo "<details><summary>:warning: Clazy found :warning: $clazyWarnings warnings and :pencil2: $clazyNotes notes</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          elif [ "$clazyNotes" -gt 0 ]
-          then
-            echo "<details><summary>:pencil2: Clazy found :pencil2: $clazyNotes notes</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo "<details><summary>:heavy_check_mark: Clazy found no errors, warnings or notes</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "[List of checks](https://github.com/KDE/clazy#list-of-checks), [This explains some of the clazy warnings](https://www.kdab.com/uncovering-32-qt-best-practices-compile-time-clazy/)  " >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}clazy.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $clazyErrors -eq 0 ]
+          python3 tools/lint/clazy.py \
+            --files "${{ inputs.changedCppFiles }}" \
+            --clazy-checks "${{ inputs.clazyChecks }}" \
+            --log-dir "${{ env.logdir }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}"
+
       - name: Clazy-QT6
         if: inputs.checkClazyQT6 && inputs.changedCppFiles != '' && github.ref == inputs.QT6Branch && always()
         continue-on-error: ${{ inputs.clazyQT6FailSilent }}
         run: |
-          clazyQT6Errors=0
-          clazyQT6Warnings=0
-          clazyQT6Notes=0
-          sudo apt-get install -y --no-install-recommends clazy
-          #TODO: check where this "clazyQT6.yaml" goes ; shall this be put in the fixes ?
-          # Run clazy checks for Qt6 on all cpp files
-          clazy-standalone --export-fixes=clazyQT6.yaml -checks=${{ inputs.clazyQT6Checks }} -p build/ ${{ inputs.changedCppFiles }} &>> ${{ env.logdir }}clazyQT6.log  || true
-          # If clazy has run successfully, write the Log to the console with the Problem Matchers
-          if [ -f ${{ env.logdir }}clazyQT6.log ]
-          then
-            echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/clang.json"
-            cat ${{ env.logdir }}clazyQT6.log
-            echo "::remove-matcher owner=clang::"
-            clazyQT6Errors=$(grep -nIHE "^(.+):([0-9]+):([0-9]+): error: .+$" ${{ env.logdir }}clazyQT6.log | wc -l ) || true
-            clazyQT6Warnings=$(grep -nIHE "^(.+):([0-9]+):([0-9]+): warning: .+$" ${{ env.logdir }}clazyQT6.log | wc -l ) || true
-            clazyQT6Notes=$(grep -nIHE "^(.+):([0-9]+):([0-9]+): note: .+$" ${{ env.logdir }}clazyQT6.log | wc -l ) || true
-          fi
-          echo "Found $clazyQT6Errors errors, $clazyQT6Warnings warnings, $clazyQT6Notes notes"
-          # Write the report
-          if [ "$clazyQT6Errors" -gt 0 ]
-          then
-            echo "<details><summary>:fire: Clazy found :fire: $clazyQT6Errors errors, :warning: $clazyQT6Warnings warnings and :pencil2: $clazyQT6Notes notes for porting to QT6</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          elif [ "$clazyQT6Warnings" -gt 0 ]
-          then
-            echo "<details><summary>:warning: Clazy found :warning: $clazyQT6Warnings warnings and :pencil2: $clazyQT6Notes notes for porting to QT6</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          elif [ "$clazyNotes" -gt 0 ]
-          then
-            echo "<details><summary>:pencil2: Clazy found :pencil2: $clazyQT6Notes notes for porting to QT6</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          else
-            echo "<details><summary>:heavy_check_mark: Clazy found no errors, warnings or notes for porting to QT6</summary>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          fi
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          cat ${{ env.logdir }}clazyQT6.log >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo '```' >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "</details>" >> ${{env.reportdir}}${{ env.reportfilename }}
-          echo "" >> ${{env.reportdir}}${{ env.reportfilename }}
-          # Exit the step with appropriate code
-          [ $clazyQT6Errors -eq 0 ]
+          python3 tools/lint/clazy_qt6.py \
+            --files "${{ inputs.changedCppFiles }}" \
+            --clazy-qt6-checks "${{ inputs.clazyQT6Checks }}" \
+            --log-dir "${{ env.logdir }}" \
+            --report-file "${{ env.reportdir }}${{ env.reportfilename }}"
+
+    # Upload steps
+
       - name: Upload logs and fixes
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |
             ${{ env.logdir }}
             ${{ env.fixesdir }}
+
       - name: Upload report
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ env.reportfilename }}
           path: |

.github/workflows/sub_prepare.yml

@@ -71,6 +71,11 @@ jobs:
       changedCppFiles: ${{ steps.Output.outputs.changedCppFiles }}
 
     steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
       - name: Make needed directories, files and initializations
         id: Init
         run: |
@@ -148,14 +153,14 @@ jobs:
           echo "" >> $GITHUB_OUTPUT
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |
             ${{ env.logdir }}
       - name: Upload report
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ env.reportfilename }}
           path: |

.github/workflows/sub_weeklyBuild.yml

@@ -0,0 +1,160 @@
+name: Weekly Build
+on:
+  schedule:
+   - cron: "42 18 * * 1"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  tag_build:
+    runs-on: ubuntu-latest
+    outputs:
+      build_tag: ${{ steps.tag_build.outputs.build_tag }}
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 2
+          submodules: 'recursive'
+
+      - name: Tag Build
+        id: tag_build
+        shell: bash -l {0}
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          export BUILD_TAG=weekly-$(date "+%Y.%m.%d")
+          echo "BUILD_TAG=${BUILD_TAG}" >> "$GITHUB_ENV"
+          echo "build_tag=${BUILD_TAG}" >> "$GITHUB_OUTPUT"
+          gh release create ${BUILD_TAG} --title "Development Build ${BUILD_TAG}" -F .github/workflows/weekly-build-notes.md --prerelease || true
+
+      - name: Upload Source
+        id: upload_source
+        shell: bash -l {0}
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          python3 package/rattler-build/scripts/make_version_file.py ../freecad_version.txt
+          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+          git config user.name 'github-actions[bot]'
+          git apply package/rattler-build/scripts/disable_git_info.patch
+          git commit -a -m "Disable git info write to Version.h"
+          git archive HEAD -o freecad_source_${BUILD_TAG}.tar
+          git submodule foreach --recursive \
+            "git archive HEAD --prefix=\$path/ -o \$sha1.tar && \
+             tar -A -f \$toplevel/freecad_source_${BUILD_TAG}.tar \$sha1.tar && \
+             rm \$sha1.tar"
+          gzip freecad_source_${BUILD_TAG}.tar
+          sha256sum freecad_source_${BUILD_TAG}.tar.gz > freecad_source_${BUILD_TAG}.tar.gz-SHA256.txt
+          gh release upload --clobber ${BUILD_TAG} "freecad_source_${BUILD_TAG}.tar.gz" "freecad_source_${BUILD_TAG}.tar.gz-SHA256.txt"
+
+  build:
+    needs: tag_build
+    strategy:
+      matrix:
+        include:
+          - { target: linux-64, os: ubuntu-22.04 }
+          - { target: linux-arm64, os: ubuntu-22.04-arm }
+          - { target: osx-64, os: macos-13 }
+          - { target: osx-arm64, os: macos-latest }
+          - { target: win-64, os: windows-latest }
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+    environment: weekly-build
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
+      # prevent running out of disk space on Ubuntu runners.
+      - name: Maximize build space
+        if: runner.os == 'Linux'
+        uses: AdityaGarg8/remove-unwanted-software@90e01b21170618765a73370fcc3abbd1684a7793 # v5
+        with:
+          verbose: 'true'
+          remove-android: 'true'      # (frees ~9 GB)
+          remove-cached-tools: 'true' # (frees ~8.3 GB)
+
+      - name: Set Platform Environment Variables
+        shell: bash -l {0}
+        env:
+          BUILD_TAG: ${{ needs.tag_build.outputs.build_tag }}
+          OPERATING_SYSTEM: ${{ runner.os }}
+        run: |
+          echo "BUILD_TAG=${BUILD_TAG}" >> "$GITHUB_ENV"
+          if [[ $OPERATING_SYSTEM == 'Windows' ]]; then
+            echo 'PIXI_CACHE_DIR=D:\rattler' >> "$GITHUB_ENV"
+            echo 'RATTLER_CACHE_DIR=D:\rattler' >> "$GITHUB_ENV"
+          fi
+
+      - uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
+        with:
+          pixi-version: v0.42.1
+          cache: false
+
+      - name: Install the Apple certificate and provisioning profile
+        if: runner.os == 'macOS'
+        env:
+          APP_SPECIFIC_PASSWORD: ${{ secrets.APP_SPECIFIC_PASSWORD }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+          DEVELOPER_TEAM_ID: ${{ secrets.DEVELOPER_TEAM_ID }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          PP_PATH=$RUNNER_TEMP/FreeCAD_Weekly.provisionprofile
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+          export KEYCHAIN_PASSWORD=$(openssl rand -base64 8)
+
+          # import certificate and provisioning profile from secrets
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
+          echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
+
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+
+          # apply provisioning profile
+          mkdir -p ~/Library/Provisioning\ Profiles
+          cp $PP_PATH ~/Library/Provisioning\ Profiles
+
+          xcrun notarytool store-credentials "FreeCAD" --keychain "$KEYCHAIN_PATH" --apple-id "${APPLE_ID}" --password "${APP_SPECIFIC_PASSWORD}" --team-id "${DEVELOPER_TEAM_ID}"
+
+      - name: Build and Release Packages
+        shell: bash
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
+          SIGN_RELEASE: "true"
+          TARGET_PLATFORM: ${{ matrix.target }}
+          UPLOAD_RELEASE: "true"
+        run: |
+          wget -O- https://github.com/FreeCAD/FreeCAD/releases/download/${BUILD_TAG}/freecad_source_${BUILD_TAG}.tar.gz | tar xf -
+          cd package/rattler-build
+          pixi install
+          pixi run -e package create_bundle
+
+      ## Needed if running on a self-hosted runner:
+      # - name: Clean up keychain and provisioning profile
+      #   if: ${{ always() }}
+      #   run: |
+      #     security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
+      #     rm ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.mobileprovision

.github/workflows/sub_wrapup.yml

@@ -39,6 +39,9 @@ on:
         type: string
         required: true
 
+permissions:
+  contents: read
+
 jobs:
 
   WrapUp:
@@ -50,11 +53,16 @@ jobs:
         shell: bash
 
     steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
       - name: Make needed directories, files and initializations
         run: |
           mkdir -p ${{ env.artifactsDownloadDir }}
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           path: ${{ env.artifactsDownloadDir }}
       - name: Save input data to file
@@ -111,7 +119,7 @@ jobs:
           cat report.md >> $GITHUB_STEP_SUMMARY
       - name: Delete used artifacts
         continue-on-error: true
-        uses: geekyeggo/delete-artifact@v5
+        uses: geekyeggo/delete-artifact@f275313e70c08f6120db482d7a6b98377786765b # v5.1.0
         with:
           name: |
             ${{ env.usedArtifacts }}

.github/workflows/weekly-build-notes.md

@@ -0,0 +1,15 @@
+> [!IMPORTANT]
+> Bleeding edge FreeCAD development builds for testing bugfixes, regressions, and recently implemented features. Do not use in a production environment.
+
+
+### How-to use
+
+1. Download the appropriate asset for your OS below
+2. Unpack the bundle to any folder on your system
+3. Launch the application
+    - **Windows**
+    Run `\bin\FreeCAD.exe` in the extracted directory
+    - **macOS**
+    Launch `/FreeCAD.app` in the extracted directory
+    - **Linux**
+    Open the `*.AppImage`

.gitignore

@@ -45,6 +45,7 @@ install_manifest.txt
 /Mod/
 /ZERO_CHECK.dir/
 /build/
+/build-*/
 /cmake-build*/
 /src/Tools/offlinedoc/localwiki/
 /src/Tools/offlinedoc/*.txt
@@ -55,9 +56,14 @@ tags
 /CMakeUserPresets.json
 Testing
 compile_commands.json
+*.sublime-project
+*.sublime-workspace
 
 # crowdin file
 src/Tools/freecad.zip
 tsupdate_stderr.log
 tsupdate_stdout.log
 files_to_translate.txt
+# pixi environments
+.pixi
+*.egg-info

.gitmodules

@@ -1,9 +1,12 @@
 [submodule "src/3rdParty/OndselSolver"]
 	path = src/3rdParty/OndselSolver
-	url = https://github.com/Ondsel-Development/OndselSolver.git
+	url = https://github.com/FreeCAD/OndselSolver.git
 [submodule "tests/lib"]
 	path = tests/lib
 	url = https://github.com/google/googletest
 [submodule "src/3rdParty/GSL"]
 	path = src/3rdParty/GSL
 	url = https://github.com/microsoft/GSL
+[submodule "src/Mod/AddonManager"]
+	path = src/Mod/AddonManager
+	url = https://github.com/FreeCAD/AddonManager.git

.pre-commit-config.yaml

@@ -4,15 +4,14 @@
 # See https://pre-commit.com/hooks.html for more hooks
 files: |
     (?x)^(
+        .github|
         src/Base|
         src/Main|
         src/Tools|
         tests/src|
-        src/Mod/AddonManager|
         src/Mod/Assembly|
         src/Mod/CAM|
         src/Mod/Cloud|
-        src/Mod/Drawing|
         src/Mod/Fem|
         src/Mod/Help|
         src/Mod/Import|
@@ -42,6 +41,9 @@ exclude: |
         src/App/ExpressionParser.tab.h|
         src/App/ExpressionParser.y|
         src/App/lex.ExpressionParser.c|
+        src/Gui/3Dconnexion/navlib|
+        src/Gui/QSint|
+        src/Gui/Quarter|
         src/Mod/Import/App/SCL|
         src/Mod/Import/App/SCL_output|
         src/Mod/Mesh/App/TestData|
@@ -51,7 +53,7 @@ exclude: |
     )
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0
+    rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -59,11 +61,11 @@ repos:
     -   id: check-added-large-files
     -   id: mixed-line-ending
 -   repo: https://github.com/psf/black
-    rev: b965c2a5026f8ba399283ba3e01898b012853c79 # frozen: 24.8.0
+    rev: 8a737e727ac5ab2f1d4cf5876720ed276dc8dc4b  # frozen: 25.1.0
     hooks:
         -   id: black
             args: ['--line-length', '100']
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 7d85583be209cb547946c82fbe51f4bc5dd1d017 # frozen: v18.1.8
+    rev: 7ec07eeb4135dc6ecf410d24ac4ead986a5d413d  # frozen: v20.1.3
     hooks:
         -   id: clang-format

CMakeLists.txt

@@ -1,35 +1,57 @@
-# As of January 2023 we require CMake 3.16.3
-# see https://forum.freecad.org/viewtopic.php?f=10&t=72173
-# for further info why
-cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
+# As of February 2025 we require CMake 3.22.0
+cmake_minimum_required(VERSION 3.22.0 FATAL_ERROR)
 
-# policy CMP0072 was introduced with CMake 3.11
-# relates to FindOpenGL module
-# and cache variables OPENGL_gl_LIBRARY, OPENGL_glu_LIBRARY
-if (POLICY CMP0072)
-    set(OpenGL_GL_PREFERENCE LEGACY)
-endif(POLICY CMP0072)
 
-# FindPythonInterp and FindPythonLibs modules are deprecated.
-# Currently, they are still used by shiboken's CMake files
-if (POLICY CMP0148)
+# As of cMake 3.27, find_package() will look for both case-sensitive and all-uppercase versions
+# of the package. This seems to affect FLANN as included by Pixi
+if(POLICY CMP0144)
+    cmake_policy(SET CMP0144 NEW)
+endif()
+
+# FindPythonInterp and FindPythonLibs modules are deprecated, but are still in use by
+# all versions of Shiboken2. This policy must be kept at OLD until Shiboken2 is no longer
+# supported
+if(POLICY CMP0148)
     cmake_policy(SET CMP0148 OLD)
 endif()
 
+# The exec_program command was deprecated in cMake 3.0, and policy CMP0153 was added in cMake
+# 3.28 to control whether this gives a warning (the OLD behavior) or a fatal error (NEW)
+if(POLICY CMP0153)
+    cmake_policy(SET CMP0153 NEW)
+endif()
+
+# Suppress 'FindBoost module is removed' warning. Will use BoostConfig.cmake instead
+if(POLICY CMP0167)
+    cmake_policy(SET CMP0167 NEW)
+endif()
+
+# As of cMake 3.31 add_custom_command() rejects invalid arguments
+if(POLICY CMP0175)
+    cmake_policy(SET CMP0175 NEW)
+endif()
+
+# Added in cMake 3.31, enforce normalization of all DESTINATION paths given to install()
+if(POLICY CMP0177)
+    cmake_policy(SET CMP0177 NEW)
+endif()
+
+
 option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" ON)
 
 if(FREECAD_USE_CCACHE)
     find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
     if(CCACHE_PROGRAM)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+        message(STATUS "Using ccache found at: " ${CCACHE_PROGRAM})
+        set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+        set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
     endif()
 endif()
 
 project(FreeCAD)
 
-set(PACKAGE_VERSION_NAME "Vulcan")
-set(PACKAGE_VERSION_MAJOR "0")
-set(PACKAGE_VERSION_MINOR "22")
+set(PACKAGE_VERSION_MAJOR "1")
+set(PACKAGE_VERSION_MINOR "1")
 set(PACKAGE_VERSION_PATCH "0") # number of patch release (e.g. "4" for the 0.18.4 release)
 set(PACKAGE_VERSION_SUFFIX "dev") # either "dev" for development snapshot or "" (empty string)
 set(PACKAGE_BUILD_VERSION "0") # used when the same FreeCAD version will be re-released (for example using an updated LibPack)
@@ -54,6 +76,7 @@ FreeCADLibpackChecks()
 SetupDoxygen()
 SetupLibFmt()
 SetupYamlCpp()
+SetupZipIos()
 if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER OR FREECAD_LIBPACK_CHECKFILE_VERSION)
     SetupPython()
     SetupPCL()
@@ -68,7 +91,6 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER OR FREECAD_LIB
         # OPENGL_gl_LIBRARY empty that results into linker errors
         SetupOpenGL()
     endif(BUILD_GUI)
-    SetupBoost()
     SetupSalomeSMESH()
     if (BUILD_FEM_NETGEN)
         find_package(NETGEN)
@@ -84,10 +106,14 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER OR FREECAD_LIB
 
     if(BUILD_GUI)
         SetupCoin3D()
+        SetupPivy()
         SetupSpaceball()
         SetupShibokenAndPyside()
         SetupMatplotlib()
     endif(BUILD_GUI)
+
+    # SetupCoin3D can overwrite find_package(Boost) output so keep this after.
+    SetupBoost()
 endif()
 
 if(BUILD_VR)

CMakePresets.json

@@ -13,6 +13,18 @@
           "CMAKE_EXPORT_COMPILE_COMMANDS": {
             "type": "BOOL",
             "value": "ON"
+          },
+          "CMAKE_JOB_POOL_COMPILE": {
+            "type": "STRING",
+            "value": "compile_jobs"
+          },
+          "CMAKE_JOB_POOL_LINK": {
+            "type": "STRING",
+            "value": "link_jobs"
+          },
+          "CMAKE_POLICY_VERSION_MINIMUM": {
+            "type": "STRING",
+            "value": "3.5"
           }
         }
       },
@@ -51,14 +63,6 @@
         "hidden": true,
         "generator": "Ninja",
         "cacheVariables": {
-          "Boost_NO_BOOST_CMAKE": {
-            "type": "BOOL",
-            "value": "ON"
-          },
-          "BUILD_DYNAMIC_LINK_PYTHON": {
-            "type": "BOOL",
-            "value": "ON"
-          },
           "BUILD_FEM_NETGEN": {
             "type": "BOOL",
             "value": "ON"
@@ -67,6 +71,10 @@
             "type": "BOOL",
             "value": "ON"
           },
+          "BUILD_REVERSEENGINEERING": {
+            "type": "BOOL",
+            "value": "OFF"
+          },
           "ENABLE_DEVELOPER_TESTS": {
             "type": "BOOL",
             "value": "ON"
@@ -95,13 +103,17 @@
             "type": "BOOL",
             "value": "ON"
           },
+          "FREECAD_QT_VERSION": {
+            "type": "STRING",
+            "value": "6"
+          },
           "OCCT_CMAKE_FALLBACK": {
             "type": "BOOL",
             "value": "ON"
           },
-          "USE_BOOST_PYTHON": {
-            "type": "BOOL",
-            "value": "OFF"
+          "QT_HOST_PATH": {
+            "type": "PATH",
+            "value": "$env{CONDA_PREFIX}"
           }
         }
       },
@@ -115,29 +127,33 @@
         },
         "cmakeExecutable": "${sourceDir}/conda/cmake.sh",
         "cacheVariables": {
-          "CMAKE_INCLUDE_PATH": {
-            "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/include"
+          "CMAKE_C_COMPILER": {
+            "type": "STRING",
+            "value": "clang"
           },
-          "CMAKE_INSTALL_LIBDIR": {
-            "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/lib"
+          "CMAKE_CXX_COMPILER": {
+            "type": "STRING",
+            "value": "clang++"
+          },
+          "CMAKE_EXE_LINKER_FLAGS": {
+            "type": "STRING",
+            "value": "-fuse-ld=mold"
           },
           "CMAKE_INSTALL_PREFIX": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad"
-          },
-          "CMAKE_LIBRARY_PATH":{
-            "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/lib"
+            "value": "$env{CONDA_PREFIX}"
           },
           "CMAKE_PREFIX_PATH": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad"
+            "value": "$env{CONDA_PREFIX}"
+          },
+          "CMAKE_SHARED_LINKER_FLAGS": {
+            "type": "STRING",
+            "value": "-fuse-ld=mold"
           },
           "OCC_INCLUDE_DIR": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/include/opencascade"
+            "value": "$env{CONDA_PREFIX}/include/opencascade"
           }
         }
       },
@@ -151,29 +167,21 @@
         },
         "cmakeExecutable": "${sourceDir}/conda/cmake.sh",
         "cacheVariables": {
-          "CMAKE_INCLUDE_PATH": {
-            "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/include"
-          },
-          "CMAKE_INSTALL_LIBDIR": {
-            "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/lib"
+          "CMAKE_IGNORE_PREFIX_PATH": {
+            "type": "STRING",
+            "value": "/opt/homebrew;/usr/local/homebrew"
           },
           "CMAKE_INSTALL_PREFIX": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad"
-          },
-          "CMAKE_LIBRARY_PATH":{
-            "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/lib"
+            "value": "$env{CONDA_PREFIX}"
           },
           "CMAKE_PREFIX_PATH": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad"
+            "value": "$env{CONDA_PREFIX}"
           },
           "OCC_INCLUDE_DIR": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/include/opencascade"
+            "value": "$env{CONDA_PREFIX}/include/opencascade"
           }
         }
       },
@@ -187,29 +195,17 @@
         },
         "cmakeExecutable": "${sourceDir}/conda/cmake.cmd",
         "cacheVariables": {
-          "CMAKE_INCLUDE_PATH": {
-            "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library/include"
-          },
-          "CMAKE_INSTALL_LIBDIR": {
-            "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library/lib"
-          },
           "CMAKE_INSTALL_PREFIX": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library"
-          },
-          "CMAKE_LIBRARY_PATH":{
-            "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library/lib"
+            "value": "$env{CONDA_PREFIX}/Library"
           },
           "CMAKE_PREFIX_PATH": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library"
+            "value": "$env{CONDA_PREFIX}/Library"
           },
           "OCC_INCLUDE_DIR": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library/include/opencascade"
+            "value": "$env{CONDA_PREFIX}/Library/include/opencascade"
           }
         }
       },
@@ -291,7 +287,13 @@
         "inherits": [
           "conda-release",
           "conda-windows"
-        ]
+        ],
+        "cacheVariables": {
+          "FREECAD_RELEASE_PDB": {
+            "type": "BOOL",
+            "value": "OFF"
+          }
+        }
       }
     ]
-  }
+}

CONTRIBUTING.md

@@ -26,7 +26,7 @@ The FreeCAD Contribution Process is expressed here with the following specific g
 1. FreeCAD uses the git distributed revision control system.
 2. Source code for the main application and related subprojects is hosted on github.com in the FreeCAD organization.
 3. Problems are discrete, well-defined limitations or bugs.
-4. FreeCAD uses GitHub's issue-tracking system to track problems and contributions. For help requests and general discussions, use the project forum. 
+4. FreeCAD uses GitHub's issue-tracking system to track problems and contributions. For help requests and general discussions, use the project forum.
 5. Contributions are sets of code changes that resolve a single problem.
 6. FreeCAD uses the Pull Request workflow for evaluating and accepting contributions.
 
@@ -47,7 +47,7 @@ The FreeCAD Contribution Process is expressed here with the following specific g
 ## 5. Contribution Requirements
 
 1. Contributions are submitted in the form of Pull Requests (PR).
-2. Maintainers and Contributors MUST have a GitHub account and SHOULD use their real names or a well-known alias. 
+2. Maintainers and Contributors MUST have a GitHub account and SHOULD use their real names or a well-known alias.
 3. If the GitHub username differs from the username on the FreeCAD Forum, effort SHOULD be taken to avoid confusion.
 4. A PR SHOULD be a minimal and accurate answer to exactly one identified and agreed-on problem.
 5. A PR SHOULD refrain from adding additional dependencies to the FreeCAD project unless no other option is available.
@@ -55,9 +55,10 @@ The FreeCAD Contribution Process is expressed here with the following specific g
 7. If a PR contains multiple commits, each commit MUST compile cleanly when merged with all previous commits of the same PR. Each commit SHOULD add value to the history of the project. Checkpoint commits SHOULD be squashed.
 8. A PR SHALL NOT include non-trivial code from other projects unless the Contributor is the original author of that code.
 9. A PR MUST compile cleanly and pass project self-tests on all target platforms.
-10. Each commit message in a PR MUST succinctly explain what the commit achieves. The commit message SHALL follow the suggestions in the `git commit --help` documentation, section DISCUSSION.
-11. The PR message MUST consist of a single short line, the PR Title, summarizing the problem being solved, followed by a blank line and then the proposed solution in the Body. If a PR consists of more than one commit, the PR Title MUST succinctly explain what the PR achieves. The Body MAY be as detailed as needed. If a PR changes the user interface (UI), the body of the text MUST include a presentation of these UI changes, preferably with screenshots of the previous and revised state.
-12. A “Valid PR” is one which satisfies the above requirements.
+10. Changes that break python API used by extensions SHALL be avoided. If it is not possible to avoid breaking changes, the amount of them MUST be minimized and PR MUST clearly describe all breaking changes with clear description on how to replace no longer working solution with newer one. Contributor SHOULD search for addons that will be broken and list them in the PR.
+11. Each commit message in a PR MUST succinctly explain what the commit achieves. The commit message SHALL follow the suggestions in the `git commit --help` documentation, section DISCUSSION.
+12. The PR message MUST consist of a single short line, the PR Title, summarizing the problem being solved, followed by a blank line and then the proposed solution in the Body. If a PR consists of more than one commit, the PR Title MUST succinctly explain what the PR achieves. The Body MAY be as detailed as needed. If a PR changes the user interface (UI), the body of the text MUST include a presentation of these UI changes, preferably with screenshots of the previous and revised state.
+13. A “Valid PR” is one which satisfies the above requirements.
 
 ## 6. Process
 

PRIVACY_POLICY.md

@@ -4,10 +4,7 @@ The FreeCAD application does not collect, transmit, share or use any Personal Da
 
 FreeCAD is community-developed Free Software. The community does not condone the unauthorized usage of private data, so our software does not gather or send personal data.
 
-The FreeCAD website is mostly static, it does not contain any trackers, neither ours nor third-party.  The website uses cookies to remember logged in status, timezone and other
-data related to navigating the site.
-
-The website does not contain advertisements.
+The FreeCAD website is mostly static, it does not contain any trackers, neither ours nor third-party. The website uses cookies to remember logged in status, timezone and other data related to navigating the site. The website does not contain advertisements.
 
 The software does not contain advertisements or trackers either.
 
@@ -15,9 +12,9 @@ The software does not contain advertisements or trackers either.
 
 FreeCAD is able to load or save files to/from remote servers (for some protocols and platforms). If you choose to load or save a remote file, your IP or other private data might be shared as part of the normal connection flow for the given protocol. This is out of our control and it is up to you to decide whether you trust a remote host.
 
-The FreeCAD eco system includes user developed workbenches.  These workbenches can be installed/updated using the Add-on Manager.  The Add-on Manager retrieves workbenches from remote servers across the internet.  Add-on workbenches are not checked for malicious content.  It is your responsibility to decide whether you trust an add-on workbench.
+The FreeCAD eco system includes user developed workbenches. These workbenches can be installed/updated using the Add-on Manager. The Add-on Manager retrieves workbenches from remote servers across the internet. Add-on workbenches are not checked for malicious content. It is your responsibility to decide whether you trust an add-on workbench.
 
-FreeCAD is meant to manipulate CAD files which may contain metadata. It is your responsibility to verify the metadata contained in your files before you share them with others.   These files may contain local directory paths which could reveal user names if the user name forms part of the path - as in “C:\MrsCAD\Documents\myFreeCADFile.FCstd”.
+FreeCAD is meant to manipulate CAD files which may contain metadata. It is your responsibility to verify the metadata contained in your files before you share them with others. These files may contain local directory paths which could reveal user names if the user name forms part of the path - as in “C:\MrsCAD\Documents\myFreeCADFile.FCstd”.
 
 FreeCAD can also be used to create and run macros. These are Python scripts that can perform any action that the user can perform on a system. When running a macro from an outside source, it is your responsibility to ensure you trust the author.
 
@@ -28,5 +25,4 @@ When reading the online version of the User Manual within FreeCAD, manual conten
 FreeCAD is Free Software and therefore may be packaged by other people, who may include additional software or modify the source code. We do not vouch for these third-party packages and cannot tell you what they contain and what they do regarding your privacy. The official packages are explicitly listed in our download page.
 
 
- - [based on the GIMP privacy policy](https://www.gimp.org/about/privacy.html)
-
+*The above privacy policy is based on the [GIMP privacy policy](https://www.gimp.org/about/privacy.html).*

README.md

@@ -2,7 +2,7 @@
 
 ### Your own 3D parametric modeler
 
-[Website](https://www.freecad.org) • 
+[Website](https://www.freecad.org) •
 [Documentation](https://wiki.freecad.org) •
 [Forum](https://forum.freecad.org/) •
 [Bug tracker](https://github.com/FreeCAD/FreeCAD/issues) •
@@ -12,7 +12,7 @@
 
 [![Release](https://img.shields.io/github/release/freecad/freecad.svg)](https://github.com/freecad/freecad/releases/latest) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad) [![Liberapay](https://img.shields.io/liberapay/receives/FreeCAD.svg?logo=liberapay)](https://liberapay.com/FreeCAD)
 
-<img src="https://user-images.githubusercontent.com/1828501/174066870-1692005b-f8d7-43fb-a289-6d2f07f73d7f.png" width="800"/>
+<img src="/.github/images/partdesign.png" width="800"/>
 
 Overview
 --------
@@ -49,27 +49,20 @@ Precompiled packages for stable releases are available for Windows, macOS and Li
 On most Linux distributions, FreeCAD is also directly installable from the 
 software center application.
 
-For development releases check the [weekly-builds page](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds).
+For development releases visit the [weekly-builds page](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds).
 
-Other options are described at the [wiki Download page](https://wiki.freecad.org/Download).
+Other options are described on the [wiki Download page](https://wiki.freecad.org/Download).
 
 Compiling
 ---------
 
-Compiling FreeCAD requires installation of several libraries and their 
-development files such as OCCT (Open Cascade), Coin and Qt, listed in the 
-pages below. Once this is done, FreeCAD can be compiled with 
-CMake. On Windows, these libraries are bundled and offered by the 
-FreeCAD team in a convenient package. On Linux, they are usually found 
-in your distribution's repositories, and on macOS and other platforms, 
-you will usually have to compile them yourself.
-
-The pages below contain up-to-date build instructions:
+FreeCAD requires several dependencies to correctly compile for development and
+production builds. The following pages contain updated build instructions for
+their respective platforms:
 
 - [Linux](https://wiki.freecad.org/Compile_on_Linux)
 - [Windows](https://wiki.freecad.org/Compile_on_Windows)
 - [macOS](https://wiki.freecad.org/Compile_on_MacOS)
-- [Cygwin](https://wiki.freecad.org/Compile_on_Cygwin)
 - [MinGW](https://wiki.freecad.org/Compile_on_MinGW)
 
 
@@ -78,15 +71,16 @@ Reporting Issues
 
 To report an issue please:
 
-- Consider posting to the [Forum](https://forum.freecad.org), [Discord](https://discord.com/invite/F4hdxzYZfc) channel, or [Reddit](https://www.reddit.com/r/FreeCAD) to verify the issue; 
+- Consider posting to the [Forum](https://forum.freecad.org), [Discord](https://discord.com/invite/w2cTKGzccC) channel, or [Reddit](https://www.reddit.com/r/FreeCAD) to verify the issue; 
 - Search the existing [issues](https://github.com/FreeCAD/FreeCAD/issues) for potential duplicates; 
 - Use the most updated stable or [development versions](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds) of FreeCAD; 
-- Post version info from e.g. `Help > About FreeCAD > Copy to clipboard`; 
+- Post version info from `Help > About FreeCAD > Copy to clipboard`; 
+- Restart FreeCAD in safe mode `Help > Restart in safe mode` and try to reproduce the issue again. If the issue is resolved it can be fixed by deleting the FreeCAD config files.
 - Start recording a macro `Macro > Macro recording...` and repeat all steps. Stop recording after the issue occurs and upload the saved macro or copy the macro code in the issue; 
 - Post a Step-By-Step explanation on how to recreate the issue; 
 - Upload an example file (FCStd as ZIP file) to demonstrate the problem; 
 
-For more detail see:
+For more details see:
 
 - [Bug Tracker](https://github.com/FreeCAD/FreeCAD/issues)
 - [Reporting Issues and Requesting Features](https://github.com/FreeCAD/FreeCAD/issues/new/choose)
@@ -94,17 +88,18 @@ For more detail see:
 - [Help Forum](https://forum.freecad.org/viewforum.php?f=3)
 - [Developers Handbook](https://freecad.github.io/DevelopersHandbook/)
 
+> [!NOTE]
 The [FPA](https://fpa.freecad.org) offers developers the opportunity
 to apply for a grant to work on projects of their choosing. Check
 [jobs and funding](https://blog.freecad.org/jobs/) to know more.
 
 
-Usage & Getting help
+Usage & Getting Help
 --------------------
 
 The FreeCAD wiki contains documentation on 
-general FreeCAD usage, Python scripting, and development. These 
-pages might help you get started:
+general FreeCAD usage, Python scripting, and development.
+View these pages for more information:
 
 - [Getting started](https://wiki.freecad.org/Getting_started)
 - [Features list](https://wiki.freecad.org/Feature_list)
@@ -113,10 +108,10 @@ pages might help you get started:
 - [Scripting](https://wiki.freecad.org/Power_users_hub)
 - [Development](https://wiki.freecad.org/Developer_hub)
 
-The [FreeCAD forum](https://forum.freecad.org) is also a great place
-to find help and solve specific problems you might encounter when
-learning to use FreeCAD.
+The [FreeCAD forum](https://forum.freecad.org) is a great place
+to find help and solve specific problems when learning to use FreeCAD.
 
+---
 
 <p>This project receives generous infrastructure support from
   <a href="https://www.digitalocean.com/">

SECURITY.md

@@ -1,29 +1,29 @@
 # Security Policy
 
-The FreeCAD project is a FOSS (Free and Open-Source Software) project that has a community of thousands of users and 
+The FreeCAD project is a FOSS (Free and Open-Source Software) project that has a community of thousands of users and
 hundreds of developers worldwide. We encourage responsible reporting of security vulnerabilities that may affect users
 of this software, and will endeavor to address these vulnerabilities when they are discovered.
 
 ## Bounties
 
-FreeCAD does not have a program to pay bounties for security bugs. If you discover a vulnerability that affects a part 
-of the FreeCAD project (either directly in FreeCAD, in a library it depends on, or in any of the various other 
+FreeCAD does not have a program to pay bounties for security bugs. If you discover a vulnerability that affects a part
+of the FreeCAD project (either directly in FreeCAD, in a library it depends on, or in any of the various other
 subprojects such as our website, forums, etc.) we ask you to join the large community of volunteer contributors and
 file a report about the issue.
 
-Note that funds may be available from the [FreeCAD Project Association (FPA)](https://fpa.freecad.org) to pursue 
-security research and/or the development of fixes to any vulnerabilities discovered. However, vulnerabilities held as 
+Note that funds may be available from the [FreeCAD Project Association (FPA)](https://fpa.freecad.org) to pursue
+security research and/or the development of fixes to any vulnerabilities discovered. However, vulnerabilities held as
 hostage in demands for "bounties" will not be entertained. Contact the FPA at fpa@freecad.org for more information.
 
 ## Supported Versions
 
-FreeCAD implements security fixes to the current release series, and to the current development on the master branch.
+FreeCAD implements security fixes to the current release series, and to the current development on the main branch.
 
 | Version | Supported          |
 |---------| ------------------ |
-| 0.22dev | :white_check_mark: |
-| 0.21    | :white_check_mark: |
-| < 0.21  | :x:                |
+| 1.1dev  | :white_check_mark: |
+| 1.0     | :white_check_mark: |
+| < 1.0   | :x:                |
 
 ## Reporting a Vulnerability
 

cMake/FindEigen3.cmake

@@ -1,8 +1,8 @@
 # - Try to find Eigen3 lib
 #
 # This module supports requiring a minimum version, e.g. you can do
-#   find_package(Eigen3 3.1.2)
-# to require version 3.1.2 or newer of Eigen3.
+#   find_package(Eigen3 3.4.0)
+# to require version 3.4.0 or newer of Eigen3.
 #
 # Once done this will define
 #
@@ -17,7 +17,7 @@
 
 if(NOT Eigen3_FIND_VERSION)
   set(Eigen3_FIND_VERSION_MAJOR 3)
-  set(Eigen3_FIND_VERSION_MINOR 0)
+  set(Eigen3_FIND_VERSION_MINOR 4)
   set(Eigen3_FIND_VERSION_PATCH 0)
   set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
 endif(NOT Eigen3_FIND_VERSION)

cMake/FindKDL.cmake

@@ -9,10 +9,10 @@
 IF ( CMAKE_PKGCONFIG_EXECUTABLE )
 
     MESSAGE( STATUS "Detecting KDL" )
-    
+
     SET(ENV{PKG_CONFIG_PATH} "${KDL_INSTALL}/lib/pkgconfig/")
     MESSAGE( "Looking for KDL in: ${KDL_INSTALL}")
-    PKGCONFIG( "orocos-kdl >= 0.99" KDL_FOUND KDL_INCLUDE_DIRS KDL_DEFINES KDL_LINK_DIRS KDL_LIBS )
+    PKGCONFIG( "orocos-kdl >= 1.4.0" KDL_FOUND KDL_INCLUDE_DIRS KDL_DEFINES KDL_LINK_DIRS KDL_LIBS )
 
     IF( KDL_FOUND )
         MESSAGE("   Includes in: ${KDL_INCLUDE_DIRS}")
@@ -22,13 +22,10 @@ IF ( CMAKE_PKGCONFIG_EXECUTABLE )
 
 	INCLUDE_DIRECTORIES( ${KDL_INCLUDE_DIRS} )
 	LINK_DIRECTORIES( ${KDL_LINK_DIRS})
-	#OROCOS_PKGCONFIG_INCPATH("${KDLTK_INCLUDE_DIRS}")
-	#OROCOS_PKGCONFIG_LIBS("${KDL_LIBS}")
-	#OROCOS_PKGCONFIG_LIBPATH("${KDL_LINK_DIRS}")
 
 	SET(ENV{PKG_CONFIG_PATH} "${KDL_INSTALL}/lib/pkgconfig/:${OROCOS_INSTALL}/lib/pkgconfig")
 	MESSAGE( "Looking for KDL Toolkit in: ${PKG_CONFIG_PATH}")
-	PKGCONFIG( "orocos-kdltk-${OROCOS_TARGET} >= 0.99" KDLTK_FOUND KDLTK_INCLUDE_DIRS KDLTK_DEFINES KDLTK_LINK_DIRS KDLTK_LIBS )
+	PKGCONFIG( "orocos-kdltk-${OROCOS_TARGET} >= 1.4.0" KDLTK_FOUND KDLTK_INCLUDE_DIRS KDLTK_DEFINES KDLTK_LINK_DIRS KDLTK_LIBS )
 	IF(KDLTK_FOUND)
 	  INCLUDE_DIRECTORIES( ${KDLTK_INCLUDE_DIRS} )
 	  LINK_DIRECTORIES( ${KDLTK_LINK_DIRS})
@@ -38,7 +35,7 @@ IF ( CMAKE_PKGCONFIG_EXECUTABLE )
 	  IF(CORBA_ENABLED)
 	    SET(ENV{PKG_CONFIG_PATH} "${KDL_INSTALL}/lib/pkgconfig/:${OROCOS_INSTALL}/lib/pkgconfig")
 	    MESSAGE("Looking for KDL Toolkit CORBA extension in ${PKG_CONFIG_PATH}")
-	    PKGCONFIG( "orocos-kdltk-corba-${OROCOS_TARGET} >= 0.99" KDLTKCORBA_FOUND KDLTKCORBA_INCLUDE_DIRS KDLTKCORBA_DEFINES KDLTKCORBA_LINK_DIRS KDLTKCORBA_LIBS )
+	    PKGCONFIG( "orocos-kdltk-corba-${OROCOS_TARGET} >= 1.4.0" KDLTKCORBA_FOUND KDLTKCORBA_INCLUDE_DIRS KDLTKCORBA_DEFINES KDLTKCORBA_LINK_DIRS KDLTKCORBA_LIBS )
 	    IF(KDLTKCORBA_FOUND)
 	      INCLUDE_DIRECTORIES( ${KDLTKCORBA_INCLUDE_DIRS} )
 	      LINK_DIRECTORIES( ${KDLTKCORBA_LINK_DIRS})

cMake/FindMatplotlib.cmake

@@ -13,7 +13,7 @@ IF(Python3_Interpreter_FOUND)
     # Try to import matplotlib into Python interpreter. Python
     # interpreter was found previously as required package, so
     # don't take care about this.
-    execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
+    execute_process(COMMAND "${Python3_EXECUTABLE}" "-c"
         "import matplotlib as m; print(m.__version__); print(m.__path__[0]);"
         RESULT_VARIABLE _MATPLOTLIB_SEARCH_SUCCESS
         OUTPUT_VARIABLE _MATPLOTLIB_VALUES

cMake/FindOCC.cmake

@@ -1,4 +1,4 @@
-# Try to find OCE / OCC
+# Try to find OCC
 # Once done this will define
 #
 # OCC_FOUND          - system has OCC - OpenCASCADE
@@ -7,164 +7,130 @@
 # OCC_LIBRARIES      - Link this to use OCC
 # OCC_OCAF_LIBRARIES - Link this to use OCC OCAF framework
 
-# First try to find OpenCASCADE Community Edition
-if(NOT DEFINED OCE_DIR)
-  # Check for OSX needs to come first because UNIX evaluates to true on OSX
-  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    if(DEFINED MACPORTS_PREFIX)
-      find_package(OCE QUIET HINTS ${MACPORTS_PREFIX}/Library/Frameworks)
-    elseif(DEFINED HOMEBREW_PREFIX)
-      find_package(OCE QUIET HINTS ${HOMEBREW_PREFIX}/Cellar/oce/*)
-    endif()
-  elseif(UNIX)
-    set(OCE_DIR "/usr/local/share/cmake/")
-  elseif(WIN32)
-    set(OCE_DIR "c:/OCE-0.4.0/share/cmake")
-  endif()
-endif()
-
-if(${FREECAD_USE_OCC_VARIANT} MATCHES "Community Edition")
-  find_package(OCE QUIET)
-endif()
-
-if(OCE_FOUND)
-  message(STATUS "-- OpenCASCADE Community Edition has been found.")
-  # Disable this define. For more details see bug #0001872
-  #add_definitions (-DHAVE_CONFIG_H)
-  set(OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS})
-  #set(OCC_LIBRARY_DIR ${OCE_LIBRARY_DIR})
-else(OCE_FOUND) #look for OpenCASCADE
-  # we first try to find opencascade directly:
-  if(NOT OCCT_CMAKE_FALLBACK)
+# we first try to find opencascade directly:
+if (NOT OCCT_CMAKE_FALLBACK)
     find_package(OpenCASCADE CONFIG QUIET)
-    if(NOT (CMAKE_VERSION VERSION_LESS 3.6.0))
-        get_property(flags DIRECTORY PROPERTY COMPILE_DEFINITIONS)
-        # OCCT 7.5 adds this define that causes hundreds of compiler warnings with Qt5.x, so remove it again
-        list(FILTER flags EXCLUDE REGEX [[GL_GLEXT_LEGACY]])
-        set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS ${flags})
-    endif()
-  endif(NOT OCCT_CMAKE_FALLBACK)
-  if(OpenCASCADE_FOUND)
+    get_property(flags DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+    # OCCT 7.5 adds this define that causes hundreds of compiler warnings with Qt5.x, so remove it again
+    list(FILTER flags EXCLUDE REGEX [[GL_GLEXT_LEGACY]])
+    set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS ${flags})
+endif ()
+if (OpenCASCADE_FOUND)
     set(OCC_FOUND ${OpenCASCADE_FOUND})
     set(OCC_INCLUDE_DIR ${OpenCASCADE_INCLUDE_DIR})
     set(OCC_LIBRARY_DIR ${OpenCASCADE_LIBRARY_DIR})
     set(OCC_LIBRARIES ${OpenCASCADE_LIBRARIES})
     set(OCC_OCAF_LIBRARIES TKCAF TKXCAF)
-  else(OpenCASCADE_FOUND)
-    if(WIN32)
-      if(CYGWIN OR MINGW)
-      FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
-          /usr/include/opencascade
-          /usr/local/include/opencascade
-          /opt/opencascade/include
-          /opt/opencascade/inc
+else ()
+    if (WIN32)
+        if (CYGWIN OR MINGW)
+            find_path(OCC_INCLUDE_DIR Standard_Version.hxx
+                    /usr/include/opencascade
+                    /usr/local/include/opencascade
+                    /opt/opencascade/include
+                    /opt/opencascade/inc
+            )
+            find_path(OCC_LIBRARY TKernel
+                    /usr/lib
+                    /usr/local/lib
+                    /opt/opencascade/lib
+            )
+        else ()
+            find_path(OCC_INCLUDE_DIR Standard_Version.hxx
+                    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/include"
+            )
+            find_library(OCC_LIBRARY TKernel
+                    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/lib"
+            )
+        endif ()
+    else ()
+        find_path(OCC_INCLUDE_DIR Standard_Version.hxx
+                /usr/include/occt
+                /usr/include/opencascade
+                /usr/local/include/opencascade
+                /opt/opencascade/include
+                /opt/opencascade/inc
         )
-        FIND_LIBRARY(OCC_LIBRARY TKernel
-          /usr/lib
-          /usr/local/lib
-          /opt/opencascade/lib
+        find_library(OCC_LIBRARY TKernel
+                /usr/lib
+                /usr/local/lib
+                /opt/opencascade/lib
         )
-      else(CYGWIN OR MINGW)
-      FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/include"
-        )
-        FIND_LIBRARY(OCC_LIBRARY TKernel
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/lib"
-        )
-      endif(CYGWIN OR MINGW)
-    else(WIN32)
-      FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
-        /usr/include/occt
-        /usr/include/opencascade
-        /usr/local/include/opencascade
-        /opt/opencascade/include
-        /opt/opencascade/inc
-      )
-      FIND_LIBRARY(OCC_LIBRARY TKernel
-        /usr/lib
-        /usr/local/lib
-        /opt/opencascade/lib
-      )
-    endif(WIN32)
-    if(OCC_LIBRARY)
-      GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
-      IF(NOT OCC_INCLUDE_DIR)
-        FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
-          ${OCC_LIBRARY_DIR}/../inc
-        )
-      ENDIF()
-    endif(OCC_LIBRARY)
-  endif(OpenCASCADE_FOUND)
-endif(OCE_FOUND)
+    endif ()
+    if (OCC_LIBRARY)
+        get_filename_component(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
+        if (NOT OCC_INCLUDE_DIR)
+            find_path(OCC_INCLUDE_DIR Standard_Version.hxx
+                    ${OCC_LIBRARY_DIR}/../inc
+            )
+        endif ()
+    endif ()
+endif ()
 
-if(OCC_INCLUDE_DIR)
-  file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR
-    REGEX "#define OCC_VERSION_MAJOR.*"
-  )
-  string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
-  file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR
-    REGEX "#define OCC_VERSION_MINOR.*"
-  )
-  string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
-  file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
-    REGEX "#define OCC_VERSION_MAINTENANCE.*"
-  )
-  string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
+if (OCC_INCLUDE_DIR)
+    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR
+            REGEX "#define OCC_VERSION_MAJOR.*"
+    )
+    string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
+    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR
+            REGEX "#define OCC_VERSION_MINOR.*"
+    )
+    string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
+    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
+            REGEX "#define OCC_VERSION_MAINTENANCE.*"
+    )
+    string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
 
-  set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
-endif(OCC_INCLUDE_DIR)
+    set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
+endif ()
 
 # handle the QUIETLY and REQUIRED arguments and set OCC_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OCC REQUIRED_VARS OCC_INCLUDE_DIR VERSION_VAR OCC_VERSION_STRING)
+find_package_handle_standard_args(OCC REQUIRED_VARS OCC_INCLUDE_DIR VERSION_VAR OCC_VERSION_STRING)
 
-if(OCC_FOUND)
-  set(OCC_LIBRARIES
-    TKFillet
-    TKMesh
-    TKernel
-    TKG2d
-    TKG3d
-    TKMath
-    TKShHealing
-    TKXSBase
-    TKBool
-    TKBO
-    TKBRep
-    TKTopAlgo
-    TKGeomAlgo
-    TKGeomBase
-    TKOffset
-    TKPrim
-    TKHLR
-    TKFeat
-  )
-  set(OCC_OCAF_LIBRARIES
-    TKBin
-    TKBinL
-    TKCAF
-    TKXCAF
-    TKLCAF
-    TKVCAF
-    TKCDF
-    TKMeshVS
-    TKService
-    TKV3d
-  )
+if (OCC_FOUND)
+    set(OCC_LIBRARIES
+            TKFillet
+            TKMesh
+            TKernel
+            TKG2d
+            TKG3d
+            TKMath
+            TKShHealing
+            TKXSBase
+            TKBool
+            TKBO
+            TKBRep
+            TKTopAlgo
+            TKGeomAlgo
+            TKGeomBase
+            TKOffset
+            TKPrim
+            TKHLR
+            TKFeat
+    )
+    set(OCC_OCAF_LIBRARIES
+            TKBin
+            TKBinL
+            TKCAF
+            TKXCAF
+            TKLCAF
+            TKVCAF
+            TKCDF
+            TKMeshVS
+            TKService
+            TKV3d
+            TKRWMesh
+    )
 
-  if(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
-    list(APPEND OCC_OCAF_LIBRARIES TKRWMesh)
-  endif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
-  if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-    list(APPEND OCC_LIBRARIES TKIGES TKSTL TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
-    list(APPEND OCC_OCAF_LIBRARIES TKXDESTEP TKXDEIGES)
-  else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-    list(APPEND OCC_LIBRARIES TKDESTEP TKDEIGES TKDEGLTF TKDESTL)
-  endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-  message(STATUS "-- Found OCE/OpenCASCADE version: ${OCC_VERSION_STRING}")
-  message(STATUS "-- OCE/OpenCASCADE include directory: ${OCC_INCLUDE_DIR}")
-  message(STATUS "-- OCE/OpenCASCADE shared libraries directory: ${OCC_LIBRARY_DIR}")
-else(OCC_FOUND)
-  #message(SEND_ERROR "Neither OpenCASCADE Community Edition nor OpenCasCade were found: will not build CAD modules!")
-endif(OCC_FOUND)
+    if (OCC_VERSION_STRING VERSION_LESS 7.8.0)
+        list(APPEND OCC_LIBRARIES TKIGES TKSTL TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
+        list(APPEND OCC_OCAF_LIBRARIES TKXDESTEP TKXDEIGES)
+    else ()
+        list(APPEND OCC_LIBRARIES TKDESTEP TKDEIGES TKDEGLTF TKDESTL)
+    endif ()
+    message(STATUS "Found OpenCASCADE version: ${OCC_VERSION_STRING}")
+    message(STATUS "  OpenCASCADE include directory: ${OCC_INCLUDE_DIR}")
+    message(STATUS "  OpenCASCADE shared libraries directory: ${OCC_LIBRARY_DIR}")
+endif ()

cMake/FindPyCXX.cmake

@@ -118,7 +118,7 @@ if(PYCXX_FOUND)
         ${PYCXX_SOURCE_DIR}/IndirectPythonInterface.cxx
     )
 
-    #set old 6.2 pycxx compatibility  
+    #set old 6.2 pycxx compatibility
     list(APPEND PYCXX_SOURCES ${PYCXX_SOURCE_DIR}/cxx_exceptions.cxx)
     add_definitions(-DPYCXX_6_2_COMPATIBILITY)
     #end old compatibility

cMake/FindPySide2Tools.cmake

@@ -5,7 +5,7 @@
 
 if(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     #pyside2 tools are often in same location as python interpreter
-    get_filename_component(PYTHON_BIN_DIR ${PYTHON_EXECUTABLE} PATH)
+    get_filename_component(PYTHON_BIN_DIR ${Python3_EXECUTABLE} PATH)
     set(PYSIDE_BIN_DIR ${PYTHON_BIN_DIR})
 endif(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
@@ -16,8 +16,8 @@ FIND_PACKAGE(Qt5 COMPONENTS Core Widgets)
 
 IF(Qt5Core_VERSION VERSION_LESS 5.14)
   # Legacy (< 5.14)
-  FIND_PROGRAM(PYSIDE2_UIC_EXECUTABLE NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} pyuic5 HINTS ${PYSIDE_BIN_DIR})
-  FIND_PROGRAM(PYSIDE2_RCC_EXECUTABLE NAMES pyside2-rcc pyside2-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} pyrcc5 HINTS ${PYSIDE_BIN_DIR})
+  FIND_PROGRAM(PYSIDE2_UIC_EXECUTABLE NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR} pyuic5 HINTS ${PYSIDE_BIN_DIR})
+  FIND_PROGRAM(PYSIDE2_RCC_EXECUTABLE NAMES pyside2-rcc pyside2-rcc-${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR} pyrcc5 HINTS ${PYSIDE_BIN_DIR})
   set(UICOPTIONS "")
   set(RCCOPTIONS "")
 ELSE()

cMake/FindPySide6.cmake

@@ -4,19 +4,19 @@
 # cMake find_package() call
 
 find_package(PySide6 CONFIG QUIET)
+
 if(NOT PySide6_FOUND)
-    if(NOT PySide6_INCLUDE_DIR AND TARGET PySide6::pyside6)
-        get_property(PySide6_INCLUDE_DIR TARGET PySide6::pyside6 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-    endif()
-
-    if(NOT PySide6_INCLUDE_DIR)
-        find_pip_package(PySide6)
-        if (PySide6_FOUND)
-            set(PYSIDE_INCLUDE_DIR ${PySide6_INCLUDE_DIRS} CACHE INTERNAL "")
-            set(PYSIDE_LIBRARY ${PySide6_LIBRARIES} CACHE INTERNAL "")
-            set(PYSIDE_FOUND TRUE CACHE BOOL OFF)
-            set(PYSIDE_MAJOR_VERSION 6 CACHE INTERNAL 6)
-        endif()
-    endif()
-
+    find_pip_package(PySide6)
+endif()
+
+if(NOT PySide6_INCLUDE_DIRS AND TARGET PySide6::pyside6)
+    get_property(PySide6_INCLUDE_DIRS TARGET PySide6::pyside6 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+endif()
+
+# Also provide the old-style variables so we don't have to update everything yet
+if (PySide6_FOUND)
+    set(PYSIDE_INCLUDE_DIR ${PySide6_INCLUDE_DIRS})
+    set(PYSIDE_LIBRARY ${PySide6_LIBRARIES})
+    set(PYSIDE_FOUND TRUE)
+    set(PYSIDE_MAJOR_VERSION 6)
 endif()

cMake/FindShiboken6.cmake

@@ -11,18 +11,18 @@ if(NOT Shiboken6_FOUND)
     if(NOT Shiboken6_INCLUDE_DIR)
         find_pip_package(Shiboken6)
         if (Shiboken6_FOUND)
-            set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES} CACHE INTERNAL "")
-            set(SHIBOKEN_MAJOR_VERSION 6 CACHE INTERNAL 6)
-            set(SHIBOKEN_FOUND ON CACHE BOOL OFF)
+            set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES})
+            set(SHIBOKEN_MAJOR_VERSION 6)
+            set(SHIBOKEN_FOUND ON)
         endif()
         # The include directory we actually want is part of shiboken6-generator
         find_pip_package(shiboken6_generator)
         if (shiboken6_generator_FOUND)
-            set(SHIBOKEN_INCLUDE_DIR ${shiboken6_generator_INCLUDE_DIRS} CACHE PATH "")
+            set(SHIBOKEN_INCLUDE_DIR ${shiboken6_generator_INCLUDE_DIRS})
         endif()
     endif()
 else()
-    set(SHIBOKEN_INCLUDE_DIR ${Shiboken6_INCLUDE_DIRS} CACHE PATH "")
-    set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES} CACHE INTERNAL "")
-    set(SHIBOKEN_FOUND ON CACHE BOOL OFF)
+    set(SHIBOKEN_INCLUDE_DIR ${Shiboken6_INCLUDE_DIRS})
+    set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES})
+    set(SHIBOKEN_FOUND ON)
 endif()

cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake

@@ -8,8 +8,8 @@ macro(CheckInterModuleDependencies)
         if(${dependent})
             foreach(prerequisite IN LISTS ARGN)
                 if(NOT ${prerequisite})
-                    message(STATUS "${dependent} requires ${prerequisite} to be ON, but it"
-                                   " is \"${${prerequisite}}\"")
+                    message(SEND_ERROR "${dependent} requires ${prerequisite} to be ON, but it"
+                        " is \"${${prerequisite}}\"")
                     set(${dependent} OFF PARENT_SCOPE)
                     break()
                 endif(NOT ${prerequisite})
@@ -17,24 +17,28 @@ macro(CheckInterModuleDependencies)
         endif(${dependent})
     endfunction(REQUIRES_MODS)
 
-    REQUIRES_MODS(BUILD_BIM                BUILD_PART BUILD_MESH BUILD_DRAFT)
-    REQUIRES_MODS(BUILD_DRAFT              BUILD_SKETCHER)
+    REQUIRES_MODS(BUILD_ASSEMBLY           BUILD_PART BUILD_PART_DESIGN BUILD_SPREADSHEET)
+    REQUIRES_MODS(BUILD_BIM                BUILD_PART BUILD_MESH BUILD_MESH_PART BUILD_DRAFT)
+    REQUIRES_MODS(BUILD_DRAFT              BUILD_SKETCHER BUILD_TECHDRAW BUILD_BIM)
     REQUIRES_MODS(BUILD_DRAWING            BUILD_PART BUILD_SPREADSHEET)
     REQUIRES_MODS(BUILD_FEM                BUILD_PART)
-    REQUIRES_MODS(BUILD_IDF                BUILD_PART)
     REQUIRES_MODS(BUILD_IMPORT             BUILD_PART)
     REQUIRES_MODS(BUILD_INSPECTION         BUILD_MESH BUILD_POINTS BUILD_PART)
     REQUIRES_MODS(BUILD_JTREADER           BUILD_MESH)
-    REQUIRES_MODS(BUILD_MESH_PART          BUILD_PART BUILD_MESH BUILD_SMESH)
+    REQUIRES_MODS(BUILD_MESH_PART          BUILD_PART BUILD_MESH)
     REQUIRES_MODS(BUILD_FLAT_MESH          BUILD_MESH_PART)
     REQUIRES_MODS(BUILD_OPENSCAD           BUILD_MESH_PART BUILD_DRAFT)
+    REQUIRES_MODS(BUILD_MATERIAL_EXTERNAL  BUILD_MATERIAL)
+    REQUIRES_MODS(BUILD_MEASURE            BUILD_PART)
+    REQUIRES_MODS(BUILD_PART               BUILD_MATERIAL)
     REQUIRES_MODS(BUILD_PART_DESIGN        BUILD_SKETCHER)
     # REQUIRES_MODS(BUILD_CAM              BUILD_PART BUILD_MESH BUILD_ROBOT)
     REQUIRES_MODS(BUILD_CAM                BUILD_PART BUILD_MESH)
-    REQUIRES_MODS(BUILD_REVERSEENGINEERING BUILD_PART BUILD_MESH)
+    REQUIRES_MODS(BUILD_REVERSEENGINEERING BUILD_PART BUILD_MESH BUILD_POINTS)
     REQUIRES_MODS(BUILD_ROBOT              BUILD_PART)
     REQUIRES_MODS(BUILD_SANDBOX            BUILD_PART BUILD_MESH)
     REQUIRES_MODS(BUILD_SKETCHER           BUILD_PART)
     REQUIRES_MODS(BUILD_SPREADSHEET        BUILD_DRAFT)
-    REQUIRES_MODS(BUILD_TECHDRAW           BUILD_PART BUILD_SPREADSHEET)
+    REQUIRES_MODS(BUILD_SURFACE            BUILD_PART)
+    REQUIRES_MODS(BUILD_TECHDRAW           BUILD_PART BUILD_PART_DESIGN BUILD_SPREADSHEET BUILD_MEASURE BUILD_IMPORT)
 endmacro(CheckInterModuleDependencies)

cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake

@@ -9,17 +9,16 @@ macro(CompilerChecksAndSetups)
 
     # ================================================================================
 
-    # Needed for boost1.69
-    # Avoid that Python (pyerrors.h) defines snprintf and vsnprintf
-    if (MSVC AND NOT MSVC_VERSION VERSION_LESS 1900)
-        add_definitions(-DHAVE_SNPRINTF)
-    elseif (MINGW)
-        add_definitions(-DHAVE_SNPRINTF)
-    endif()
+    # Use a heuristic of 1 GiB of RAM needed per compiler job and limit to
+    # a single link job. Modern linkers are multithreaded and running them concurrently
+    # can exhaust resources.
+    cmake_host_system_information(RESULT avail_mem_MiB QUERY TOTAL_PHYSICAL_MEMORY)
+    math(EXPR max_compile_procs "${avail_mem_MiB} / 1024")
+    set_property(GLOBAL PROPERTY JOB_POOLS compile_jobs=${max_compile_procs} link_jobs=1)
 
-    # Allow developers to use Boost < 1.65
+    # Allow developers to use Boost < 1.74
     if (NOT BOOST_MIN_VERSION)
-        set(BOOST_MIN_VERSION 1.65)
+        set(BOOST_MIN_VERSION 1.74)
     endif()
 
     # For older cmake versions the variable 'CMAKE_CXX_COMPILER_VERSION' is missing
@@ -28,26 +27,24 @@ macro(CompilerChecksAndSetups)
                         OUTPUT_VARIABLE CMAKE_CXX_COMPILER_VERSION)
     endif(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION)
 
-    # Enabled C++17 for Freecad 0.20 and later
-        set(BUILD_ENABLE_CXX_STD "C++17"  CACHE STRING  "Enable C++ standard")
-        set_property(CACHE BUILD_ENABLE_CXX_STD PROPERTY STRINGS
-                     "C++17"
-                     "C++20"
-        )
+    # Enabled C++20 for Freecad 1.1 and later
+    set(BUILD_ENABLE_CXX_STD "C++20"  CACHE STRING  "Enable C++ standard")
+    set_property(CACHE BUILD_ENABLE_CXX_STD PROPERTY STRINGS
+                 "C++20"
+                 "C++23"
+    )
 
-        if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.3)
-            message(FATAL_ERROR "FreeCAD 0.20 and later requires C++17.  G++ must be 7.3 or later, the used version is ${CMAKE_CXX_COMPILER_VERSION}")
-        elseif(CMAKE_COMPILER_IS_CLANGXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-            message(FATAL_ERROR "FreeCAD 0.20 and later requires C++17.  Clang must be 6.0 or later, the used version is ${CMAKE_CXX_COMPILER_VERSION}")
-        endif()
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.2)
+        message(FATAL_ERROR "FreeCAD 1.1 and later requires C++20.  G++ must be 11.2 or later, the used version is ${CMAKE_CXX_COMPILER_VERSION}")
+    elseif(CMAKE_COMPILER_IS_CLANGXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.0)
+        message(FATAL_ERROR "FreeCAD 1.1 and later requires C++20.  Clang must be 14.0 or later, the used version is ${CMAKE_CXX_COMPILER_VERSION}")
+    endif()
 
     # Escape the two plus chars as otherwise cmake complains about invalid regex
     if(${BUILD_ENABLE_CXX_STD} MATCHES "C\\+\\+23")
         set(CMAKE_CXX_STANDARD 23)
-    elseif(${BUILD_ENABLE_CXX_STD} MATCHES "C\\+\\+20")
+    else()
         set(CMAKE_CXX_STANDARD 20)
-    elseif(${BUILD_ENABLE_CXX_STD} MATCHES "C\\+\\+17")
-        set(CMAKE_CXX_STANDARD 17)
     endif()
 
     # Log the compiler and version
@@ -58,6 +55,8 @@ macro(CompilerChecksAndSetups)
         configure_file(${CMAKE_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
         add_definitions(-DHAVE_CONFIG_H)
 
+        set(CMAKE_CXX_FLAGS "-fdiagnostics-color ${CMAKE_CXX_FLAGS}")
+
         # For now only set pedantic option for clang
         if(CMAKE_COMPILER_IS_CLANGXX)
             set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wpedantic -Wno-write-strings ${CMAKE_CXX_FLAGS}")
@@ -82,6 +81,15 @@ macro(CompilerChecksAndSetups)
                 endif()
             endif()
         endif(BUILD_DYNAMIC_LINK_PYTHON)
+
+        if(BUILD_USE_LIBCXX)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+        endif()
+
+        if(BUILD_ENABLE_TIME_TRACE)
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftime-trace")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftime-trace")
+        endif()
     endif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
 
     if(CMAKE_COMPILER_IS_CLANGXX)
@@ -90,15 +98,15 @@ macro(CompilerChecksAndSetups)
         #
         # https://en.wikipedia.org/wiki/Xcode#Latest_versions
         if (APPLE)
-            if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-undefined-var-template")
-            endif()
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-undefined-var-template")
             add_definitions(-DGL_SILENCE_DEPRECATION)
         elseif (UNIX)
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-undefined-var-template")
         endif()
 
-        # older boost.preprocessor turn off variadics for clang
+        # boost.preprocessor 1.74 and earlier turns off variadics for clang regardless of version, even though they
+        # work in all versions of clang that we support. Manually force variadic macro support until our oldest
+        # supported version of boost is 1.75 or higher.
         add_definitions(-DBOOST_PP_VARIADICS=1)
         message(STATUS "Force BOOST_PP_VARIADICS=1 for clang")
     endif()

cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake

@@ -16,10 +16,10 @@ macro(ConfigureCMakeVariables)
     endif()
 
     set(PYCXX_INCLUDE_DIR
-        "${CMAKE_SOURCE_DIR}/src" CACHE PATH
+        "${CMAKE_SOURCE_DIR}/src/3rdParty/PyCXX" CACHE PATH
         "Path to the directory containing PyCXX's CXX/Config.hxx include file")
     set(PYCXX_SOURCE_DIR
-        "${CMAKE_SOURCE_DIR}/src/CXX" CACHE PATH
+        "${CMAKE_SOURCE_DIR}/src/3rdParty/PyCXX/CXX" CACHE PATH
         "Path to the directory containing PyCXX's cxxextensions.c source file")
 
     # used as compiler defines

cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake

@@ -15,7 +15,9 @@ macro(CopyLibpackDirectories)
         if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0")
             file(COPY ${FREECAD_LIBPACK_DIR}/plugins/tls DESTINATION ${CMAKE_BINARY_DIR}/bin)
         endif()
-        file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
+        if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0" AND FREECAD_LIBPACK_VERSION VERSION_LESS "3.1.0")
+            file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
+        endif()
         message(STATUS "... end copying.\n=======================================\n")
     endif()
 
@@ -40,7 +42,9 @@ macro(CopyLibpackDirectories)
             file(COPY ${FREECAD_LIBPACK_DIR}/plugins/imageformats DESTINATION ${CMAKE_BINARY_DIR}/bin)
             file(COPY ${FREECAD_LIBPACK_DIR}/plugins/platforms DESTINATION ${CMAKE_BINARY_DIR}/bin)
             file(COPY ${FREECAD_LIBPACK_DIR}/plugins/styles DESTINATION ${CMAKE_BINARY_DIR}/bin)
-            file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
+            if(FREECAD_LIBPACK_VERSION VERSION_LESS "3.1.0")
+                file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
+            endif()
             file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf "[Paths]\nPrefix=..\n")
         endif()
     endif()
@@ -59,7 +63,9 @@ macro(CopyLibpackDirectories)
         if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0")
             install(DIRECTORY ${FREECAD_LIBPACK_DIR}/plugins/tls DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
         endif()
-        install(DIRECTORY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_INSTALL_PREFIX})
+        if(FREECAD_LIBPACK_VERSION VERSION_LESS "3.1.0")
+            install(DIRECTORY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_INSTALL_PREFIX})
+        endif()
         install(DIRECTORY ${FREECAD_LIBPACK_DIR}/bin DESTINATION ${CMAKE_INSTALL_PREFIX})
         install(DIRECTORY ${FREECAD_LIBPACK_DIR}/lib DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.dll")
         if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0")

cMake/FreeCAD_Helpers/CreatePackagingTargets.cmake

@@ -4,14 +4,14 @@ macro(CreatePackagingTargets)
     #
     #add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
     add_custom_target(dist-git
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
+        COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
               --bindir=${CMAKE_BINARY_DIR}
               --major=${PACKAGE_VERSION_MAJOR}
               --minor=${PACKAGE_VERSION_MINOR}
               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     )
     add_custom_target(distdfsg-git
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
+        COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
               --bindir=${CMAKE_BINARY_DIR}
               --major=${PACKAGE_VERSION_MAJOR}
               --minor=${PACKAGE_VERSION_MINOR}
@@ -20,7 +20,7 @@ macro(CreatePackagingTargets)
     )
     if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX OR MINGW)
         add_custom_target(distcheck-git
-            COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
+            COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
                   --bindir=${CMAKE_BINARY_DIR}
                   --major=${PACKAGE_VERSION_MAJOR}
                   --minor=${PACKAGE_VERSION_MINOR}
@@ -28,7 +28,7 @@ macro(CreatePackagingTargets)
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         )
         add_custom_target(distcheckdfsg-git
-            COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
+            COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
                   --bindir=${CMAKE_BINARY_DIR}
                   --major=${PACKAGE_VERSION_MAJOR}
                   --minor=${PACKAGE_VERSION_MINOR}

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -10,11 +10,19 @@ macro(InitializeFreeCADBuildOptions)
     option(FREECAD_USE_EXTERNAL_KDL "Use system installed orocos-kdl instead of the bundled." OFF)
     option(FREECAD_USE_EXTERNAL_FMT "Use system installed fmt library if available instead of fetching the source." ON)
     option(FREECAD_USE_EXTERNAL_ONDSELSOLVER "Use system installed OndselSolver instead of git submodule." OFF)
+    option(FREECAD_USE_EXTERNAL_E57FORMAT "Use system installed libE57Format instead of the bundled." OFF)
+    option(FREECAD_USE_EXTERNAL_GTEST "Use system installed Google Test and Google Mock" OFF)
     option(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
     option(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
+    option(FREECAD_CHECK_PIVY "Check for pivy version using Python at build time" ON)
+    option(FREECAD_PARALLEL_COMPILE_JOBS "Compilation jobs pool size to fit memory limitations.")
+    option(FREECAD_PARALLEL_LINK_JOBS "Linkage jobs pool size to fit memory limitations.")
     option(BUILD_WITH_CONDA "Set ON if you build FreeCAD with conda" OFF)
     option(BUILD_DYNAMIC_LINK_PYTHON "If OFF extension-modules do not link against python-libraries" ON)
+    option(BUILD_TRACY_FRAME_PROFILER "If ON then enables support for the Tracy frame profiler" OFF)
+
     option(INSTALL_TO_SITEPACKAGES "If ON the freecad root namespace (python) is installed into python's site-packages" ON)
+    option(INSTALL_PREFER_SYMLINKS "If ON then fc_copy_sources macro will create symlinks instead of copying files" OFF)
     option(OCCT_CMAKE_FALLBACK "disable usage of occt-config files" OFF)
     if (WIN32 OR APPLE)
         option(FREECAD_USE_QT_FILEDIALOG "Use Qt's file dialog instead of the native one." OFF)
@@ -75,8 +83,6 @@ macro(InitializeFreeCADBuildOptions)
                  "Community Edition"
     )
 
-    configure_file(${CMAKE_SOURCE_DIR}/src/QtOpenGL.h.cmake ${CMAKE_BINARY_DIR}/src/QtOpenGL.h)
-
     option(BUILD_DESIGNER_PLUGIN "Build and install the designer plugin" OFF)
 
     if(APPLE)
@@ -116,6 +122,7 @@ macro(InitializeFreeCADBuildOptions)
     option(BUILD_INSPECTION "Build the FreeCAD inspection module" ON)
     option(BUILD_JTREADER "Build the FreeCAD jt reader module" OFF)
     option(BUILD_MATERIAL "Build the FreeCAD material module" ON)
+    option(BUILD_MATERIAL_EXTERNAL "Build the FreeCAD material external interface module" OFF)
     option(BUILD_MESH "Build the FreeCAD mesh module" ON)
     option(BUILD_MESH_PART "Build the FreeCAD mesh part module" ON)
     option(BUILD_FLAT_MESH "Build the FreeCAD flat mesh module" ON)
@@ -142,52 +149,65 @@ macro(InitializeFreeCADBuildOptions)
     option(BUILD_CLOUD "Build the FreeCAD cloud module" OFF)
     option(ENABLE_DEVELOPER_TESTS "Build the FreeCAD unit tests suit" ON)
 
-    if(MSVC)
+    if(MSVC OR APPLE)
         set(FREECAD_3DCONNEXION_SUPPORT "NavLib" CACHE STRING "Select version of the 3Dconnexion device integration")
-        set_property(CACHE FREECAD_3DCONNEXION_SUPPORT PROPERTY STRINGS "NavLib" "Raw input")
-    else(MSVC)
-        set(FREECAD_3DCONNEXION_SUPPORT "Raw input")
-    endif(MSVC)
+        set_property(CACHE FREECAD_3DCONNEXION_SUPPORT PROPERTY STRINGS "None" "NavLib" "Legacy" "Both")
+    else(MSVC OR APPLE)
+        option(FREECAD_USE_3DCONNEXION_LEGACY "Enable support for 3Dconnexion devices." ON)
+    endif(MSVC OR APPLE)
+
+    if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib")
+        set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
+    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Both")
+        set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
+        set(FREECAD_USE_3DCONNEXION_LEGACY ON)
+    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Legacy")
+        set(FREECAD_USE_3DCONNEXION_LEGACY ON)
+    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "None")
+        set(FREECAD_USE_3DCONNEXION_NAVLIB OFF)
+        set(FREECAD_USE_3DCONNEXION_LEGACY OFF)
+    endif()
+
+    if(APPLE AND FREECAD_USE_3DCONNEXION_LEGACY)
+        find_library(3DCONNEXIONCLIENT_FRAMEWORK 3DconnexionClient)
+        if(NOT (IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK}))
+            set(FREECAD_USE_3DCONNEXION_LEGACY OFF)
+        endif()
+    endif()
 
     if(MSVC)
         option(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)
-        option(FREECAD_USE_PCL "Build the features that use PCL libs" OFF) # 3/5/2021 current LibPack uses non-C++17 FLANN
-        option(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
-    elseif(APPLE)
-        find_library(3DCONNEXIONCLIENT_FRAMEWORK 3DconnexionClient)
-        if(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-            option(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
-        else(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-            option(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." OFF)
-        endif(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-    else(MSVC)
-        set(FREECAD_USE_3DCONNEXION OFF )
+        option(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
     endif(MSVC)
     if(NOT MSVC)
         option(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" OFF)
         option(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
     endif(NOT MSVC)
 
-    if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib" AND FREECAD_USE_3DCONNEXION)
-        set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
-        set(FREECAD_USE_3DCONNEXION OFF)
-    endif()
-
     # if this is set override some options
     if (FREECAD_BUILD_DEBIAN)
-        set(FREECAD_USE_EXTERNAL_ZIPIOS ON )
+        # Disable it until the upstream package has been fixed. See
+        # https://github.com/FreeCAD/FreeCAD/issues/13676#issuecomment-2539978468
+        # https://github.com/FreeCAD/FreeCAD/issues/13676#issuecomment-2541513308
+        set(FREECAD_USE_EXTERNAL_ZIPIOS OFF )
         # A Debian package for SMESH doesn't exist
         #set(FREECAD_USE_EXTERNAL_SMESH ON )
     endif (FREECAD_BUILD_DEBIAN)
 
-    if(BUILD_FEM)
-        set(BUILD_SMESH ON )
+    if(BUILD_FEM OR BUILD_MESH_PART)
+        set(FREECAD_USE_SMESH ON)
+        if(FREECAD_USE_EXTERNAL_SMESH)
+            set(BUILD_SMESH OFF)
+        else()
+            set(BUILD_SMESH ON)
+        endif()
+    else()
+        set(FREECAD_USE_SMESH OFF)
+        set(BUILD_SMESH OFF)
     endif()
 
-    # for Windows the minimum required cmake version is 3.4.3 to build the CAM module
-    if(WIN32 AND CMAKE_VERSION VERSION_LESS 3.4.3)
-        message(WARNING "Disable CAM, requires cmake >= 3.4.3 in order to build this module")
-        set(BUILD_CAM OFF )
+    if (BUILD_CAM OR BUILD_FLAT_MESH)
+        set(FREECAD_USE_PYBIND11 ON)
     endif()
 
     # force build directory to be different to source directory
@@ -197,4 +217,22 @@ macro(InitializeFreeCADBuildOptions)
                                 "Please choose another build directory! Or disable the option BUILD_FORCE_DIRECTORY.")
         endif()
     endif()
+
+    if(FREECAD_PARALLEL_COMPILE_JOBS)
+        if(CMAKE_GENERATOR MATCHES "Ninja")
+            set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${FREECAD_PARALLEL_COMPILE_JOBS})
+            set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
+        else()
+            message(WARNING "Job pooling is only available with Ninja generators.")
+        endif()
+    endif()
+
+    if(FREECAD_PARALLEL_LINK_JOBS)
+        if(CMAKE_GENERATOR MATCHES "Ninja")
+            set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${FREECAD_PARALLEL_LINK_JOBS})
+            set(CMAKE_JOB_POOL_LINK link_job_pool)
+        else()
+            message(WARNING "Job pooling is only available with Ninja generators.")
+        endif()
+    endif()
 endmacro(InitializeFreeCADBuildOptions)

cMake/FreeCAD_Helpers/PrintFinalReport.cmake

@@ -14,7 +14,7 @@ macro(PrintFinalReport)
 
     # just a value
     macro(value)
-    unset(val)
+        unset(val)
         set(name ${ARGV0})
         if(${name})
             set(val ${${name}}) # name has a value
@@ -58,13 +58,14 @@ macro(PrintFinalReport)
 
     simple(Compiler "${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_VERSION})")
     value(CMAKE_VERSION)
+    conditional(ccache CCACHE_PROGRAM "not enabled" ${CCACHE_PROGRAM})
     simple(prefix ${CMAKE_INSTALL_PREFIX})
     simple(bindir ${CMAKE_INSTALL_BINDIR})
     simple(datadir ${CMAKE_INSTALL_DATADIR})
     simple(docdir ${CMAKE_INSTALL_DOCDIR})
     simple(includedir ${CMAKE_INSTALL_INCLUDEDIR})
     simple(libdir ${CMAKE_INSTALL_LIBDIR})
-    simple(Python "${Python3_VERSION} [${PYTHON_EXECUTABLE}] Suffix: [${PYTHON_CONFIG_SUFFIX}]")
+    simple(Python "${Python3_VERSION} [${Python3_EXECUTABLE}] Suffix: [${PYTHON_CONFIG_SUFFIX}]")
     value(BLAS)
 
     section_end()
@@ -83,11 +84,12 @@ macro(PrintFinalReport)
     value(BUILD_VR)
     value(CMAKE_PREFIX_PATH)
     value(FREECAD_QT_VERSION)
-    value(PYTHON_EXECUTABLE)
+    value(Python3_EXECUTABLE)
     value(PYTHON_LIBRARY)
     value(FREECAD_CREATE_MAC_APP)
-    value(FREECAD_USE_PYBIND11)
     value(FREECAD_USE_EXTERNAL_KDL)
+    value(FREECAD_USE_PYSIDE)
+    value(FREECAD_USE_SHIBOKEN)
     value(BUILD_ADDONMGR)
     value(BUILD_BIM)
     value(BUILD_ASSEMBLY)
@@ -102,6 +104,7 @@ macro(PrintFinalReport)
     value(BUILD_INSPECTION)
     value(BUILD_JTREADER)
     value(BUILD_MATERIAL)
+    value(BUILD_MATERIAL_EXTERNAL)
     value(BUILD_MESH)
     value(BUILD_MESH_PART)
     value(BUILD_OPENSCAD)
@@ -141,17 +144,16 @@ macro(PrintFinalReport)
     simple(ZLIB "${ZLIB_VERSION_STRING}")
     simple(OCC "${OCC_VERSION_STRING} [${OCC_LIBRARY_DIR}] [${OCC_INCLUDE_DIR}]")
     simple(OCC_Libs "[${OCC_LIBRARIES}]")
-    if(BUILD_SMESH)
+    if(FREECAD_USE_SMESH)
         if(FREECAD_USE_EXTERNAL_SMESH)
             simple(SMESH "${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK}")
         else()
             simple(SMESH "${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK} build internal")
             simple(MEDFile "${MEDFILE_VERSION} [${MEDFILE_LIBRARIES}] [${MEDFILE_INCLUDE_DIRS}]")
             simple(HDF5 ${HDF5_VERSION})
-            simple(VTK ${VTK_VERSION})
         endif()
     else()
-        simple(SMESH "do not build")
+        simple(SMESH "not enabled")
     endif()
     conditional(NETGEN NETGEN_FOUND
                 "not enabled"
@@ -192,11 +194,13 @@ macro(PrintFinalReport)
     simple(OpenGLU_Incl [${OPENGL_INCLUDE_DIR}])
     simple(Coin3D "${COIN3D_VERSION} [${COIN3D_LIBRARIES}] [${COIN3D_INCLUDE_DIRS}]")
     simple(pivy ${PIVY_VERSION})
-    if (WIN32)
-        if (FREECAD_USE_3DCONNEXION)
-            simple(3Dconnexion "Building 3Dconnexion support with original code")
+    if(WIN32 OR APPLE)
+        if(FREECAD_USE_3DCONNEXION_LEGACY AND FREECAD_USE_3DCONNEXION_NAVLIB)
+            simple(3Dconnexion "Building with 3Dconnexion legacy and NavLib support")
+        elseif(FREECAD_USE_3DCONNEXION_LEGACY)
+            simple(3Dconnexion "Building with 3Dconnexion legacy support")
         elseif(FREECAD_USE_3DCONNEXION_NAVLIB)
-            simple(3Dconnexion "Building 3Dconnexion support with NavLib")
+            simple(3Dconnexion "Building with 3Dconnexion NavLib support")
         else()
             simple(3Dconnexion "Not building 3Dconnexion device support")
         endif()
@@ -214,6 +218,7 @@ macro(PrintFinalReport)
     conditional(PYCXX PYCXX_FOUND "not found" "${PYCXX_VERSION} Incl: ${PYCXX_INCLUDE_DIR} Src:${PYCXX_SOURCE_DIR}")
     conditional(fmt fmt_FOUND "Sources downloaded to ${fmt_SOURCE_DIR}" "${fmt_VERSION}")
     conditional(yaml-cpp yaml-cpp_FOUND "not found" "${yaml-cpp_VERSION}")
+    conditional(Vtk VTK_FOUND "not found" ${VTK_VERSION})
 
     section_end()
 

cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake

@@ -19,21 +19,33 @@ macro(SetGlobalCompilerAndLinkerSettings)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mxgot")
     endif()
 
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+        # Only add -O0 if no -O* optimization flag exists
+        if (NOT "${CMAKE_C_FLAGS_DEBUG}" MATCHES "-O[a-z0-9]+")
+            set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
+        endif()
+        if (NOT "${CMAKE_CXX_FLAGS_DEBUG}" MATCHES "-O[a-z0-9]+")
+            set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
+        endif()
+    endif()
     if(MSVC)
         # set default compiler settings
         add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR -DNOMINMAX)
         add_compile_options(/Zm150 /bigobj)
         set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG")
-        # set default libs
-        set (CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib SHFolder.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib winmm.lib comsupp.lib Ws2_32.lib dbghelp.lib ")
-        set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}")
-        # set linker flag /nodefaultlib
-        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB")
-        set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /NODEFAULTLIB")
-        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB")
+        if (MSVC_VERSION LESS 1930)  # Anything before VS 2022
+            # set default libs
+            set (CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib SHFolder.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib winmm.lib comsupp.lib Ws2_32.lib dbghelp.lib ")
+            set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}")
+            # set linker flag /nodefaultlib
+            set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB")
+            set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /NODEFAULTLIB")
+            set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB")
+        endif()
         if(FREECAD_RELEASE_PDB)
             set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
             set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG")
+            set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG")
         endif(FREECAD_RELEASE_PDB)
         if(FREECAD_RELEASE_SEH)
             # remove /EHsc or /EHs flags because they are incompatible with /EHa

cMake/FreeCAD_Helpers/SetupBoost.cmake

@@ -3,7 +3,7 @@ macro(SetupBoost)
 
     set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
 
-    set (BOOST_COMPONENTS filesystem program_options regex system thread date_time)
+    set (BOOST_COMPONENTS program_options regex system thread date_time)
     find_package(Boost ${BOOST_MIN_VERSION}
         COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
 

cMake/FreeCAD_Helpers/SetupCoin3D.cmake

@@ -6,16 +6,22 @@ macro(SetupCoin3D)
         find_library(COIN3D_LIBRARIES Coin)
     endif ()
 
-    # Try MODULE mode
-    find_package(Coin3D)
-    if (NOT COIN3D_FOUND)
-        # Try CONFIG mode
-        find_package(Coin CONFIG REQUIRED)
-        if (Coin_FOUND)
-            set(COIN3D_INCLUDE_DIRS ${Coin_INCLUDE_DIR})
-            set(COIN3D_LIBRARIES ${Coin_LIBRARIES})
+    # Try CONFIG mode -- Coin supports very old CMake files, which emits noisy warnings. Silence them.
+    set(CMAKE_WARN_DEPRECATED_OLD_STATE ${CMAKE_WARN_DEPRECATED})
+    set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)
+    find_package(Coin CONFIG)
+    set(CMAKE_WARN_DEPRECATED ${CMAKE_WARN_DEPRECATED_OLD_STATE} CACHE BOOL "" FORCE)
+    if (Coin_FOUND)
+        set(COIN3D_INCLUDE_DIRS ${Coin_INCLUDE_DIR})
+        set(COIN3D_LIBRARIES ${Coin_LIBRARIES})
+        set(COIN3D_LIB_DIRS ${Coin_LIB_DIR})
+    else ()
+        # Try MODULE mode (FindCoin3D.cmake, included by CMake)
+        find_package(Coin3D)
+        if (NOT COIN3D_FOUND)
+            message(FATAL_ERROR "Could not find Coin3D")
         endif ()
-    ENDIF ()
+    endif ()
 
     IF (NOT COIN3D_VERSION)
         file(READ "${COIN3D_INCLUDE_DIRS}/Inventor/C/basic.h" _coin3d_basic_h)
@@ -27,18 +33,50 @@ macro(SetupCoin3D)
         set(COIN3D_MICRO_VERSION "${CMAKE_MATCH_1}")
         set(COIN3D_VERSION "${COIN3D_MAJOR_VERSION}.${COIN3D_MINOR_VERSION}.${COIN3D_MICRO_VERSION}")
     ENDIF ()
+endmacro(SetupCoin3D)
 
-    IF (NOT PIVY_VERSION)
-        message(STATUS "Checking Pivy version by importing it in a Python program...")
+macro(SetupPivy)
+    # -------------------------------- Pivy --------------------------------
+
+    IF (FREECAD_CHECK_PIVY) # do not make pivy a host dependency for cross compiling
+        IF (NOT PIVY_VERSION)
+            message(STATUS "Checking Pivy version by importing it in a Python program...")
+            execute_process(
+                    COMMAND ${Python3_EXECUTABLE} -c "import pivy as p; print(p.__version__,end='')"
+                    OUTPUT_VARIABLE PIVY_VERSION
+                    RESULT_VARIABLE RETURN_CODE)
+            if (RETURN_CODE EQUAL 0)
+                message(STATUS "Found Pivy ${PIVY_VERSION}")
+            else ()
+                message(ERROR "Failed to import Pivy using ${Python3_EXECUTABLE}")
+            endif ()
+        ENDIF ()
+
+        message(STATUS "Checking Pivy Coin3D version by importing it in a Python program...")
         execute_process(
-                COMMAND ${Python3_EXECUTABLE} -c "import pivy as p; print(p.__version__,end='')"
-                OUTPUT_VARIABLE PIVY_VERSION
+                COMMAND ${Python3_EXECUTABLE} -c "import pivy as p; print(p.SoDB.getVersion(),end='')"
+                OUTPUT_VARIABLE PIVY_COIN_VERSION
                 RESULT_VARIABLE RETURN_CODE)
         if (RETURN_CODE EQUAL 0)
-            message(STATUS "Found Pivy ${PIVY_VERSION}")
+            message(STATUS "Found Pivy Coin3D ${PIVY_COIN_VERSION}")
         else ()
-            message(ERROR "Failed to import Pivy using ${Python3_EXECUTABLE}")
+            message(ERROR "Failed to get Pivy Coin3D version using ${Python3_EXECUTABLE}")
         endif ()
-    ENDIF ()
 
-endmacro(SetupCoin3D)
+        if (${PIVY_COIN_VERSION} MATCHES "([0-9]+)\\.([0-9]+)\\.([0-9]+)")
+            set(PIVY_COIN_MAJOR_VERSION ${CMAKE_MATCH_1})
+            set(PIVY_COIN_MINOR_VERSION ${CMAKE_MATCH_2})
+            set(PIVY_COIN_MICRO_VERSION ${CMAKE_MATCH_3})
+            set(PIVY_COIN_VERSION "${PIVY_COIN_MAJOR_VERSION}.${PIVY_COIN_MINOR_VERSION}.${PIVY_COIN_MICRO_VERSION}")
+        else ()
+            message(FATAL_ERROR "Failed to match Pivy Coin3D version string output")
+        endif ()
+
+        if (NOT (
+            (${COIN3D_MAJOR_VERSION} EQUAL ${PIVY_COIN_MAJOR_VERSION}) AND
+            (${COIN3D_MINOR_VERSION} EQUAL ${PIVY_COIN_MINOR_VERSION}) AND
+            (${COIN3D_MICRO_VERSION} EQUAL ${PIVY_COIN_MICRO_VERSION})))
+            message(FATAL_ERROR "Coin3D version ${COIN3D_VERSION} mismatches Pivy Coin3D ${PIVY_COIN_VERSION}.")
+        endif ()
+    endif(FREECAD_CHECK_PIVY)
+endmacro(SetupPivy)

cMake/FreeCAD_Helpers/SetupEigen.cmake

@@ -11,19 +11,10 @@ macro(SetupEigen)
                 "=================\n")
     endif(NOT EIGEN3_FOUND)
 
-    if (EIGEN3_FOUND AND ${EIGEN3_VERSION} VERSION_LESS "3.3.1")
+    if (EIGEN3_FOUND AND ${EIGEN3_VERSION} VERSION_LESS "3.4.0")
         message(WARNING "Disable module flatmesh because it requires "
-                        "minimum Eigen3 version 3.3.1 but version ${EIGEN3_VERSION} was found")
+                        "minimum Eigen3 version 3.4.0 but version ${EIGEN3_VERSION} was found")
         set (BUILD_FLAT_MESH OFF)
     endif()
 
-    # Older versions raise the warning -Wdeprecated-copy with clang10/gcc10
-    if (EIGEN3_FOUND AND ${EIGEN3_VERSION} VERSION_LESS "3.3.8")
-        unset(_flag_found CACHE)
-        check_cxx_compiler_flag("-Wno-deprecated-copy" _flag_found)
-        if (_flag_found)
-            set (EIGEN3_NO_DEPRECATED_COPY "-Wno-deprecated-copy")
-        endif ()
-    endif()
-
 endmacro(SetupEigen)

cMake/FreeCAD_Helpers/SetupLibFmt.cmake

@@ -34,8 +34,8 @@ macro(SetupLibFmt)
                      cmake_policy(SET CMP0135 NEW)
               endif()
               FetchContent_Declare(fmt
-                      URL https://github.com/fmtlib/fmt/archive/refs/tags/9.1.0.zip
-                      URL_MD5 e6754011ff56bfc37631fcc90961e377
+                      URL https://github.com/fmtlib/fmt/archive/refs/tags/11.1.4.zip
+                      URL_MD5 90667b07f34d91554cf8285ae234ff66
               )
               FetchContent_MakeAvailable(fmt)
               set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON)

cMake/FreeCAD_Helpers/SetupOpenCasCade.cmake

@@ -1,11 +1,8 @@
 macro(SetupOpenCasCade)
-# -------------------------------- OpenCasCade --------------------------------
-
     find_package(OCC)
     if(NOT OCC_FOUND)
         message(FATAL_ERROR "================================================================\n"
-                            "Neither OpenCASCADE Community Edition nor OpenCASCADE was found!\n"
+                            "OpenCASCADE not found!\n"
                             "================================================================\n")
-    endif(NOT OCC_FOUND)
-
-endmacro(SetupOpenCasCade)
+    endif()
+endmacro()

cMake/FreeCAD_Helpers/SetupOpenGL.cmake

@@ -1,6 +1,11 @@
 macro(SetupOpenGL)
 # -------------------------------- OpenGL --------------------------------
 
+    # If on a system with both a legacy GL library and GLVND, prefer the legacy library.
+    # This is probably needed until we no longer have any gl.*ARB calls in the codebase
+    # See, e.g. SoBrepFaceSet.cpp
+    set(OpenGL_GL_PREFERENCE LEGACY)
+
     find_package(OpenGL)
     include(FindPackageMessage)
     if(OPENGL_GLU_FOUND)

cMake/FreeCAD_Helpers/SetupPybind11.cmake

@@ -2,7 +2,6 @@ macro(SetupPybind11)
 # -------------------------------- PyBind11 -----------------------------
 
     # necessary for flat-mesh feature
-    option(FREECAD_USE_PYBIND11 "Use pybind11" OFF)
     if (FREECAD_USE_PYBIND11)
         find_package(pybind11 REQUIRED)
     endif()

cMake/FreeCAD_Helpers/SetupPython.cmake

@@ -3,7 +3,12 @@ macro(SetupPython)
 
     find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
 
+    if (${Python3_VERSION} VERSION_LESS "3.10")
+         message(FATAL_ERROR "To build FreeCAD you need at least Python 3.10\n")
+    endif()
+
     # For backwards compatibility with old CMake scripts
+    # See: https://github.com/FreeCAD/FreeCAD/pull/19635#issuecomment-2725612407
     set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
     set(PYTHON_LIBRARIES ${Python3_LIBRARIES})
     set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
@@ -14,8 +19,4 @@ macro(SetupPython)
     set(PYTHON_VERSION_PATCH ${Python3_VERSION_PATCH})
     set(PYTHONINTERP_FOUND ${Python3_Interpreter_FOUND})
 
-    if (${PYTHON_VERSION_STRING} VERSION_LESS "3.8")
-         message(FATAL_ERROR "To build FreeCAD you need at least Python 3.8\n")
-    endif()
-
 endmacro(SetupPython)

cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake

@@ -1,8 +1,8 @@
 macro(SetupSalomeSMESH)
 # -------------------------------- Salome SMESH --------------------------
-
     # Salome SMESH sources are under src/3rdParty now
-    if(BUILD_SMESH)
+    if(FREECAD_USE_SMESH)
+
         # set the internal smesh version:
         # see src/3rdParty/salomonemesh/CMakeLists.txt and commit https://github.com/FreeCAD/FreeCAD/commit/666a3e5 and https://forum.freecad.org/viewtopic.php?f=10&t=30838
         set(SMESH_VERSION_MAJOR 7)
@@ -42,7 +42,7 @@ macro(SetupSalomeSMESH)
                     endif()
                 endforeach()
             else()
-                set(VTK_COMPONENTS "CommonCore;CommonDataModel;FiltersVerdict;IOXML;FiltersCore;FiltersGeneral;IOLegacy;FiltersExtraction;FiltersSources;FiltersGeometry")
+                set(VTK_COMPONENTS "CommonCore;CommonDataModel;FiltersVerdict;IOXML;FiltersCore;FiltersGeneral;IOLegacy;FiltersExtraction;FiltersSources;FiltersGeometry;WrappingPythonCore")
                 list(APPEND VTK_COMPONENTS "IOMPIParallel;ParallelMPI;hdf5;FiltersParallelDIY2;RenderingCore;InteractionStyle;RenderingFreeType;RenderingOpenGL2")
                 foreach(_module ${VTK_COMPONENTS})
                     list (FIND VTK_AVAILABLE_COMPONENTS ${_module} _index)
@@ -63,6 +63,17 @@ macro(SetupSalomeSMESH)
         endif()
 
         set(BUILD_FEM_VTK ON)
+
+        # Check if PythonWrapperCore was found
+        # Note: VTK 9 only, as the implementations use the VTK modules introduced in 8.1
+        #       VTK_WrappingPythonCore_FOUND is named differently for versions <9.0
+        if (${VTK_WrappingPythonCore_FOUND})
+            set(BUILD_FEM_VTK_PYTHON 1)
+            message(STATUS "VTK python wrapper: available")
+        else()
+            message(STATUS "VTK python wrapper: NOT available")
+        endif()
+
         if(${VTK_MAJOR_VERSION} LESS 6)
             message( FATAL_ERROR "Found VTK version is <6, this is not compatible" )
         endif()
@@ -145,6 +156,6 @@ macro(SetupSalomeSMESH)
 
         set(SMESH_FOUND TRUE)
         configure_file(${CMAKE_SOURCE_DIR}/src/SMESH_Version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/SMESH_Version.h)
-    endif(BUILD_SMESH)
+    endif(FREECAD_USE_SMESH)
 
 endmacro(SetupSalomeSMESH)

cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake

@@ -59,15 +59,18 @@ macro(SetupShibokenAndPyside)
 
     find_package(PySide${PYSIDE_MAJOR_VERSION} QUIET)
 
-    if(NOT PYSIDE_INCLUDE_DIR AND TARGET PySide${PYSIDE_MAJOR_VERSION}::pyside${PYSIDE_MAJOR_VERSION})
-        get_property(PYSIDE_INCLUDE_DIR TARGET PySide${PYSIDE_MAJOR_VERSION}::pyside${PYSIDE_MAJOR_VERSION} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-    endif(NOT PYSIDE_INCLUDE_DIR AND TARGET PySide${PYSIDE_MAJOR_VERSION}::pyside${PYSIDE_MAJOR_VERSION})
+    if(${PYSIDE_MAJOR_VERSION} EQUAL 2)
+        # Our internal FindPySide6.cmake file already provides these for PySide6
+        if(NOT PYSIDE_INCLUDE_DIR AND TARGET PySide${PYSIDE_MAJOR_VERSION}::pyside${PYSIDE_MAJOR_VERSION})
+            get_property(PYSIDE_INCLUDE_DIR TARGET PySide${PYSIDE_MAJOR_VERSION}::pyside${PYSIDE_MAJOR_VERSION} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+        endif(NOT PYSIDE_INCLUDE_DIR AND TARGET PySide${PYSIDE_MAJOR_VERSION}::pyside${PYSIDE_MAJOR_VERSION})
 
-    if(NOT PYSIDE_INCLUDE_DIR)
-        find_pip_package(PySide${PYSIDE_MAJOR_VERSION})
-        if (PySide${PYSIDE_MAJOR_VERSION}_FOUND)
-            set(PYSIDE_INCLUDE_DIR ${PySide${PYSIDE_MAJOR_VERSION}_INCLUDE_DIRS})
-            set(PYSIDE_LIBRARY ${PySide${PYSIDE_MAJOR_VERSION}_LIBRARIES})
+        if(NOT PYSIDE_INCLUDE_DIR)
+            find_pip_package(PySide${PYSIDE_MAJOR_VERSION})
+            if (PySide${PYSIDE_MAJOR_VERSION}_FOUND)
+                set(PYSIDE_INCLUDE_DIR ${PySide${PYSIDE_MAJOR_VERSION}_INCLUDE_DIRS})
+                set(PYSIDE_LIBRARY ${PySide${PYSIDE_MAJOR_VERSION}_LIBRARIES})
+            endif()
         endif()
     endif()
 
@@ -128,7 +131,7 @@ macro(SetupShibokenAndPyside)
 
     # Now try to import the shiboken Python module and print a warning if it can't be loaded
     execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION}"
+        COMMAND ${Python3_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION}"
         RESULT_VARIABLE FAILURE
         OUTPUT_VARIABLE PRINT_OUTPUT
     )
@@ -140,7 +143,7 @@ macro(SetupShibokenAndPyside)
                 "==================================\n")
     else()
         execute_process(
-            COMMAND ${PYTHON_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION};print(shiboken${SHIBOKEN_MAJOR_VERSION}.__version__, end='')"
+            COMMAND ${Python3_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION};print(shiboken${SHIBOKEN_MAJOR_VERSION}.__version__, end='')"
             RESULT_VARIABLE FAILURE
             OUTPUT_VARIABLE Shiboken_VERSION
         )
@@ -154,7 +157,7 @@ macro(SetupShibokenAndPyside)
 
     # Independent of the build option PySide modules must be loaded at runtime. Print a warning if it fails.
     execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};import os;print(os.path.dirname(PySide${PYSIDE_MAJOR_VERSION}.__file__), end='')"
+        COMMAND ${Python3_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};import os;print(os.path.dirname(PySide${PYSIDE_MAJOR_VERSION}.__file__), end='')"
         RESULT_VARIABLE FAILURE
         OUTPUT_VARIABLE PRINT_OUTPUT
     )
@@ -165,7 +168,7 @@ macro(SetupShibokenAndPyside)
                 "================================\n")
     else()
         execute_process(
-            COMMAND ${PYTHON_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};print(PySide${PYSIDE_MAJOR_VERSION}.__version__, end='')"
+            COMMAND ${Python3_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};print(PySide${PYSIDE_MAJOR_VERSION}.__version__, end='')"
             RESULT_VARIABLE FAILURE
             OUTPUT_VARIABLE PySide_VERSION
         )

cMake/FreeCAD_Helpers/SetupZipIos.cmake

@@ -0,0 +1,67 @@
+macro(SetupZipIos)
+# -------------------------------- ZipIos --------------------------------
+
+    # Use external zipios++ if specified.
+    if(FREECAD_USE_EXTERNAL_ZIPIOS)
+        find_library(ZIPIOS_LIBRARY zipios)
+        find_path(ZIPIOS_INCLUDES zipios++/zipios-config.h)
+        if(ZIPIOS_LIBRARY)
+            message(STATUS "Found zipios++: ${ZIPIOS}")
+        endif()
+        if(ZIPIOS_INCLUDES)
+            message(STATUS "Found zipios++ headers.")
+        endif()
+        if(NOT ZIPIOS_LIBRARY OR NOT ZIPIOS_INCLUDES)
+            message(FATAL_ERROR "Using external zipios++ was specified but was not found.")
+        endif()
+    else(FREECAD_USE_EXTERNAL_ZIPIOS)
+        set(ZIPIOS_INCLUDES ${CMAKE_SOURCE_DIR}/src/3rdParty)
+        SET(zipios_SRCS
+            ${ZIPIOS_INCLUDES}/zipios++/backbuffer.h
+            ${ZIPIOS_INCLUDES}/zipios++/collcoll.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/collcoll.h
+            ${ZIPIOS_INCLUDES}/zipios++/deflateoutputstreambuf.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/deflateoutputstreambuf.h
+            ${ZIPIOS_INCLUDES}/zipios++/fcoll.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/fcoll.h
+            ${ZIPIOS_INCLUDES}/zipios++/fcollexceptions.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/fcollexceptions.h
+            ${ZIPIOS_INCLUDES}/zipios++/fileentry.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/fileentry.h
+            ${ZIPIOS_INCLUDES}/zipios++/filepath.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/filepath.h
+            ${ZIPIOS_INCLUDES}/zipios++/filterinputstreambuf.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/filterinputstreambuf.h
+            ${ZIPIOS_INCLUDES}/zipios++/filteroutputstreambuf.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/filteroutputstreambuf.h
+            ${ZIPIOS_INCLUDES}/zipios++/gzipoutputstream.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/gzipoutputstream.h
+            ${ZIPIOS_INCLUDES}/zipios++/gzipoutputstreambuf.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/gzipoutputstreambuf.h
+            ${ZIPIOS_INCLUDES}/zipios++/inflateinputstreambuf.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/inflateinputstreambuf.h
+            ${ZIPIOS_INCLUDES}/zipios++/meta-iostreams.h
+            ${ZIPIOS_INCLUDES}/zipios++/outputstringstream.h
+            ${ZIPIOS_INCLUDES}/zipios++/simplesmartptr.h
+            ${ZIPIOS_INCLUDES}/zipios++/virtualseeker.h
+            ${ZIPIOS_INCLUDES}/zipios++/zipfile.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/zipfile.h
+            ${ZIPIOS_INCLUDES}/zipios++/ziphead.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/ziphead.h
+            ${ZIPIOS_INCLUDES}/zipios++/zipheadio.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/zipheadio.h
+            ${ZIPIOS_INCLUDES}/zipios++/zipinputstream.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/zipinputstream.h
+            ${ZIPIOS_INCLUDES}/zipios++/zipinputstreambuf.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/zipinputstreambuf.h
+            ${ZIPIOS_INCLUDES}/zipios++/zipios_common.h
+            ${ZIPIOS_INCLUDES}/zipios++/zipios-config.h
+            ${ZIPIOS_INCLUDES}/zipios++/zipios_defs.h
+            ${ZIPIOS_INCLUDES}/zipios++/zipoutputstreambuf.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/zipoutputstreambuf.h
+            ${ZIPIOS_INCLUDES}/zipios++/zipoutputstream.cpp
+            ${ZIPIOS_INCLUDES}/zipios++/zipoutputstream.h
+        )
+    endif(FREECAD_USE_EXTERNAL_ZIPIOS)
+
+endmacro(SetupZipIos)

cMake/FreeCadMacros.cmake

@@ -9,21 +9,23 @@ MACRO (fc_copy_sources target_name outpath)
 	else()
 		set(fc_details "")
 	endif()
+	if(INSTALL_PREFER_SYMLINKS)
+		set(copy_command create_symlink)
+	else()
+		set(copy_command copy)
+	endif()
+
 	foreach(it ${ARGN})
 		get_filename_component(infile ${it} ABSOLUTE)
 		get_filename_component(outfile "${outpath}/${it}" ABSOLUTE)
 		add_file_dependencies("${infile}" "${outfile}")
 		ADD_CUSTOM_COMMAND(
-			COMMAND   "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}"
+			COMMAND   "${CMAKE_COMMAND}" -E ${copy_command} "${infile}" "${outfile}"
 			OUTPUT   "${outfile}"
 			COMMENT "Copying ${infile} to ${outfile}${fc_details}"
 			MAIN_DEPENDENCY "${infile}"
 		)
 	endforeach(it)
-	ADD_CUSTOM_COMMAND(
-		TARGET    ${target_name}
-		DEPENDS   ${ARGN}
-	)
 ENDMACRO(fc_copy_sources)
 
 MACRO (fc_copy_file_if_different inputfile outputfile)
@@ -76,10 +78,6 @@ MACRO (fc_target_copy_resource target_name inpath outpath)
 			MAIN_DEPENDENCY "${infile}"
 		)
 	endforeach(it)
-	ADD_CUSTOM_COMMAND(
-		TARGET    ${target_name}
-		DEPENDS   ${ARGN}
-	)
 ENDMACRO(fc_target_copy_resource)
 
 MACRO (fc_target_copy_resource_flat target_name inpath outpath)
@@ -111,16 +109,13 @@ MACRO (fc_target_copy_resource_flat target_name inpath outpath)
 			MAIN_DEPENDENCY "${infile}"
 		)
 	endforeach(it)
-	ADD_CUSTOM_COMMAND(
-		TARGET    ${target_name}
-		DEPENDS   ${ARGN}
-	)
 ENDMACRO(fc_target_copy_resource_flat)
 
 # It would be a bit cleaner to generate these files in ${CMAKE_CURRENT_BINARY_DIR}
 
+# To be removed once all instances are migrated to generate_from_py
 macro(generate_from_xml BASE_NAME)
-    set(TOOL_PATH "${CMAKE_SOURCE_DIR}/src/Tools/generate.py")
+    set(TOOL_PATH "${CMAKE_SOURCE_DIR}/src/Tools/bindings/generate.py")
     file(TO_NATIVE_PATH "${TOOL_PATH}" TOOL_NATIVE_PATH)
     file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.xml" SOURCE_NATIVE_PATH)
 
@@ -132,34 +127,75 @@ macro(generate_from_xml BASE_NAME)
     if(NOT EXISTS "${SOURCE_CPP_PATH}")
         # assures the source files are generated at least once
         message(STATUS "${SOURCE_CPP_PATH}")
-        execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}"
+        execute_process(COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}"
                         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
         )
     endif()
     add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.cpp"
-        COMMAND ${PYTHON_EXECUTABLE} "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" ${BASE_NAME}.xml
-        MAIN_DEPENDENCY "${BASE_NAME}.xml"
+        COMMAND ${Python3_EXECUTABLE} "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" ${BASE_NAME}.xml
+        MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.xml"
         DEPENDS
-        "${CMAKE_SOURCE_DIR}/src/Tools/generateTemplates/templateClassPyExport.py"
+        "${CMAKE_SOURCE_DIR}/src/Tools/bindings/templates/templateClassPyExport.py"
         "${TOOL_PATH}"
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
         COMMENT "Building ${BASE_NAME}.h/.cpp out of ${BASE_NAME}.xml"
     )
 endmacro(generate_from_xml)
 
-macro(generate_from_py BASE_NAME OUTPUT_FILE)
+macro(generate_from_py_impl BASE_NAME SUFFIX)
+    set(TOOL_PATH "${CMAKE_SOURCE_DIR}/src/Tools/bindings/generate.py")
+    file(TO_NATIVE_PATH "${TOOL_PATH}" TOOL_NATIVE_PATH)
+    file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.pyi" SOURCE_NATIVE_PATH)
+
+    set(SOURCE_CPP_PATH "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}Py${SUFFIX}.cpp")
+    set(SOURCE_H_PATH "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}Py${SUFFIX}.h")
+
+    # BASE_NAME may include also a path name
+    GET_FILENAME_COMPONENT(OUTPUT_PATH "${SOURCE_CPP_PATH}" PATH)
+    file(TO_NATIVE_PATH "${OUTPUT_PATH}" OUTPUT_NATIVE_PATH)
+    if(NOT EXISTS "${SOURCE_CPP_PATH}")
+        # Ensure the source files are generated at least once.
+        message(STATUS "${SOURCE_CPP_PATH}")
+        execute_process(
+            COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}"
+            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+            COMMAND_ERROR_IS_FATAL ANY
+        )
+    endif()
+
+    add_custom_command(
+        OUTPUT "${SOURCE_H_PATH}" "${SOURCE_CPP_PATH}"
+        COMMAND ${Python3_EXECUTABLE} "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" ${BASE_NAME}.pyi
+        MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.pyi"
+        DEPENDS
+            "${CMAKE_SOURCE_DIR}/src/Tools/bindings/templates/templateClassPyExport.py"
+            "${TOOL_PATH}"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        COMMENT "Building ${BASE_NAME}Py${SUFFIX}.h/.cpp out of ${BASE_NAME}.pyi"
+    )
+endmacro(generate_from_py_impl)
+
+macro(generate_from_py BASE_NAME)
+    generate_from_py_impl(${BASE_NAME} "")
+endmacro(generate_from_py)
+
+macro(generate_from_py_ BASE_NAME)
+    generate_from_py_impl(${BASE_NAME} "_")
+endmacro(generate_from_py_)
+
+macro(generate_embed_from_py BASE_NAME OUTPUT_FILE)
 		set(TOOL_PATH "${CMAKE_SOURCE_DIR}/src/Tools/PythonToCPP.py")
 		file(TO_NATIVE_PATH "${TOOL_PATH}" TOOL_NATIVE_PATH)
 		file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py" SOURCE_NATIVE_PATH)
 		add_custom_command(
 		 		OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}"
-		 		COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}"
+		 		COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}"
 				MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py"
 				DEPENDS "${TOOL_PATH}"
 				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 				COMMENT "Building files out of ${BASE_NAME}.py")
-endmacro(generate_from_py)
+endmacro(generate_embed_from_py)
 
 macro(generate_from_any INPUT_FILE OUTPUT_FILE VARIABLE)
 		set(TOOL_PATH "${CMAKE_SOURCE_DIR}/src/Tools/PythonToCPP.py")
@@ -167,7 +203,7 @@ macro(generate_from_any INPUT_FILE OUTPUT_FILE VARIABLE)
 		file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${INPUT_FILE}" SOURCE_NATIVE_PATH)
 		add_custom_command(
 		 		OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}"
-		 		COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}" "${VARIABLE}"
+		 		COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}" "${VARIABLE}"
 				MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${INPUT_FILE}"
 				DEPENDS "${TOOL_PATH}"
 				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
@@ -272,8 +308,10 @@ ENDMACRO(SET_PYTHON_PREFIX_SUFFIX)
 # Locate the include directory for a pip-installed package -- uses pip show to find the base pip
 # install directory, and then appends the package name and  "/include" to the end
 macro(find_pip_package PACKAGE)
+	unset(${PACKAGE}_FOUND)  # Remove from local scope
+	unset(${PACKAGE}_FOUND CACHE)  # Remove from CMake cache (if it exists)
 	execute_process(
-			COMMAND ${PYTHON_EXECUTABLE} -m pip show ${PACKAGE}
+			COMMAND ${Python3_EXECUTABLE} -m pip show ${PACKAGE}
 			RESULT_VARIABLE FAILURE
 			OUTPUT_VARIABLE PRINT_OUTPUT
 	)
@@ -306,15 +344,18 @@ macro(find_pip_package PACKAGE)
 			file(GLOB OPT_LIBRARIES "${PIP_PACKAGE_LOCATION}/${PIP_PACKAGE_NAME}/*${PIP_LIB_NAME}*.so.*")
 		endif()
 		if (OPT_LIBRARIES AND DEBUG_LIBRARIES)
-			set(${PACKAGE}_LIBRARIES optimized ${OPT_LIBRARIES} debug ${DEBUG_LIBRARIES} CACHE PATH "")
+			set(${PACKAGE}_LIBRARIES optimized ${OPT_LIBRARIES} debug ${DEBUG_LIBRARIES} CACHE PATH "Location of the ${PACKAGE} libraries")
 		elseif(OPT_LIBRARIES)
-			set(${PACKAGE}_LIBRARIES ${OPT_LIBRARIES} CACHE PATH "")
+			set(${PACKAGE}_LIBRARIES ${OPT_LIBRARIES} CACHE PATH "Location of the ${PACKAGE} optimized libraries")
 		elseif(DEBUG_LIBRARIES)
-			set(${PACKAGE}_LIBRARIES ${DEBUG_LIBRARIES} CACHE PATH "")
+			set(${PACKAGE}_LIBRARIES ${DEBUG_LIBRARIES} CACHE PATH "Location of the ${PACKAGE} debug libraries")
 		endif()
-		set(${PACKAGE}_INCLUDE_DIRS ${INCLUDE_DIR} CACHE PATH "")
-		set(${PACKAGE}_FOUND ON CACHE BOOL OFF)
+		set(${PACKAGE}_INCLUDE_DIRS ${INCLUDE_DIR} CACHE PATH "Location of the ${PACKAGE} includes")
+		set(${PACKAGE}_FOUND ON)
 		message(STATUS "Found pip-installed ${PACKAGE} in ${PIP_PACKAGE_LOCATION}/${PIP_PACKAGE_NAME}")
+		if(${PACKAGE}_INCLUDE_DIRS)
+			message(STATUS "  --> with includes in ${${PACKAGE}_INCLUDE_DIRS}")
+		endif()
 	endif()
 endmacro()
 

cMake/UseLibPack3.cmake

@@ -15,13 +15,29 @@ set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/swig.exe CACHE FILEPATH "Swig" FO
 find_package(Qt6 REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/lib/cmake NO_DEFAULT_PATH)
 message(STATUS "Found LibPack 3 Qt ${Qt6_VERSION}")
 
+if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.1.0")
+    find_package(pybind11 REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/share/cmake/pybind11 NO_DEFAULT_PATH)
+    message(STATUS "Found LibPack 3 pybind11 ${pybind11_VERSION}")
+    set(FREECAD_USE_PYBIND11 ON)
+else()
+    # We have completely removed support for boost-python and require pybind11, which requires LibPack 3.1 or later
+    message(FATAL_ERROR "FreeCAD now requires LibPack 3.1.0 or newer (you are using ${FREECAD_LIBPACK_VERSION}): please upgrade your LibPack")
+endif()
+
 find_package(XercesC REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/cmake NO_DEFAULT_PATH)
 message(STATUS "Found LibPack 3 XercesC ${XercesC_VERSION}")
 
+if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.1.1")
+    set(FREECAD_USE_EXTERNAL_E57FORMAT ON)
+    find_package(E57Format REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/lib/cmake/e57format NO_DEFAULT_PATH)
+    message(STATUS "Found LibPack 3 e57format ${e57format_VERSION}")
+endif()
+
 find_package(yaml-cpp REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/lib/cmake NO_DEFAULT_PATH)
-message(STATUS "Found LibPack 3 yaml-cpp ${XercesC_VERSION}")
+message(STATUS "Found LibPack 3 yaml-cpp ${yaml-cpp_VERSION}")
 
 find_package(Coin REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/lib/cmake NO_DEFAULT_PATH)
+
 message(STATUS "Found LibPack 3 Coin ${Coin_VERSION}")
 # For compatibility with the rest of the cMake scripts:
 set (COIN3D_FOUND TRUE)

conda/conda-env-qt6.yaml

@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.11.1
 - conda-devenv
 - mamba
 - python==3.12.*

conda/conda-env.yaml

@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.11.1
 - conda-devenv
 - mamba
 - python==3.11.*

conda/environment-qt6.devenv.yml

@@ -3,6 +3,7 @@ channels:
 - conda-forge
 - conda-forge/label/pivy_rc
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.11.1
 - libspnav                             # [linux]
 - kernel-headers_linux-64              # [linux and x86_64]
 - libdrm-cos7-x86_64                   # [linux and x86_64]
@@ -57,6 +58,7 @@ dependencies:
 - xorg-x11-server-xvfb-cos7-aarch64    # [linux and aarch64]
 - sed                                  # [unix]
 - ccache
+- clang-format
 - cmake
 - coin3d
 - compilers
@@ -90,7 +92,6 @@ dependencies:
 - python==3.12.*
 - pyyaml
 - qt6-main
-- six
 - smesh
 - swig
 - vtk==9.2.6

conda/environment.devenv.yml

@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.11.1
 - libspnav                             # [linux]
 - kernel-headers_linux-64              # [linux and x86_64]
 - libdrm-cos6-x86_64                   # [linux and x86_64]
@@ -57,6 +58,7 @@ dependencies:
 - xorg-x11-server-xvfb-cos7-aarch64    # [linux and aarch64]
 - sed                                  # [unix]
 - ccache
+- clang-format
 - cmake
 - coin3d
 - compilers
@@ -90,7 +92,6 @@ dependencies:
 - python==3.11.*
 - pyyaml
 - qt-main
-- six
 - smesh
 - swig
 - vtk==9.2.6

contrib/.vscode/launch.json

@@ -16,10 +16,30 @@
       ],
       "linux": {
         "MIMode": "gdb",
-        "miDebuggerPath": "/usr/bin/gdb"
+        "miDebuggerPath": "/usr/bin/gdb",
+        "setupCommands": [
+          {
+            "description": "Load QT pretty-printers for GDB",
+            "text": "python import sys; sys.path.append('${workspaceFolder}/contrib/debugger'); from qt_pretty_printers_gdb import register_qt_printers; register_qt_printers()",
+            "ignoreFailures": false
+          },
+          {
+            "description": "Enable pretty-printing for GDB",
+            "text": "-enable-pretty-printing",
+            "ignoreFailures": true
+          },
+          {
+            "description": "Set Disassembly Flavor to Intel",
+            "text": "-gdb-set disassembly-flavor intel",
+            "ignoreFailures": true
+          }
+        ]
       },
       "osx": {
-        "MIMode": "lldb"
+        "MIMode": "lldb",
+        "preRunCommands": [
+          "command script import ${workspaceFolder}/contrib/debugger/qt_pretty_printers_lldb.py"
+        ]
       },
       "stopAtEntry": false,
       "externalConsole": false,
@@ -47,10 +67,30 @@
       ],
       "linux": {
         "MIMode": "gdb",
-        "miDebuggerPath": "/usr/bin/gdb"
+        "miDebuggerPath": "/usr/bin/gdb",
+        "setupCommands": [
+          {
+            "description": "Load QT pretty-printers for GDB",
+            "text": "python import sys; sys.path.append('${workspaceFolder}/contrib/debugger'); from qt_pretty_printers_gdb import register_qt_printers; register_qt_printers()",
+            "ignoreFailures": false
+          },
+          {
+            "description": "Enable pretty-printing for GDB",
+            "text": "-enable-pretty-printing",
+            "ignoreFailures": true
+          },
+          {
+            "description": "Set Disassembly Flavor to Intel",
+            "text": "-gdb-set disassembly-flavor intel",
+            "ignoreFailures": true
+          }
+        ]
       },
       "osx": {
-        "MIMode": "lldb"
+        "MIMode": "lldb",
+        "preRunCommands": [
+          "command script import ${workspaceFolder}/contrib/debugger/qt_pretty_printers_lldb.py"
+        ]
       },
       "stopAtEntry": false,
       "externalConsole": false,
@@ -66,7 +106,7 @@
       "redirectOutput": true,
       "connect": {
         "host": "localhost",
-        "port": 5678
+        "port": 5679
       },
       "pathMappings": [
         {

contrib/.vscode/scripts/VSCodeAutostartDebug.FCMacro

@@ -7,7 +7,11 @@ from freecad.utils import get_python_exe
 # By default it attempts to use Freecad's PID mistaking it for python.
 # https://github.com/microsoft/debugpy/issues/262
 debugpy.configure(python=get_python_exe())
-debugpy.listen(('localhost', 5678))
+# As of Python 3.12, debugpy runs a forwarding process that listens both on the port specified here for the debugger
+# to connect to, but also on an internal port for the underlying pydevd within the python process to connect to.  The
+# default for that internal port is 5678, so we need to not duplicate it for the external port.  Also, on Linux the
+# attempt to spawn the forwarding process separately fails, so we force it to be internal to our main process.
+debugpy.listen(('localhost', 5679),in_process_debug_adapter=True)
 
 # Turns out you cannot probe debugpy to see if it is up:
 # https://github.com/microsoft/debugpy/issues/974

contrib/.vscode/scripts/WaitForDebugpy.py

@@ -13,8 +13,8 @@ def check_socket(host, port):
         return sock.connect_ex((host, port)) == 0
 
 def main():
-    # DO NOT CHECK 5678 or debugpy will break
-    # Check other port manually opened instead
+    # DO NOT CHECK the actual port 5678/5879 or debugpy will break
+    # Check that the other port 39999 used as a flag is manually opened instead
     attempt_counter = 0
     while (not check_socket('localhost', 39999)) and attempt_counter < MAX_ATTEMPTS:
         time.sleep(RETRY_DELAY_S)

contrib/clion/GetCLionDebugPort.FCMacro

@@ -0,0 +1,12 @@
+import pydevd
+from multiprocessing.connection import Listener
+
+print("CLion debugger macro running.  Starting listener to get port")
+listen = Listener(('localhost', 39998), backlog=1)
+link = listen.accept()
+port = link.recv()
+link.close()
+listen.close()
+print("Port", port, "received, starting debugger.  Check CLion to see if a breakpoint has been hit and continue")
+pydevd.settrace(port=port)
+print("Debugger operating, leaving macro.")

contrib/clion/attach_pydevd.py.patch

@@ -0,0 +1,18 @@
+--- attach_pydevd.py.orig	2024-09-26 10:36:47.131066345 -0400
++++ attach_pydevd.py	2024-09-26 10:16:48.687714133 -0400
+@@ -48,6 +48,15 @@
+     import add_code_to_python_process
+     show_debug_info_on_target_process = 0
+ 
++    print("attach_pydevd is trying to relay the port",setup['port'])
++    try:
++        from multiprocessing.connection import Client
++        link = Client(('localhost',39998))
++        link.send(setup['port'])
++        link.close()
++    except ConnectionError as ce:
++        pass
++
+     pydevd_dirname = os.path.dirname(os.path.dirname(__file__))
+ 
+     if sys.platform == 'win32':

contrib/clion/pixi/pixi-default.bash

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Change to the directory of this script (any subdirectory in the repository should work)
+cd "$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" &> /dev/null && pwd -P)"
+
+# Activate pixi default environment
+eval "$(pixi shell-hook)"

contrib/clion/pixi/pixi-default.bat

@@ -0,0 +1,10 @@
+@echo off
+REM Change to the directory of this script (any subdirectory in the repository should work)
+cd /d "%~dp0"
+
+REM Activate pixi default environment
+REM Write the output of pixi shell-hook to a temporary batch file and execute it
+set TEMP_BATCH_FILE=%TEMP%\pixi_shell_hook_freecad.bat
+pixi shell-hook > "%TEMP_BATCH_FILE%"
+call "%TEMP_BATCH_FILE%"
+del "%TEMP_BATCH_FILE%"

contrib/debugger/qt_pretty_printers_gdb.py

@@ -0,0 +1,124 @@
+# pylint: disable=line-too-long
+"""
+ QT Pretty Printer for GDB
+
+ Currently supports displaying the following QT types in the debugger
+     * QString
+
+
+ Can be used from GDB via:
+
+ (gdb) python
+ >import sys
+ >sys.path.insert(0, '{Your FreeCAD source dir}/contrib/debugger')
+ >from qt_pretty_printers_gdb import register_qt_printers
+ >register_qt_printers()
+ >end
+ QT pretty-printer script loaded.
+ QT pretty-printer registered.
+ (gdb) run
+ *breakpoint*
+ (gdb) p testString
+ $1 = This is a QString in the debugger!
+ (gdb)
+
+
+
+ Can be used in VSCode via launch.json
+
+ {
+     "version": "0.2.0",
+     "configurations": [
+         {
+             "name": "(gdb) Launch",
+             "type": "cppdbg",
+             "request": "launch",
+             "program": "${workspaceFolder}/build/bin/FreeCAD",
+             "args": [],
+             "stopAtEntry": true,
+             "cwd": "${workspaceFolder}/build",
+             "environment": [],
+             "externalConsole": false,
+             "MIMode": "gdb",
+             "setupCommands": [
+                 {
+                     "description": "Load QT pretty-printers for GDB",
+                     "text": "python import sys; sys.path.append('${workspaceFolder}/contrib/debugger'); from qt_pretty_printers_gdb import register_qt_printers; register_qt_printers()",
+                     "ignoreFailures": false
+                 },
+                 {
+                     "description": "Enable pretty-printing for gdb",
+                     "text": "-enable-pretty-printing",
+                     "ignoreFailures": true
+                 },
+                 {
+                     "description": "Set Disassembly Flavor to Intel",
+                     "text": "-gdb-set disassembly-flavor intel",
+                     "ignoreFailures": true
+                 }
+             ],
+             "miDebuggerPath": "/usr/bin/gdb"
+         }
+     ]
+ }
+
+
+ Note: There may be variances between different operating systems and/or build configurations
+       in how QString data is stored internally.  This was tested on debian12/amd64. @BootsSiR
+"""
+# pylint: enable=line-too-long
+
+import gdb
+
+class QStringPrinter:
+    """Pretty-printer class for QString objects in GDB."""
+    def __init__(self, val):
+        self.val = val
+
+    def to_string(self):
+        """Pretty-printer function for QString objects in LLDB."""
+        try:
+            d = self.val["d"]
+            if d == 0:
+                return 'null'
+
+            offset = int(d["offset"])
+            data_ptr = d.cast(gdb.lookup_type("char").pointer()) + offset
+            char16_t_ptr = data_ptr.cast(gdb.lookup_type("char16_t").pointer())
+
+            string_data = []
+            i = 0
+            while char16_t_ptr[i] != 0:
+                string_data.append(chr(char16_t_ptr[i]))
+                i += 1
+
+            return "".join(string_data)
+        except gdb.error as e:
+            if "Cannot access memory at address" in str(e):
+                return "<uninitialized>"
+            return f"<error: {str(e)}>"
+        except Exception as e: # pylint: disable=broad-except
+            return f"<unexpected error: {str(e)}>"
+
+
+def lookup_function(val):
+    """Maps a type to the appropriate pretty printer"""
+    try:
+        qstring_type = gdb.lookup_type("QString")
+        if val.type.strip_typedefs() == qstring_type:
+            return QStringPrinter(val)
+        return None
+    except gdb.error:
+        return None
+
+
+def register_qt_printers(objfile=None):
+    """Register the QString pretty-printer with GDB."""
+    if objfile is None:
+        objfile = gdb.current_objfile()
+
+    # Check if the printer is already registered
+    if not any(printer == lookup_function for printer in gdb.pretty_printers): # pylint: disable=comparison-with-callable
+        print("QT pretty-printer script loaded.")
+        gdb.pretty_printers.append(lookup_function)
+        print("QT pretty-printer registered.")

contrib/debugger/qt_pretty_printers_lldb.py

@@ -0,0 +1,107 @@
+# pylint: disable=line-too-long
+"""
+ QT Pretty Printer for LLDB
+
+ Currently supports displaying the following QT types in the debugger
+     * QString
+
+
+ Can be used from LLDB via:
+
+ (lldb) command script import {Your FreeCAD source dir}/contrib/debugger/qt_pretty_printers_lldb.py
+
+ (lldb) frame variable test
+ (QString) test = "This is a test string."
+ (lldb)
+
+
+ Can be used in VSCode via launch.json (tested with CodeLLDB extension)
+
+ {
+     "version": "0.2.0",
+     "configurations": [
+         {
+             "type": "lldb",
+             "request": "launch",
+             "name": "Debug LLDB",
+             "stopOnEntry": false,
+             "program": "${workspaceFolder}/build/bin/FreeCAD",
+             "args": [],
+             "cwd": "${workspaceFolder}/build/",
+             "preLaunchTask": "CMake: build",
+             "preRunCommands": [
+                 "command script import ${workspaceFolder}/contrib/debugger/qt_pretty_printers_lldb.py"
+             ]
+         }
+     ]
+ }
+
+
+ Note: There may be variances between different operating systems and/or build configurations
+       in how QString data is stored internally.  This was tested on debian12/amd64 and
+       macOS/arm64. @BootsSiR
+"""
+# pylint: enable=line-too-long
+
+import lldb
+
+def QStringPrinter(val, _internal_dict):
+    """Pretty-printer for QString objects in LLDB."""
+    try:
+        # Access the 'd' member of QString
+        d = val.GetChildMemberWithName("d")
+        if not d.IsValid():
+            return 'null'
+
+        # some machines have a different QString object layout (macOS? arm64?) so
+        # first we must check if a ptr member exists
+        ptr_field = d.GetChildMemberWithName("ptr")
+
+        # if the ptr member exists, we will use that as the base address for our text data.
+        if ptr_field.IsValid():
+            # use the ptr value
+            data_base_address = ptr_field.GetValueAsUnsigned()
+        else:
+            # we don't have a ptr member, so let's use an offset from the address of the
+            # QString::Data as our base address
+            d_address = d.GetValueAsUnsigned()
+
+            # Assume the string data starts immediately after the first 24 bytes
+            data_base_address = d_address + 24
+
+        # if at this point, we don't have a valid data base address
+        # we cannot proceed
+        if data_base_address == 0:
+            return "null"
+
+        # Initialize variables for memory reading
+        process = val.GetTarget().GetProcess()
+        error = lldb.SBError()
+        chunk_size = 256  # Size of each memory chunk to read
+        string_data = []
+        offset = 0
+
+        # Read memory in chunks until null-terminator is found
+        while True:
+            raw_data = process.ReadMemory(data_base_address + offset, chunk_size, error)
+            if not error.Success():
+                return f"<error: unable to read memory: {error.GetCString()}>"
+
+            # Parse UTF-16 data from the chunk
+            for i in range(0, len(raw_data), 2):  # char16_t is 2 bytes
+                char16_val = int.from_bytes(raw_data[i:i+2], byteorder='little')
+                if char16_val == 0:  # Null-terminator found
+                    return f'"{ "".join(string_data) }"'
+                string_data.append(chr(char16_val))
+
+            # Increase the offset for the next chunk
+            offset += chunk_size
+
+    except Exception as e: # pylint: disable=broad-except
+        return f"<error: {str(e)}>"
+
+def __lldb_init_module(debugger, _internal_dict):
+    """Register the QString pretty-printer with LLDB."""
+    print("QT pretty-printer script loaded.")
+    debugger.HandleCommand('type summary add QString -F qt_pretty_printers_lldb.QStringPrinter')
+    print("QT pretty-printer registered.")

data/examples/CMakeLists.txt

@@ -4,10 +4,10 @@ SET(Examples_Files
     draft_test_objects.FCStd
     EngineBlock.FCStd
     PartDesignExample.FCStd
-    RobotExample.FCStd
     BIMExample.FCStd
     FEMExample.FCStd
     AssemblyExample.FCStd
+    ArchDetail.FCStd
 )
 
 ADD_CUSTOM_TARGET(Example_data ALL