PartDesign: fix the range of the custom clearance of threads (#26296)

* PartDesign: fix the range of the custom clearance of threads

* PartDesign: hole ensure diameter is on the correct range

(cherry picked from commit c8efc26982)

.github/workflows/CI_master.yml

@@ -26,14 +26,21 @@
 
 name: FreeCAD master CI
 
-on: [workflow_dispatch, push, pull_request, merge_group]
+on:
+  workflow_dispatch: ~
+  push:
+    branches:
+      - main
+      - releases/**
+  pull_request: ~
+  merge_group: ~
+
 
 concurrency:
   group: FC-CI-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-
   Prepare:
     uses: ./.github/workflows/sub_prepare.yml
     with:
@@ -45,20 +52,23 @@ jobs:
     with:
       artifactBasename: Pixi-${{ github.run_id }}
 
-  Ubuntu:
-    needs: [Prepare]
-    uses: ./.github/workflows/sub_buildUbuntu.yml
-    with:
-      artifactBasename: Ubuntu-${{ github.run_id }}
+#  Ubuntu:
+#    needs: [Prepare]
+#    if: "!startsWith(github.head_ref, 'refs/heads/backport-')"
+#    uses: ./.github/workflows/sub_buildUbuntu.yml
+#    with:
+#      artifactBasename: Ubuntu-${{ github.run_id }}
 
   Windows:
     needs: [Prepare]
+    if: "!startsWith(github.head_ref, 'refs/heads/backport-')"
     uses: ./.github/workflows/sub_buildWindows.yml
     with:
       artifactBasename: Windows-${{ github.run_id }}
 
   Lint:
     needs: [Prepare]
+    if: "!startsWith(github.head_ref, 'refs/heads/backport-')"
     uses: ./.github/workflows/sub_lint.yml
     with:
       artifactBasename: Lint-${{ github.run_id }}
@@ -73,7 +83,6 @@ jobs:
     needs: [
         Prepare,
         Pixi,
-        Ubuntu,
         Windows,
         Lint
       ]

.github/workflows/backport.yml

@@ -29,12 +29,14 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          token: ${{ secrets.GH_TOKEN_FOR_CI_RUNNERS }}
 
       - name: Create backport pull requests
         uses: korthout/backport-action@d07416681cab29bf2661702f925f020aaa962997 # v3.4.1
         with:
           # Inputs documented here: https://github.com/korthout/backport-action?tab=readme-ov-file#inputs
-          github_token: ${{ github.token }}
+          github_token: ${{ secrets.GH_TOKEN_FOR_CI_RUNNERS }}
           github_workspace: ${{ github.workspace }}
 
           # permit PRs with merge commits to be backported

.github/workflows/build_release.yml

@@ -1,5 +1,7 @@
-name: Weekly Build
+name: Build Release
 on:
+  release:
+    types: [created]
   schedule:
    - cron: "0 0 * * 3"
   workflow_dispatch:
@@ -8,10 +10,10 @@ permissions:
   contents: write
 
 jobs:
-  tag_build:
+  upload_src:
     runs-on: ubuntu-latest
     outputs:
-      build_tag: ${{ steps.tag_build.outputs.build_tag }}
+      build_tag: ${{ steps.get_tag.outputs.build_tag }}
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
@@ -21,20 +23,25 @@ jobs:
       - name: Checkout Source
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          ref: ${{ github.sha }}
           fetch-depth: 2
           fetch-tags: true
           submodules: 'recursive'
 
-      - name: Tag Build
-        id: tag_build
+      - name: get tag and create release if weekly
+        id: get_tag
         shell: bash -l {0}
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          export BUILD_TAG=weekly-$(date "+%Y.%m.%d")
+          if [ "${{ github.event_name }}" = "release" ]; then
+            export BUILD_TAG="${{ github.event.release.tag_name }}"
+          else
+            export BUILD_TAG=weekly-$(date "+%Y.%m.%d")
+            gh release create ${BUILD_TAG} --title "Development Build ${BUILD_TAG}" -F .github/workflows/weekly-build-notes.md --prerelease || true
+          fi
           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
@@ -42,10 +49,10 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          python3 package/rattler-build/scripts/make_version_file.py ../freecad_version.txt
+          python3 package/scripts/write_version_info.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 apply package/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 \
@@ -57,13 +64,13 @@ jobs:
           gh release upload --clobber ${BUILD_TAG} "freecad_source_${BUILD_TAG}.tar.gz" "freecad_source_${BUILD_TAG}.tar.gz-SHA256.txt"
 
   build:
-    needs: tag_build
+    needs: upload_src
     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-64, os: macos-15-intel }
           - { target: osx-arm64, os: macos-latest }
           - { target: win-64, os: windows-latest }
       fail-fast: false
@@ -88,10 +95,8 @@ jobs:
       - 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"
@@ -100,6 +105,7 @@ jobs:
       - name: Checkout Source
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          ref: ${{ github.sha }}
           fetch-depth: 2
           fetch-tags: true
           submodules: 'recursive'
@@ -110,6 +116,7 @@ jobs:
           cache: false
 
       - name: Install the Apple certificate and provisioning profile
+        id: get_cert
         if: runner.os == 'macOS'
         env:
           APP_SPECIFIC_PASSWORD: ${{ secrets.APP_SPECIFIC_PASSWORD }}
@@ -120,9 +127,15 @@ jobs:
           KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
           P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
         run: |
+          if [ -z "$BUILD_CERTIFICATE_BASE64" ]; then
+            echo "has_cert=false" >> $GITHUB_OUTPUT
+            echo "No certificate avalable... skipping" && exit 0
+          else
+            echo "has_cert=true" >> $GITHUB_OUTPUT
+          fi
           # create variables
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          PP_PATH=$RUNNER_TEMP/FreeCAD_Weekly.provisionprofile
+          PP_PATH=$RUNNER_TEMP/FreeCAD_bundle.provisionprofile
           KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
 
           export KEYCHAIN_PASSWORD=$(openssl rand -base64 8)
@@ -152,12 +165,13 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-          SIGN_RELEASE: "true"
+          SIGN_RELEASE: ${{ steps.get_cert.outputs.has_cert }}
           TARGET_PLATFORM: ${{ matrix.target }}
+          MAKE_INSTALLER: "true"
           UPLOAD_RELEASE: "true"
+          BUILD_TAG: ${{ needs.upload_src.outputs.build_tag }}
         run: |
-          python3 package/rattler-build/scripts/make_version_file.py ../freecad_version.txt
-          git apply package/rattler-build/scripts/disable_git_info.patch
+          python3 package/scripts/write_version_info.py ../freecad_version.txt
           cd package/rattler-build
           pixi install
           pixi run -e package create_bundle

.github/workflows/fedora-daily.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   trigger-copr-build:
+    environment: fedora-daily
     env:
       copr_token: ${{ secrets.COPR_TOKEN }}
     runs-on: ubuntu-latest

.packit.yaml

@@ -3,7 +3,7 @@ files_to_sync:
     - .packit.yaml
 actions:
   post-upstream-clone:
-    - bash -c 'BUILD_TAG=dev /usr/bin/python3 package/rattler-build/scripts/make_version_file.py freecad_version.txt'
+    - bash -c '/usr/bin/python3 package/scripts/write_version_info.py freecad_version.txt'
     - rm -f freecad-sources.tar.gz
   changelog-entry:
     - bash -c 'git log --no-merges --pretty="format:- %s (%an)" $(git describe --tags --abbrev=0 )..HEAD -- |sed 's/%/%%/g''

.pylintrc

@@ -82,15 +82,11 @@ persistent=yes
 
 # Minimum Python version to use for version dependent checks. Will default to
 # the version used to run pylint.
-py-version=3.8
+py-version=3.10
 
 # Discover python modules and packages in the file system subtree.
 recursive=no
 
-# When enabled, pylint would attempt to guess common misconfiguration and emit
-# user-friendly hints instead of false-positive error messages.
-suggestion-mode=yes
-
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no

CMakeLists.txt

@@ -53,8 +53,9 @@ project(FreeCAD)
 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_VERSION_SUFFIX "rc3") # 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)
+string(TIMESTAMP PACKAGE_COPYRIGHT_YEAR "%Y")
 
 set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
 set(PACKAGE_STRING "${PROJECT_NAME} ${PACKAGE_VERSION}")

CMakePresets.json

@@ -71,10 +71,6 @@
             "type": "BOOL",
             "value": "ON"
           },
-          "BUILD_REVERSEENGINEERING": {
-            "type": "BOOL",
-            "value": "OFF"
-          },
           "ENABLE_DEVELOPER_TESTS": {
             "type": "BOOL",
             "value": "ON"

cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake

@@ -103,20 +103,33 @@ macro(SetupSalomeSMESH)
                     set(HDF5_VARIANT "hdf5-serial")
                 else()
                     message(STATUS "We guess that libmed was built using hdf5-openmpi version")
-                    set(HDF5_VARIANT "hdf5-openmpi")
+                    set(HDF5_VARIANT "hdf5-openmpi;hdf5_openmpi")
                     set(HDF5_PREFER_PARALLEL TRUE) # if pkg-config fails, find_package(HDF5) needs this
                 endif()
-                pkg_search_module(HDF5 ${HDF5_VARIANT})
-                if(NOT HDF5_FOUND)
+                pkg_search_module(PCHDF5 ${HDF5_VARIANT})
+                if(NOT PCHDF5_FOUND)
                     find_package(HDF5 REQUIRED)
                 else()
-                    add_compile_options(${HDF5_CFLAGS})
-                    link_directories(${HDF5_LIBRARY_DIRS})
-                    link_libraries(${HDF5_LIBRARIES})
-                endif()
-                check_include_file_cxx(hdf5.h HDF5_FOUND)
-                if(NOT HDF5_FOUND)
-                    message( FATAL_ERROR "hdf5.h was not found.")
+                    add_compile_options(${PCHDF5_CFLAGS})
+                    link_directories(${PCHDF5_LIBRARY_DIRS})
+                    link_libraries(${PCHDF5_LIBRARIES})
+
+                    # workaround to define include dir from PCHDF5_CFLAGS (pkg-config PCHDF5_INCLUDEDIR is only filled since hdf5 1.14.6)
+                    set(hdf5_include_path "")
+                    foreach(flag IN LISTS PCHDF5_CFLAGS)
+                        if(flag MATCHES "^-I")
+                            string(REGEX REPLACE "^-I[ ]*" "" flag "${flag}")
+                            list(APPEND hdf5_include_path "${flag}")
+                        endif()
+                    endforeach()
+
+                    set(_save_INC CMAKE_REQUIRED_INCLUDES)
+                    set(CMAKE_REQUIRED_INCLUDES ${hdf5_include_path})
+                    check_include_file_cxx(hdf5.h HDF5_HEAD_FOUND)
+                    set(CMAKE_REQUIRED_INCLUDES ${_save_INC})
+                    if(NOT HDF5_HEAD_FOUND)
+                        message( FATAL_ERROR "hdf5.h was not found (tested pkg-config ${HDF5_VARIANT}, suggested header location was '${hdf5_include_path}').")
+                    endif()
                 endif()
 
                 # Med Fichier can require MPI

cMake/FreeCAD_Helpers/SetupSwig.cmake

@@ -1,12 +1,160 @@
 macro(SetupSwig)
-# -------------------------------- Swig ----------------------------------
 
-    find_package(SWIG)
+#-------------------------------- Swig ----------------------------------
 
-    if (NOT SWIG_FOUND)
-        message("=====================================================\n"
-                "SWIG not found, will not build SWIG binding for pivy.\n"
-                "=====================================================\n")
-    endif(NOT SWIG_FOUND)
+# force cmake to re-search for SWIG when CMAKE_PREFIX_PATH changes
+unset(SWIG_EXECUTABLE CACHE)
+unset(SWIG_DIR CACHE)
+unset(SWIG_VERSION CACHE)
+unset(SWIG_FOUND CACHE)
 
-endmacro(SetupSwig)
+if(BUILD_SKETCHER)
+    # SWIG is required for sketcher WB (use QUIET to provide custom error message)
+    find_package(SWIG QUIET)
+
+    if(NOT SWIG_FOUND)
+        message(FATAL_ERROR
+                "-----------------------------------------------------\n"
+                "SWIG not found, swig & pivy required for sketcher WB.\n"
+                "-----------------------------------------------------\n")
+        # do not continue with check if swig not found
+        return()
+    endif()
+
+    # check swig/pivy runtime compatibility
+    message(STATUS "checking SWIG/Pivy runtime compatibility...")
+
+    # get SWIG's runtime version using -external-runtime flag
+    execute_process(
+        COMMAND ${SWIG_EXECUTABLE} -python -external-runtime "${CMAKE_BINARY_DIR}/swig_runtime_check.h"
+        RESULT_VARIABLE SWIG_EXTERNAL_RUNTIME_RESULT
+        ERROR_VARIABLE SWIG_EXTERNAL_RUNTIME_ERROR
+        ERROR_QUIET
+    )
+    # NOTE: only print the below output if using `cmake --log-level=DEBUG`
+    message(DEBUG "SWIG external-runtime result: ${SWIG_EXTERNAL_RUNTIME_RESULT}")
+    message(DEBUG "SWIG external-runtime error: ${SWIG_EXTERNAL_RUNTIME_ERROR}")
+
+    message(STATUS "Looking for: ${CMAKE_BINARY_DIR}/swig_runtime_check.h")
+    if(EXISTS "${CMAKE_BINARY_DIR}/swig_runtime_check.h")
+        message(STATUS "File exists: YES")
+    else()
+        message(STATUS "File exists: NO")
+    endif()
+
+    if(EXISTS "${CMAKE_BINARY_DIR}/swig_runtime_check.h")
+        file(STRINGS "${CMAKE_BINARY_DIR}/swig_runtime_check.h"
+            SWIG_RUNTIME_VERSION_LINE
+            REGEX "^#define SWIG_RUNTIME_VERSION")
+
+        message(STATUS "SWIG_RUNTIME_VERSION_LINE: ${SWIG_RUNTIME_VERSION_LINE}")
+
+        if(SWIG_RUNTIME_VERSION_LINE)
+            # extract the version number (it's in quotes: "5")
+            string(REGEX MATCH "\"([0-9]+)\"" _ "${SWIG_RUNTIME_VERSION_LINE}")
+            set(SWIG_RUNTIME_VERSION "${CMAKE_MATCH_1}")
+            message(STATUS "Extracted SWIG_RUNTIME_VERSION: ${SWIG_RUNTIME_VERSION}")
+        endif()
+
+        file(REMOVE "${CMAKE_BINARY_DIR}/swig_runtime_check.h")
+    else()
+        message(STATUS "swig_runtime_check.h not found!")
+    endif()
+
+    # extract pivy's SWIG runtime version from the compiled module
+    # NOTE: python code can not be indented
+    set(PYTHON_CHECK_PIVY_RUNTIME [=[
+import sys
+import os
+import re
+
+try:
+    import pivy
+    pivy_dir = os.path.dirname(pivy.__file__)
+    print(f'DEBUG:pivy_dir={pivy_dir}', file=sys.stderr)
+    print(f'DEBUG:files={os.listdir(pivy_dir)}', file=sys.stderr)
+
+    pivy_path = None
+
+    # Look for _coin module with any extension (.so on Unix, .pyd on Windows)
+    for f in os.listdir(pivy_dir):
+        print(f'DEBUG:checking={f}', file=sys.stderr)
+        if f.startswith('_coin') and (f.endswith('.so') or f.endswith('.pyd')):
+            pivy_path = os.path.join(pivy_dir, f)
+            break
+
+    print(f'DEBUG:pivy_path={pivy_path}', file=sys.stderr)
+
+    if pivy_path and os.path.exists(pivy_path):
+        with open(pivy_path, 'rb') as f:
+            content = f.read().decode('latin-1', errors='ignore')
+
+        print(f'DEBUG:content_len={len(content)}', file=sys.stderr)
+
+        # Use regex to find swig_runtime_data followed by a number
+        match = re.search(r'swig_runtime_data(\d+)', content)
+        print(f'DEBUG:match={match}', file=sys.stderr)
+        if match:
+            print(match.group(1))
+
+except ImportError as e:
+    print(f'DEBUG:import_error={e}', file=sys.stderr)
+    print('ERROR_IMPORT')
+except Exception as e:
+    print(f'DEBUG:exception={e}', file=sys.stderr)
+]=])
+
+execute_process(
+    COMMAND ${Python3_EXECUTABLE} -c "${PYTHON_CHECK_PIVY_RUNTIME}"
+    OUTPUT_VARIABLE PIVY_RUNTIME_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_VARIABLE PIVY_DEBUG_OUTPUT
+    TIMEOUT 10
+)
+
+message(DEBUG "Pivy debug output: ${PIVY_DEBUG_OUTPUT}")
+
+    # Handle errors and compare versions
+    if(PIVY_RUNTIME_VERSION STREQUAL "ERROR_IMPORT")
+        message(WARNING
+            "Could not import pivy to check SWIG compatibility.\n"
+            "Proceeding without SWIG version check."
+        )
+    elseif(SWIG_RUNTIME_VERSION AND PIVY_RUNTIME_VERSION)
+        if(NOT SWIG_RUNTIME_VERSION STREQUAL PIVY_RUNTIME_VERSION)
+            message(FATAL_ERROR
+" --------------------------------------------------------
+ 
+ SWIG / PIVY RUNTIME VERSION MISMATCH DETECTED!
+ 
+ SWIG runtime API version: ${SWIG_RUNTIME_VERSION}
+ Pivy runtime API version: ${PIVY_RUNTIME_VERSION}
+  
+ These must match for compatibility.
+ This will cause runtime errors: 'No SWIG wrapped library loaded'
+  
+ swig v4.4.x is not compatible with pivy built with swig <=4.3.x
+  
+ FIX: Install a SWIG version that uses runtime ${PIVY_RUNTIME_VERSION}
+ or rebuild Pivy with your current SWIG ${SWIG_VERSION}.
+ 
+--------------------------------------------------------"
+            )
+        else()
+            message(STATUS "SWIG/Pivy runtime compatibility: PASSED")
+            message(STATUS "swig runtime API version: ${SWIG_RUNTIME_VERSION}")
+            message(STATUS "pivy runtime API version: ${PIVY_RUNTIME_VERSION}")
+            message(STATUS "swig binary version building freecad: ${SWIG_VERSION}")
+        endif()
+    else()
+        if(NOT SWIG_RUNTIME_VERSION)
+            message(WARNING "Could not determine SWIG runtime version")
+        endif()
+        if(NOT PIVY_RUNTIME_VERSION)
+            message(WARNING "Could not determine Pivy runtime version")
+        endif()
+        message(WARNING "Proceeding without SWIG/Pivy compatibility check.")
+    endif()
+endif()
+
+endmacro()

package/WindowsInstaller/.gitignore

@@ -0,0 +1,5 @@
+*.exe
+*-SHA256.txt
+MSVCRedist
+FreeCAD
+version.nsh

package/WindowsInstaller/Delete.bat

@@ -0,0 +1,47 @@
+del /S *_d.*
+del /S *_debug.*
+del /S *.pyc
+del /S *.pdb
+del /S boost*-gd-*.dll
+cd bin
+del assistant.exe
+del Coin4d.dll
+del designer.exe
+del freetyped.dll
+del libcrypto-3d.dll
+del libEGLd.dll
+del libGLESv2d.dll
+del libssl-3d.dll
+del linguist.exe
+del qdoc.exe
+del Qt6Concurrentd.dll
+del Qt6Cored.dll
+del Qt6DBusd.dll
+del Qt6DesignerComponentsd.dll
+del Qt6Designerd.dll
+del Qt6Guid.dll
+del Qt6Helpd.dll
+del Qt6LabsAnimationd.dll
+del Qt6LabsFolderListModeld.dll
+del Qt6LabsPlatformd.dll
+del Qt6LabsSettingsd.dll
+del Qt6LabsSharedImaged.dll
+del Qt6LabsWavefrontMeshd.dll
+del Qt6MultimediaWidgetsd.dll
+del Qt6Multimediad.dll
+del Qt6Networkd.dll
+del Qt6OpenGLWidgetsd.dll
+del Qt6OpenGLd.dll
+del Qt6PrintSupportd.dll
+del Qt6SpatialAudiod.dll
+del Qt6Sqld.dll
+del Qt6SvgWidgetsd.dll
+del Qt6Svgd.dll
+del Qt6Testd.dll
+del Qt6UiToolsd.dll
+del Qt6Widgetsd.dll
+del Qt6Xmld.dll
+del QtWebEngineProcessd.exe
+del Quarter1d.dll
+del xerces-c_3_2D.dll
+del zlibd.dll

package/WindowsInstaller/License.rtf

@@ -5,7 +5,7 @@
 \pard\nowidctlpar\hyphpar0\sa140\sl276\slmult1\par
 \pard\nowidctlpar\hyphpar0\sl276\slmult1\b\fs28 Third-party libraries licenses\b0\fs24\par
 \pard\nowidctlpar\hyphpar0\sa140\sl276\slmult1\par
-\pard\nowidctlpar\hyphpar0\sl276\slmult1\fs18 The different libraries used in FreeCAD and their respective licenses are described on the\line\fs24{\field{\*\fldinst{HYPERLINK "https://www.freecadweb.org/wiki/Third_Party_Libraries" }}{\fldrslt{\cf2\ul\fs18 Third Party Libraries wiki page}}}\cf0\ulnone\f0\fs18 .\fs24\par
+\pard\nowidctlpar\hyphpar0\sl276\slmult1\fs18 The different libraries used in FreeCAD and their respective licenses are described on the\line\fs24{\field{\*\fldinst{HYPERLINK "https://www.freecad.org/wiki/Third_Party_Libraries" }}{\fldrslt{\cf2\ul\fs18 Third Party Libraries wiki page}}}\cf0\ulnone\f0\fs18 .\fs24\par
 \par
 \pard\noline\nowidctlpar\hyphpar0\sa283\fs12\par
 \pard\nowidctlpar\hyphpar0\sl276\slmult1\b\fs18 GNU LIBRARY GENERAL PUBLIC LICENSE\b0\fs24\par
@@ -81,4 +81,5 @@
 \pard\nowidctlpar\hyphpar0\sb240\sa180\sl276\slmult1\b\fs24 3D Mouse Support\b0\par
 \pard\nowidctlpar\hyphpar0\sb180\sa180\sl276\slmult1\fs18 Development tools and related technology provided under license from 3Dconnexion.(c) 1992 - 2012 3Dconnexion. All rights reserved\fs12\par
 }
-
+
+

package/WindowsInstaller/README.md

@@ -1,7 +1,7 @@
 # Creating a Windows installer for FreeCAD
 
 These are instructions for building an NSIS-based installer for FreeCAD. They were designed for FreeCAD 0.21 and later,
-and presume that you have cloned a copy of FreeCAD's source code, and therefore have the directory *src/WindowsInstaller*.
+and presume that you have cloned a copy of FreeCAD's source code, and therefore have the directory *package/WindowsInstaller*.
 
 ## Install NSIS
 To set up your system for building an NSIS installer:
@@ -15,16 +15,13 @@ To set up your system for building an NSIS installer:
 4. Download and install the nsProcess plugin from https://nsis.sourceforge.io/NsProcess_plugin -- you will need the version that supports Unicode, so make sure to follow the appropriate instructions on their site to install that one (as of this writing it involves manually copying and renaming the plugin DLL file).
 
 ## Build the installer
-Next, update the installer settings for the current version of FreeCAD. Starting from the *src/WindowsInstaller* folder in the FreeCAD source tree:
-1. Set the appropriate version strings for the release you are creating. These are used to construct the filename of the installer, among other things. If you have to upload a new version of the installer for the exact same release of FreeCAD, increment `APP_VERSION BUILD` as needed.
-```
-!define APP_VERSION_MAJOR 0
-!define APP_VERSION_MINOR 21
-!define APP_VERSION_REVISION 0
+Next, update the installer settings for the current version of FreeCAD. Starting from the *package/WindowsInstaller* folder in the FreeCAD source tree:
+1. Set the appropriate version strings for the release you are creating. These are used to construct the filename of the installer, among other things. If you have to upload a new version of the installer for the exact same release of FreeCAD, increment `APP_VERSION BUILD` as needed. The main version numbers are dynamically obtained by calling `freecadcmd.exe`.
+```nsis
 !define APP_VERSION_EMERGENCY "RC1"
 !define APP_VERSION_BUILD 1
 ```
-2. Within the folder *src/WindowsInstaller*, create a new folder called MSVCRedist and copy the following files from your MSVC installation into it:
+2. If the installer will be made from a LibPack build create a new folder called MSVCRedist within the folder *package/WindowsInstaller* and copy the following files from your MSVC installation into it:
 ```
 vcruntime140.dll
 concrt140.dll
@@ -33,28 +30,38 @@ vcamp140.dll
 vccorlib140.dll
 vcomp140.dll
 ```
-3. Open the file *Settings.nsh* with a text editor (both jEdit and Visual Studio Code are good editors for NSIS files). Edit the following paths to correspond to your system: `FILES_FREECAD` corresponds to your installation directory (e.g. `CMAKE_INSTALL_PREFIX` if you self-compiled) and `FILES_DEPS` is the folder you created with the MSVC redistributable files in it.
-```
-!define FILES_FREECAD "C:\FreeCAD\Installer\FreeCAD"
-!define FILES_DEPS "C:\FreeCAD\Installer\MSVCRedist"
+3. If required open the file *Settings.nsh* with a text editor (both jEdit and Visual Studio Code are good editors for NSIS files). Edit the following paths to correspond to your system: `FILES_FREECAD` corresponds to your installation directory (e.g. `CMAKE_INSTALL_PREFIX` if you self-compiled), `FILES_THUMBS` is the directory where the thumbnailer dll is located and `FILES_DEPS` is the folder you created with the MSVC redistributable files in it. `FILES_DEPS` is not needed if the installer is created from a conda bundle so it is not set by default. These can be set via /D argument for `makensis.exe` or by editing *Settings.nsh*.
+```nsis
+!ifndef FILES_FREECAD
+    !define FILES_FREECAD "${__FILEDIR__}\FreeCAD"
+!endif
+!ifndef FILES_THUMBS
+    !define FILES_THUMBS "${__FILEDIR__}\thumbnail"
+!endif
+
+#!define FILES_DEPS "${__FILEDIR__}\MSVC_Redist"
 ```
 4. Ensure the FreeCAD files are in place. Here you have two options:
    * If you are working from an already-compiled version of FreeCAD provided to you by an outside source: in this case, simply ensure that `FILES_FREECAD` is set to the directory containing those files.
    * If you compiled FreeCAD on your own as described [here](https://wiki.freecad.org/Compile_on_Windows) (and using the Install option outlined there). Then:
-       * Open the file *Settings.nsh* as described in step 3. above and set there</br>
-        `!define FILES_FREECAD` to the folder you specified as `CMAKE_INSTALL_PREFIX`
-       * Copy into that folder the file *Delete.bat* that is part of the installer
+       * Copy into the installation folder the file *Delete.bat* that is part of the installer
        * open a command line in Windows and change to the folder
-       * run the comamand</br>
+       * run the command</br>
         `Delete.bat`
        * (These steps assure that the installer only contains files users need. Moreover it assures that the
        overall files size is below 2 GB and we can use the most compact compression for the installer.)
 5. Right-click on the file *FreeCAD-installer.nsi* and choose **Compile NSIS script**
-   to compile the installer.
+   to compile the installer. You can also run from command line to specify some settings
+```cmd
+%your_nsis_path%\makensis.exe /D'FILES_FREECAD="D:\some\path\FreeCAD"' /D'FILES_DEPS="${__FILEDIR__}\MSVC_Redist" /D'ExeFile="my-FreeCAD-installer.exe"' FreeCAD-installer.nsi
+```
 
 
-NOTE: For test builds of the installer you can turn off the compression. This speeds up
+NOTE: For test builds of the installer you can turn off compression. This speeds up
 the build time for the installer a lot but increases its file size. The compression
-is turned off by uncommenting the line</br>
+is turned off by commenting the line</br>
 `SetCompressor /SOLID lzma`</br>
-in the file *Settings.nsh*.
+in the file *Settings.nsh* or by defining `FC_TEST_BUILD` in command line
+```cmd
+%your_nsis_path%\makensis.exe [OPTIONS] /DFC_TEST_BUILD FreeCAD-installer.nsi
+```

package/WindowsInstaller/Settings.nsh

@@ -0,0 +1,58 @@
+/*
+
+Settings for FreeCAD installer
+
+These typically need to be modified for each FreeCAD release
+
+*/
+
+# Make the installer as small as possible
+# Using /SOLID is usually better for file size but it can't be used if the original size is
+# more than 2GB, if building with /SOLID fails try disabling it
+# comment this or use /DFC_TEST_BUILD command line option for testing builds since it will reduce
+# the time to create an installer a lot at the cost of a much greater file size.
+# So assure it is active for release builds!
+!ifndef FC_TEST_BUILD
+    SetCompressor /SOLID lzma
+!endif
+
+#--------------------------------
+# File locations
+# !!! you may need to adjust them to the folders in your Windows system !!!
+# can be specified with /D command line argument to makensis.exe
+!ifndef FILES_FREECAD
+    !define FILES_FREECAD "${__FILEDIR__}\FreeCAD"
+!endif
+!ifndef FILES_THUMBS
+    !define FILES_THUMBS "${__FILEDIR__}\thumbnail"
+!endif
+
+# msvc redistributables location is required for LibPack builds but not conda
+# when using a LibPack build set the redistributables directory location here
+# or with /D command line argument to makensis.exe
+#!define FILES_DEPS "${__FILEDIR__}\MSVCRedist"
+
+#--------------------------------
+# get version info from freecadcmd
+!system "${FILES_FREECAD}\bin\freecadcmd.exe --safe-mode $\"${__FILEDIR__}\write_version_nsh.py$\"" = 0
+!include "${__FILEDIR__}\version.nsh"
+!delfile "${__FILEDIR__}\version.nsh"
+
+!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of FreeCAD otherwise ""
+	# alternatively you can use APP_VERSION_EMERGENCY for a custom suffix of the version number
+!define APP_EMERGENCY_DOT "" # use "." for an emergency release of FreeCAD otherwise ""
+!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version
+
+!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
+
+#--------------------------------
+# Installer file name
+# Typical names for the release are "FreeCAD-020-Installer-1.exe" etc.
+
+!ifndef ExeFile
+    !define ExeFile "${APP_NAME}_${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}${APP_VERSION_EMERGENCY}-Windows-x86_64-installer-${APP_VERSION_BUILD}.exe"
+!endif
+
+#--------------------------------
+# installer bit type - FreeCAD is only provided as 64bit build
+!define MULTIUSER_USE_PROGRAMFILES64

package/WindowsInstaller/Signing.bat

@@ -1 +1,2 @@
 signtool.exe sign /f FCweborg.pfx /p FreeCADIsCool /fd sha512 /tr http://timestamp.digicert.com /td sha512 /v %1
+certutil -hashfile %1 SHA256 > %1-SHA256.txt

package/WindowsInstaller/include/declarations.nsh

@@ -13,13 +13,13 @@ Configuration and variables of FreeCAD installer
 # Names and version
 
 !define APP_NAME "FreeCAD"
-!define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}"
+!define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}.${APP_VERSION_BUILD}"
 # For the proposed install folder we use the scheme "FreeCAD 0.18" 
 # however for the Registry, we need the scheme "FreeCAD 0.18.x" in order
 # to check if it is exactly this version (to support side-by-side installations)
 !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
-!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}"
-!define APP_SERIES_KEY2 "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
+!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_PATCH}${APP_VERSION_EMERGENCY}"
+!define APP_SERIES_KEY2 "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
 !define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe"
 !define APP_DIR "${APP_NAME} ${APP_SERIES_NAME}"
 # Fixme: FC should use different preferences folder for every release
@@ -60,7 +60,7 @@ Configuration and variables of FreeCAD installer
 
 !define SETUP_ICON "icons\FreeCAD.ico"
 !define SETUP_HEADERIMAGE "graphics\header.bmp"
-!define SETUP_WIZARDIMAGE "graphics\orange.bmp"
+!define SETUP_WIZARDIMAGE "graphics\banner.bmp"
 !define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe"
 !define SETUP_UNINSTALLER_KEY "${APP_NAME}${APP_SERIES_KEY}"
 

package/WindowsInstaller/include/gui.nsh

@@ -92,7 +92,7 @@ BrandingText " "
 
 VIProductVersion "${APP_VERSION_NUMBER}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${APP_DIR}.${APP_VERSION_REVISION}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${APP_DIR}.${APP_VERSION_PATCH}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${APP_INFO}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "${APP_COPYRIGHT}"

package/WindowsInstaller/include/init.nsh

@@ -50,7 +50,7 @@ Function PostMultiUserPageInit
 
   # check if there is an existing FreeCAD installation of the same FreeCAD series
   # we usually don't release more than 10 versions so with 20 we are safe to check if a newer version is installed
-  IntOp $4 ${APP_VERSION_REVISION} + 20
+  IntOp $4 ${APP_VERSION_PATCH} + 20
   ${for} $5 0 $4
    ReadRegStr $0 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5" "DisplayVersion"
    # also check for an emergency release
@@ -110,7 +110,8 @@ Function .onInit
   ${orif} $R0 == "5.1" # XP
   ${orif} $R0 == "5.2" # 2003
   ${orif} $R0 == "6.0" # Vista
-    MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows 7 or newer." /SD IDOK
+  ${orif} $R0 == "6.1" # 7
+    MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows 8 or newer." /SD IDOK
     Quit
   ${endif}
   
@@ -130,7 +131,7 @@ Function .onInit
   # plugin must be unloaded
   ${nsProcess::Unload}
   
-  # initialize the multi-uder installer UI
+  # initialize the multi-user installer UI
   !insertmacro MULTIUSER_INIT
 
   # this can be reset to "true" in section SecDesktop

package/WindowsInstaller/include/utils.nsh

@@ -18,8 +18,8 @@
  # and returns the number of the character in the FindStr where the SearchStr was found (Pointer)
  # if nothing was found or the search is impossible the Pointer is set to -1
  
- StrLen $R2 ${SearchStr}
- StrLen $R4 ${FindStr}
+ StrLen $R2 "${SearchStr}"
+ StrLen $R4 "${FindStr}"
  StrCpy $R5 0
  ${if} $R2 == 0
  ${orif} $R4 == 0
@@ -27,8 +27,8 @@
  ${endif}
  IntCmp $R4 $R2 loopA NotFound
  loopA:
-  StrCpy $R3 ${FindStr} $R2 $R5
-  StrCmp $R3 ${SearchStr} Found
+  StrCpy $R3 "${FindStr}" $R2 $R5
+  StrCmp $R3 "${SearchStr}" Found
   IntOp $R5 $R5 + 1
   IntCmp $R4 $R5 loopA NotFound
   Goto loopA

package/WindowsInstaller/lang/english.nsh

@@ -7,7 +7,7 @@ Language: English
 
 ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)"
 
-${LangFileString} TEXT_WELCOME "This wizard will guide you through the installation of $(^NameDA), $\r$\n\
+${LangFileString} TEXT_WELCOME "This wizard will guide you through the installation of $(^NameDA). $\r$\n\
 				$\r$\n\
 				$_CLICK"
 
@@ -64,7 +64,8 @@ ${LangFileString} SecUnPreferencesDescription 'Deletes FreeCAD$\'s configuration
 						$AppSuff\$\r$\n\
 						${APP_DIR_USERDATA}$\")$\r$\n\
 						for you or for all users (if you are admin).'
-${LangFileString} DialogUnPreferences 'You chose to delete the FreeCADs user configuration.$\r$\n\
-						This will also delete all installed FreeCAD addons.$\r$\n\
-						Do you agree with this?'
+${LangFileString} DialogUnPreferences 'You chose to delete the FreeCAD user configuration.$\r$\n\
+						This will also delete all installed FreeCAD addons, and will affect the$\r$\n\
+						preferences for all versions of FreeCAD.$\r$\n\
+						Are you sure you want to proceed?'
 ${LangFileString} SecUnProgramFilesDescription "Uninstall FreeCAD and all of its components."

package/WindowsInstaller/setup/install.nsh

@@ -8,14 +8,15 @@ Installation of program files, dictionaries and external components
 
 #--------------------------------
 # Program files
+!include LogicLib.nsh
 
 Section -ProgramFiles SecProgramFiles
 
   # if the $INSTDIR does not contain "FreeCAD" we must add a subfolder to avoid that FreeCAD will e.g.
   # be installed directly to C:\programs - the uninstaller will then delete the whole
   # C:\programs directory
-  StrCpy $String $INSTDIR
-  StrCpy $Search ${APP_NAME}
+  StrCpy $String "$INSTDIR"
+  StrCpy $Search "${APP_NAME}"
   Call StrPoint # function from Utils.nsh
   ${if} $Pointer == "-1"
    StrCpy $INSTDIR "$INSTDIR\${APP_DIR}"
@@ -38,8 +39,11 @@ Section -ProgramFiles SecProgramFiles
   File /r "${FILES_FREECAD}\bin\*.*"
   
   # MSVC redistributable DLLs
-  SetOutPath "$INSTDIR\bin"
-  File "${FILES_DEPS}\*.*"
+  !ifdef FILES_DEPS
+    !echo "Including MSVC Redist files from ${FILES_DEPS}"
+    SetOutPath "$INSTDIR\bin"
+    File "${FILES_DEPS}\*.*"
+  !endif
   
   # Others
   SetOutPath "$INSTDIR\data"
@@ -52,10 +56,6 @@ Section -ProgramFiles SecProgramFiles
   File /r "${FILES_FREECAD}\lib\*.*"
   SetOutPath "$INSTDIR\Mod"
   File /r "${FILES_FREECAD}\Mod\*.*"
-  SetOutPath "$INSTDIR\resources"
-  File /r "${FILES_FREECAD}\resources\*.*"
-  SetOutPath "$INSTDIR\translations"
-  File /r "${FILES_FREECAD}\translations\*.*"
   SetOutPath "$INSTDIR"
   File /r "${FILES_THUMBS}"
     

package/WindowsInstaller/write_version_nsh.py

@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# this script is meant to be called by nsis installer scripts, it gets version information
+# from freecad and writes version.nsh file in the directory the script is located at
+import FreeCAD
+import datetime
+import os
+
+filepath=os.path.join(os.path.dirname(os.path.abspath(__file__)),"version.nsh")
+v=FreeCAD.Version()
+content=f'''\
+!define COPYRIGHT_YEAR {datetime.date.today().year}
+!define APP_VERSION_MAJOR "{v[0]}"
+!define APP_VERSION_MINOR "{v[1]}"
+!define APP_VERSION_PATCH "{v[2]}"
+!define APP_VERSION_REVISION "{v[3].split()[0]}"
+'''
+
+with open(filepath, "w", encoding="utf-8") as file:
+    file.writelines(content)

package/fedora/freecad.spec

@@ -16,7 +16,7 @@
 
 Name:           freecad
 Epoch:          1
-Version:        1.1.0~dev
+Version:        1.1.0~rc3
 Release:        1%{?dist}
 
 Summary:        A general purpose 3D CAD modeler
@@ -44,7 +44,7 @@ Source0:        freecad-sources.tar.gz
 # Utilities
 BuildRequires:  cmake gcc-c++ gettext doxygen swig graphviz gcc-gfortran desktop-file-utils tbb-devel ninja-build strace
 %if %{with tests}
-BuildRequires:  xorg-x11-server-Xvfb python3-typing-extensions 
+BuildRequires:  xorg-x11-server-Xvfb python3-typing-extensions
 %if %{without bundled_gtest}
 BuildRequires: gtest-devel gmock-devel
 %endif

package/rattler-build/.gitignore

@@ -0,0 +1,12 @@
+linux/AppDir/usr
+linux/AppDir/*.desktop
+linux/AppDir/*.svg
+linux/AppDir/packages.txt
+windows/FreeCAD_*Windows*
+osx/FreeCAD.app
+**.AppImage
+**.AppImage.zsync
+**.dmg
+**.7z
+**.exe
+**-SHA256.txt

package/rattler-build/build.sh

@@ -37,6 +37,7 @@ cmake \
     -D OCC_LIBRARY_DIR:FILEPATH="$PREFIX/lib" \
     -D Python_EXECUTABLE:FILEPATH="$PYTHON" \
     -D Python3_EXECUTABLE:FILEPATH="$PYTHON" \
+    -D BUILD_DYNAMIC_LINK_PYTHON:BOOL=OFF \
     -B build \
     -S .
 

package/rattler-build/linux/create_bundle.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -e
-set -x 
+set -x
 
 conda_env="AppDir/usr"
 
@@ -9,9 +9,6 @@ mkdir -p ${conda_env}
 
 cp -a ../.pixi/envs/default/* ${conda_env}
 
-export PATH="${PWD}/${conda_env}/bin:${PATH}"
-export CONDA_PREFIX="${PWD}/${conda_env}"
-
 echo -e "\nDelete unnecessary stuff"
 rm -rf ${conda_env}/include
 find ${conda_env} -name \*.a -delete
@@ -49,7 +46,7 @@ rm -rf ${conda_env}/lib/cmake/
 find . -name "*.h" -type f -delete
 find . -name "*.cmake" -type f -delete
 
-python_version=$(python -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])')
+python_version=$(${conda_env}/bin/python -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])')
 version_name="FreeCAD_${BUILD_TAG}-Linux-$(uname -m)-${python_version}"
 
 echo -e "\################"
@@ -62,6 +59,20 @@ sed -i "1s/.*/\nLIST OF PACKAGES:/" AppDir/packages.txt
 curl -LO https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$(uname -m).AppImage
 chmod a+x appimagetool-$(uname -m).AppImage
 
+if [ "${UPLOAD_RELEASE}" == "true" ]; then
+    case "${BUILD_TAG}" in
+        *weekly*)
+            GH_UPDATE_TAG="weeklies"
+            ;;
+        *rc*)
+            GH_UPDATE_TAG="${BUILD_TAG}"
+            ;;
+        *)
+            GH_UPDATE_TAG="latest"
+            ;;
+    esac
+fi
+
 echo -e "\nCreate the appimage"
 # export GPG_TTY=$(tty)
 chmod a+x ./AppDir/AppRun
@@ -69,7 +80,7 @@ chmod a+x ./AppDir/AppRun
   --comp zstd \
   --mksquashfs-opt -Xcompression-level \
   --mksquashfs-opt 22 \
-  -u "gh-releases-zsync|FreeCAD|FreeCAD|${BUILD_TAG}|FreeCAD*$(uname -m)*.AppImage.zsync" \
+  -u "gh-releases-zsync|FreeCAD|FreeCAD|${GH_UPDATE_TAG}|FreeCAD*$(uname -m)*.AppImage.zsync" \
   AppDir ${version_name}.AppImage
   # -s --sign-key ${GPG_KEY_ID} \
 
@@ -77,5 +88,13 @@ echo -e "\nCreate hash"
 sha256sum ${version_name}.AppImage > ${version_name}.AppImage-SHA256.txt
 
 if [ "${UPLOAD_RELEASE}" == "true" ]; then
-    gh release upload --clobber ${BUILD_TAG} "${version_name}.AppImage" "${version_name}.AppImage-SHA256.txt"
+    gh release upload --clobber ${BUILD_TAG} "${version_name}.AppImage" "${version_name}.AppImage.zsync" "${version_name}.AppImage-SHA256.txt"
+    if [ "${GH_UPDATE_TAG}" == "weeklies" ]; then
+        generic_name="FreeCAD_weekly-Linux-$(uname -m)"
+        mv "${version_name}.AppImage" "${generic_name}.AppImage"
+        mv "${version_name}.AppImage.zsync" "${generic_name}.AppImage.zsync"
+        mv "${version_name}.AppImage-SHA256.txt" "${generic_name}.AppImage-SHA256.txt"
+        gh release create weeklies --prerelease | true
+        gh release upload --clobber weeklies "${generic_name}.AppImage" "${generic_name}.AppImage.zsync" "${generic_name}.AppImage-SHA256.txt"
+    fi
 fi

package/rattler-build/osx/create_bundle.sh

@@ -9,9 +9,6 @@ mkdir -p ${conda_env}
 
 cp -a ../.pixi/envs/default/* ${conda_env}
 
-export PATH="${PWD}/${conda_env}/bin:${PATH}"
-export CONDA_PREFIX="${PWD}/${conda_env}"
-
 # delete unnecessary stuff
 rm -rf ${conda_env}/include
 find ${conda_env} -name \*.a -delete
@@ -50,7 +47,7 @@ cmake --build build
 mkdir -p FreeCAD.app/Contents/MacOS
 cp build/FreeCAD FreeCAD.app/Contents/MacOS/FreeCAD
 
-python_version=$(python -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])')
+python_version=$(${conda_env}/bin/python -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])')
 version_name="FreeCAD_${BUILD_TAG}-macOS-$(uname -m)-${python_version}"
 application_menu_name="FreeCAD_${BUILD_TAG}"
 
@@ -71,7 +68,7 @@ rm -rf ${conda_env}/Library
 
 if [[ "${SIGN_RELEASE}" == "true" ]]; then
     # create the signed dmg
-    ./macos_sign_and_notarize.zsh -p "FreeCAD" -k ${SIGNING_KEY_ID} -o "${version_name}.dmg"
+    ../../scripts/macos_sign_and_notarize.zsh -p "FreeCAD" -k ${SIGNING_KEY_ID} -o "${version_name}.dmg"
 else
     # create the dmg
     dmgbuild -s dmg_settings.py "FreeCAD" "${version_name}.dmg"

package/rattler-build/osx/dmg_settings.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
 # Ensure default values are set in defines if they are not already provided
 defines.setdefault('containing_folder', '.')
 defines.setdefault('app_name', 'FreeCAD.app')

package/rattler-build/pixi.toml

@@ -1,14 +1,15 @@
 [workspace]
 channels = [
     "https://prefix.dev/pixi-build-backends",
-    "https://prefix.dev/conda-forge",
+    "freecad",
+    "conda-forge",
 ]
 platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64"]
 preview = ["pixi-build"]
 
 [package]
 name = "freecad"
-version = "1.1.0dev"
+version = "1.1.0rc3"
 homepage = "https://freecad.org"
 repository = "https://github.com/FreeCAD/FreeCAD"
 description = "FreeCAD"
@@ -22,44 +23,39 @@ freecad = { path = "." }
 [feature.package.dependencies]
 python = ">=3.11,<3.12"
 
+[feature.package.tasks]
+create_bundle = 'bash -c "cd $(bash scripts/get_os.bash) && bash create_bundle.sh"'
+
 ## Linux (x86-64)
 [feature.package.target.linux-64.dependencies]
 coreutils = "*"
-
-[feature.package.target.linux-64.tasks]
-create_bundle = 'bash -c "cd linux && bash create_bundle.sh"'
+xcb-util-cursor = "==0.1.5"  ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726
 
 ## Linux (aarch64)
 [feature.package.target.linux-aarch64.dependencies]
 coreutils = "*"
-
-[feature.package.target.linux-aarch64.tasks]
-create_bundle = 'bash -c "cd linux && bash create_bundle.sh"'
+xcb-util-cursor = "==0.1.5"  ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726
 
 ## macOS (Intel)
 [feature.package.target.osx-64.dependencies]
 coreutils = "*"
 dmgbuild = "*"
+pyobjc-framework-Quartz = "*"
 sed = "*"
 
-[feature.package.target.osx-64.tasks]
-create_bundle = 'bash -c "cd osx && bash create_bundle.sh"'
-
 ## macOS (Apple Silicon)
 [feature.package.target.osx-arm64.dependencies]
 coreutils = "*"
 dmgbuild = "*"
+pyobjc-framework-Quartz = "*"
 sed = "*"
 
-[feature.package.target.osx-arm64.tasks]
-create_bundle = 'bash -c "cd osx && bash create_bundle.sh"'
-
 ## Windows dependencies (x86-64)
 [feature.package.target.win-64.dependencies]
 git = "*"
-
-[feature.package.target.win-64.tasks]
-create_bundle = 'bash -c "cd windows && bash create_bundle.sh"'
+nsis = { version = "*", build = "*_log*" }
+7zip = "*"
+vs2022_win-64 = "*"
 
 [environments]
 default = ["freecad"]

package/rattler-build/recipe.yaml

@@ -1,5 +1,5 @@
 context:
-  version: "1.1.0dev"
+  version: "1.1.0rc3"
 
 package:
   name: freecad
@@ -22,7 +22,7 @@ requirements:
     - noqt5
     - python>=3.11,<3.12
     - qt6-main>=6.8,<6.9
-    - swig
+    - swig>=4.3,<4.4
 
     - if: linux and x86_64
       then:
@@ -52,6 +52,7 @@ requirements:
         - pixman-cos7-x86_64
         - sed
         - sysroot_linux-64
+        - xcb-util-cursor==0.1.5  ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726
         - xorg-x11-server-common-cos7-x86_64
         - xorg-x11-server-xvfb-cos7-x86_64
         - xorg-xproto
@@ -84,6 +85,7 @@ requirements:
         - pixman-cos7-aarch64
         - sed
         - sysroot_linux-aarch64
+        - xcb-util-cursor==0.1.5  ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726
         - xorg-x11-server-common-cos7-aarch64
         - xorg-x11-server-xvfb-cos7-aarch64
         - xorg-xproto
@@ -145,7 +147,6 @@ requirements:
     - gmsh
     - graphviz
     - ifcopenshell
-    - jinja2
     - lark
     - lxml
     - matplotlib-base
@@ -176,3 +177,5 @@ requirements:
     - if: linux
       then:
         - libspnav
+        - qt6-wayland
+        - xcb-util-cursor==0.1.5  ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726

package/rattler-build/scripts/disable_git_info.patch

@@ -1,13 +0,0 @@
-diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
-index 1f3f0a436343..c314003736f1 100644
---- a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -523,7 +523,7 @@ def main():
-             inp = open("%s/src/Build/Version.h.in" % (bindir))
-             lines = inp.readlines()
-             inp.close()
--            lines = i.writeVersion(lines)
-+            #lines = i.writeVersion(lines)
-             out = open("%s/src/Build/Version.h.out" % (bindir), "w")
-             out.writelines(lines)
-             out.write("\n")

package/rattler-build/scripts/get_freecad_version.py

@@ -1,53 +0,0 @@
-import sys
-import os
-import subprocess
-import platform
-from datetime import datetime
-
-import freecad
-import FreeCAD
-
-package_manager = "conda"
-system = platform.platform().split("-")[0]
-arch = platform.machine()
-
-# Windows uses a different syntax
-if arch == "AMD64":
-    arch = "x86_64"
-
-if "ARCH" in os.environ:
-    if os.environ["ARCH"] != "":
-        arch = os.environ["ARCH"]
-
-python_version = platform.python_version().split(".")
-python_version = "py" + python_version[0] + python_version[1]
-date = str(datetime.now()).split(" ")[0]
-
-version_info = FreeCAD.Version()
-build_version_suffix = FreeCAD.ConfigGet("BuildVersionSuffix")
-dev_version = version_info[0] + "." + version_info[1] + "." + version_info[2] + build_version_suffix
-revision = version_info[3].split(" ")[0]
-
-if system == "macOS":
-    import jinja2
-    print("create plist from template")
-    osx_directory = os.path.join(os.path.dirname(__file__), "..", "osx")
-    with open(os.path.join(osx_directory, "Info.plist.template")) as template_file:
-        template_str = template_file.read()
-    template = jinja2.Template(template_str)
-    rendered_str = template.render( FREECAD_VERSION="{}-{}".format(dev_version, revision), 
-                                    APPLICATION_MENU_NAME="FreeCAD-{}-{}".format(dev_version, revision) )
-    with open(os.path.join(osx_directory, "FreeCAD.app", "Contents", "Info.plist"), "w") as rendered_file:
-        rendered_file.write(rendered_str)
-
-if "DEPLOY_RELEASE" in os.environ and os.environ["DEPLOY_RELEASE"] == "weekly-builds":
-    dev_version = "weekly-builds"
-    revision_separator = "-"
-else:
-    revision_separator = ""
-    revision = ""
-
-bundle_name = f"FreeCAD_{dev_version}{revision_separator}{revision}-{package_manager}-{system}-{arch}-{python_version}"
-
-with open("bundle_name.txt", "w") as bundle_name_file:
-    bundle_name_file.write(bundle_name)

package/rattler-build/scripts/get_os.bash

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+if [[ "$OSTYPE" =~ (msys*|cygwin*|mingw*) ]]; then
+    echo windows
+elif [[ "$OSTYPE" == darwin* ]]; then
+    echo osx
+elif [[ "$OSTYPE" == linux* ]]; then
+    echo linux
+fi

package/rattler-build/windows/create_bundle.bat

@@ -1,56 +0,0 @@
-set conda_env="fc_env"
-
-robocopy ..\.pixi\envs\default\* %conda_env% /S /MT:%NUMBER_OF_PROCESSORS% > nul
-
-%conda_env%\python ..\scripts\get_freecad_version.py
-set /p freecad_version_name= <bundle_name.txt
-
-echo **********************
-echo %freecad_version_name%
-echo **********************
-
-REM remove arm binaries that fail to extract unless using latest 7zip
-for /r %conda_env% %%i in (*arm*.exe) do (@echo "%%i will be removed" & @del "%%i")
-
-set copy_dir="FreeCAD_Conda_Build"
-mkdir %copy_dir%
-
-REM Copy Conda's Python and (U)CRT to FreeCAD/bin
-robocopy %conda_env%\DLLs %copy_dir%\bin\DLLs /S /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Lib %copy_dir%\bin\Lib /XD __pycache__ /S /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Scripts %copy_dir%\bin\Scripts /S /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\python*.* %copy_dir%\bin\ /XF *.pdb /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\msvc*.* %copy_dir%\bin\ /XF *.pdb /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\ucrt*.* %copy_dir%\bin\ /XF *.pdb /MT:%NUMBER_OF_PROCESSORS% > nul
-REM Copy meaningful executables
-robocopy %conda_env%\Library\bin %copy_dir%\bin\ ccx.exe /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\bin %copy_dir%\bin\ gmsh.exe /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\bin %copy_dir%\bin\ dot.exe /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\bin %copy_dir%\bin\ unflatten.exe /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\mingw-w64\bin * %copy_dir%\bin\ /MT:%NUMBER_OF_PROCESSORS% > nul
-REM Copy Conda's QT5/plugins to FreeCAD/bin
-robocopy %conda_env%\Library\plugins %copy_dir%\bin\ /S /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\resources %copy_dir%\resources /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\translations %copy_dir%\translations /MT:%NUMBER_OF_PROCESSORS% > nul
-REM get all the dependency .dlls
-robocopy %conda_env%\Library\bin *.dll %copy_dir%\bin /XF *.pdb /XF api*.* /MT:%NUMBER_OF_PROCESSORS% > nul
-REM Copy FreeCAD build
-robocopy %conda_env%\Library\bin FreeCAD* %copy_dir%\bin /XF *.pdb /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\data %copy_dir%\data /XF *.txt /S /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\Ext %copy_dir%\Ext /S /XD __pycache__ /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\lib %copy_dir%\lib /XF *.lib /XF *.prl /XF *.sh /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\Mod %copy_dir%\Mod /S /XD __pycache__ /MT:%NUMBER_OF_PROCESSORS% > nul
-robocopy %conda_env%\Library\doc %copy_dir%\doc ThirdPartyLibraries.html LICENSE.html /MT:%NUMBER_OF_PROCESSORS% > nul
-REM Apply Patches
-rename %copy_dir%\bin\Lib\ssl.py ssl-orig.py
-copy ssl-patch.py %copy_dir%\bin\Lib\ssl.py
-
-cd %copy_dir%\..
-ren %copy_dir% %freecad_version_name%
-dir
-
-REM if errorlevel1 exit 1
-
-"%ProgramFiles%\7-Zip\7z.exe" a -t7z -mx9 -mmt=%NUMBER_OF_PROCESSORS% %freecad_version_name%.7z %freecad_version_name%\ -bb
-certutil -hashfile "%freecad_version_name%.7z" SHA256 > "%freecad_version_name%.7z"-SHA256.txt
-echo  %date%-%time% >>"%freecad_version_name%.7z"-SHA256.txt

package/rattler-build/windows/create_bundle.sh

@@ -3,23 +3,9 @@
 set -e
 set -x
 
-conda_env="fc_env"
+conda_env="$(pwd)/../.pixi/envs/default/"
 
-mkdir -p ${conda_env}
-
-cp -a ../.pixi/envs/default/* ${conda_env}
-
-export PATH="${PWD}/${conda_env}/bin:${PATH}"
-export CONDA_PREFIX="${PWD}/${conda_env}"
-
-# remove arm binaries that fail to extract unless using latest 7zip
-rm $(find ${conda_env} -name \*arm\*.exe)
-
-# delete unnecessary stuff
-rm -rf ${conda_env}/include
-find ${conda_env} -name \*.a -delete
-
-copy_dir="FreeCAD_Conda_Build"
+copy_dir="FreeCAD_Windows"
 mkdir -p ${copy_dir}/bin
 
 # Copy Conda's Python and (U)CRT to FreeCAD/bin
@@ -48,16 +34,28 @@ cp -a ${conda_env}/Library/lib ${copy_dir}/lib
 cp -a ${conda_env}/Library/Mod ${copy_dir}/Mod
 mkdir -p ${copy_dir}/doc
 cp -a ${conda_env}/Library/doc/{ThirdPartyLibraries.html,LICENSE.html} ${copy_dir}/doc
-rm -rf ${conda_env}/bin_tmp
+
+# delete unnecessary stuff
+find ${copy_dir} -name \*.a -delete
+find ${copy_dir} -name \*.lib -delete
+find ${copy_dir} -name \*arm\*.exe -delete # arm binaries that fail to extract unless using latest 7zip
 
 # Apply Patches
-mv ${copy_dir}/bin/Lib/ssl.py ssl-orig.py
+mv ${copy_dir}/bin/Lib/ssl.py .ssl-orig.py
 cp ssl-patch.py ${copy_dir}/bin/Lib/ssl.py
 
 echo '[Paths]' >> ${copy_dir}/bin/qt6.conf
 echo 'Prefix = ../lib/qt6' >> ${copy_dir}/bin/qt6.conf
 
-python_version=$(python -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])')
+# convenient shortcuts to run the binaries
+if [ -x /c/ProgramData/chocolatey/tools/shimgen.exe ]; then
+    pushd ${copy_dir}
+    /c/ProgramData/chocolatey/tools/shimgen.exe -p bin/freecadcmd.exe -i "$(pwd)/../../../WindowsInstaller/icons/FreeCAD.ico" -o "$(pwd)/FreeCADCmd.exe"
+    /c/ProgramData/chocolatey/tools/shimgen.exe --gui -p bin/freecad.exe -i "$(pwd)/../../../WindowsInstaller/icons/FreeCAD.ico" -o "$(pwd)/FreeCAD.exe"
+    popd
+fi
+
+python_version=$("${copy_dir}"/bin/python.exe -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])')
 version_name="FreeCAD_${BUILD_TAG}-Windows-$(uname -m)-${python_version}"
 
 echo -e "################"
@@ -69,11 +67,37 @@ sed -i '1s/.*/\nLIST OF PACKAGES:/' ${copy_dir}/packages.txt
 
 mv ${copy_dir} ${version_name}
 
-"${PROGRAMFILES}/7-Zip/7z.exe" a -t7z -mx9 -mmt=${NUMBER_OF_PROCESSORS} ${version_name}.7z ${version_name} -bb
-
+7z a -t7z -mx9 -mmt=${NUMBER_OF_PROCESSORS} ${version_name}.7z ${version_name} -bb
 # create hash
 sha256sum ${version_name}.7z > ${version_name}.7z-SHA256.txt
 
+if [ "${MAKE_INSTALLER}" == "true" ]; then
+    FILES_FREECAD="$(cygpath -w $(pwd))\\${version_name}"
+    nsis_cpdir=$(pwd)/.nsis_tmp
+    cp -r "${CONDA_PREFIX}/NSIS" "${nsis_cpdir}"
+    # curl -L -o ".nsis-log.zip" http://prdownloads.sourceforge.net/nsis/nsis-3.11-log.zip # we use the log variant of the package already
+    # curl -L -o ".nsis-strlen_8192.zip" "http://prdownloads.sourceforge.net/nsis/nsis-3.11-strlen_8192.zip"
+    curl -L -o ".NsProcess.7z" "https://nsis.sourceforge.io/mediawiki/images/1/18/NsProcess.zip"
+    if [ ! $(echo fc19fc66a5219a233570fafd5daeb0c9b85387b379f6df5ac8898159a57c5944 .NsProcess.7z | sha256sum --check --status) ]; then
+        7z x .NsProcess.7z -o"${nsis_cpdir}" -y
+        mv "${nsis_cpdir}"/Plugin/nsProcess.dll "${nsis_cpdir}"/Plugins/x86-ansi/nsProcess.dll
+        mv "${nsis_cpdir}"/Plugin/nsProcessW.dll "${nsis_cpdir}"/Plugins/x86-unicode/nsProcess.dll
+        "${nsis_cpdir}"/makensis.exe -V4 \
+            -D"ExeFile=${version_name}-installer.exe" \
+            -D"FILES_FREECAD=${FILES_FREECAD}" \
+            -X'SetCompressor /FINAL lzma' \
+            ../../WindowsInstaller/FreeCAD-installer.nsi
+        mv ../../WindowsInstaller/${version_name}-installer.exe .
+        sha256sum ${version_name}-installer.exe > ${version_name}-installer.exe-SHA256.txt
+    else
+        echo "Error: Failed to get NsProcess plugin. Aborting installer creation..."
+    fi
+    rm -rf "${nsis_cpdir}"
+fi
+
 if [ "${UPLOAD_RELEASE}" == "true" ]; then
     gh release upload --clobber ${BUILD_TAG} "${version_name}.7z" "${version_name}.7z-SHA256.txt"
+    if [ "${MAKE_INSTALLER}" == "true" ]; then
+        gh release upload --clobber ${BUILD_TAG} "${version_name}-installer.exe" "${version_name}-installer.exe-SHA256.txt"
+    fi
 fi

package/scripts/macos_sign_and_notarize.zsh

@@ -83,8 +83,11 @@ fi
 
 # Check for dmgbuild executable
 if ! command -v dmgbuild &> /dev/null; then
-    echo "Error: dmgbuild not installed. Please install it for example using pip:"
-    echo 'pip3 install "dmgbuild[badge_icons]>=1.6.0,<1.7.0"'
+    echo 'Error: dmgbuild not installed. Please install it'
+    echo '- using pixi:'
+    echo 'pixi g install dmgbuild --with pyobjc-framework-Quartz'
+    echo '- using pip:'
+    echo 'pip3 install dmgbuild pyobjc-framework-Quartz'
     exit 1
 fi
 
@@ -119,8 +122,96 @@ run_codesign "${CONTAINING_FOLDER}/${APP_NAME}"
 echo "Creating disk image ${DMG_NAME}"
 dmgbuild -s ${DMG_SETTINGS} -Dcontaining_folder="${CONTAINING_FOLDER}" -Dapp_name="${APP_NAME}" "${VOLUME_NAME}" "${DMG_NAME}"
 
-# Submit it for notarization (requires that an App Store API Key has been set up in the notarytool)
-time xcrun notarytool submit --wait --keychain-profile "${KEYCHAIN_PROFILE}" "${DMG_NAME}"
+ID_FILE="${DMG_NAME}.notarization_id"
 
-# Assuming that notarization succeeded, it's a good practice to staple that notarization to the DMG
-xcrun stapler staple "${DMG_NAME}"
+# Submit it for notarization (requires that an App Store API Key has been set up in the notarytool)
+# This is a *very slow* process, and occasionally the GitHub runners lose the internet connection for a short time
+# during the run. So in order to be fault-tolerant, this script polls, instead of using --wait
+submit_notarization_request() {
+  if [[ -s "${ID_FILE}" ]]; then
+    cat "${ID_FILE}"
+    return
+  fi
+  local out
+  if ! out=$(xcrun notarytool submit --keychain-profile "${KEYCHAIN_PROFILE}" \
+                --output-format json --no-progress "${DMG_NAME}" 2>&1); then
+      print -r -- "$out" >&2
+      return 1
+  fi
+  # We asked for JSON output so we had something stable, but of course parsing JSON with ZSH is ugly, so a quick bit of
+  # Python does it instead...
+  local id
+  id=$(print -r -- "$out" |
+    /usr/bin/python3 -c 'import sys, json; print(json.load(sys.stdin).get("id",""))'
+  )
+  [[ -n "$id" ]] || { print -r -- "Could not parse submission id" >&2; return 1; }
+  print -r -- "$id" > "${ID_FILE}"
+  print -r -- "$id"  # ID is a string here, not an integer, so I can't just return it
+}
+
+wait_for_notarization_result() {
+  local id="$1" attempt=0
+  while :; do
+    if xcrun notarytool wait "$id" --keychain-profile "${KEYCHAIN_PROFILE}" \
+          --timeout 10m --no-progress >/dev/null; then
+      return 0
+    fi
+
+    (( attempt++ ))
+    # If the failure was transient (timeout/HTTP/connection) just retry, but make sure to check to see if the problem
+    # was actually that the signing failed before retrying.
+    local tmp_json
+    tmp_json=$(mktemp)
+    trap 'rm -f "$tmp_json"' EXIT INT TERM
+
+    xcrun notarytool info "$id" --keychain-profile "${KEYCHAIN_PROFILE}" --output-format json 2>/dev/null > "$tmp_json"
+    /usr/bin/python3 - "$tmp_json" <<'PY'
+import sys, json
+try:
+    with open(sys.argv[1]) as f:
+        s = (json.load(f).get("status") or "").lower()
+    if s in ("invalid", "rejected"):
+        sys.exit(2)
+    else:
+        sys.exit(0)
+except Exception:
+    sys.exit(1)
+PY
+    rc=$?
+
+    rm -f "$tmp_json"
+
+    if [[ $rc == 2 ]]; then
+      print -r -- "Notarization was not accepted by Apple:" >&2
+      xcrun notarytool log "$id" --keychain-profile "${KEYCHAIN_PROFILE}" >&2
+      return 3
+    fi
+
+    if [[ $attempt -gt 120 ]]; then
+      print -r -- "🏳️ Notarization is taking too long, bailing out. 🏳️" >&2
+      return 4
+    fi
+    sleep $(( (attempt<6?2**attempt:60) + RANDOM%5 ))  # Increasing timeout plus jitter for multi-run safety
+  done
+}
+
+if ! id="$(submit_notarization_request)"; then
+  print -r -- "❌ Failed to submit notarization request" >&2
+  exit 1
+fi
+if [[ -z "$id" ]]; then
+  print -r -- "❌ Submission succeeded but no ID was returned" >&2
+  exit 1
+fi
+print "Notarization submission ID: $id"
+
+if wait_for_notarization_result "$id"; then
+  print "✅ Notarization succeeded. Stapling..."
+  xcrun stapler staple "${DMG_NAME}"
+  print "Stapled: ${DMG_NAME}"
+  rm -f "${ID_FILE}"
+else
+  rc=$?
+  print "❌ Notarization failed (code $rc)." >&2
+  exit "$rc"
+fi

package/scripts/write_version_info.py

@@ -11,12 +11,10 @@ import SubWCRev
 
 gitInfo = SubWCRev.GitControl()
 gitInfo.extractInfo("","")
-gitDescription = os.environ['BUILD_TAG']
 
 i = open("src/Build/Version.h.cmake")
 content = []
 for line in i.readlines():
-	line = line.replace("-${PACKAGE_VERSION_SUFFIX}",gitDescription)
 	line = line.replace("${PACKAGE_WCREF}",gitInfo.rev)
 	line = line.replace("${PACKAGE_WCDATE}",gitInfo.date)
 	line = line.replace("${PACKAGE_WCURL}",gitInfo.url)
@@ -28,6 +26,14 @@ with open("src/Build/Version.h.cmake", "w") as o:
 	content.append('#define FCRepositoryBranch "%s"\n' % (gitInfo.branch))
 	o.writelines(content)
 
+with open("src/Tools/SubWCRev.py", "r") as f:
+	new_subwcrev = f.read()
+	new_subwcrev = new_subwcrev.replace("lines = i.writeVersion(lines)",
+		"#lines = i.writeVersion(lines) # this source package already has git info, we do nothing here")
+
+with open("src/Tools/SubWCRev.py", "w") as f:
+	f.writelines(new_subwcrev)
+
 with open(os.sys.argv[1], "w") as f:
 	f.write(f"rev_number: {gitInfo.rev}\n")
 	f.write(f"branch_name: {gitInfo.branch}\n")
@@ -35,8 +41,9 @@ with open(os.sys.argv[1], "w") as f:
 	f.write(f"commit_hash: {gitInfo.hash}\n")
 	f.write(f"remote_url: {gitInfo.url}\n")
 
-p = subprocess.Popen(["git", "-c", "user.name='github-actions[bot]'", "-c", "user.email='41898282+github-actions[bot]@users.noreply.github.com'",
-		       "commit", "-a", "-m", "add git information"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+p = subprocess.Popen(["git", "-c", "user.name='github-actions[bot]'", "-c",
+	"user.email='41898282+github-actions[bot]@users.noreply.github.com'", "commit", "-a", "-m",
+	"add git version information"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
 out, err = p.communicate()
 

pixi.toml

@@ -3,7 +3,7 @@ name = "FreeCAD"
 version = "1.0.0"
 description = "pixi instructions for FreeCAD"
 authors = ["looooo <sppedflyer@gmail.com>"]
-channels = ["conda-forge"]
+channels = ["freecad", "conda-forge"]
 platforms = [ "linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64" ]
 requires-pixi = ">=0.48"
 
@@ -92,8 +92,10 @@ mesa-libgl-cos7-x86_64 = "*"
 mesa-libgl-devel-cos7-x86_64 = "*"
 mold = "*"
 pixman-cos7-x86_64 = "*"
+qt6-wayland = ">=6.8,<6.9"
 sed = "*"
 sysroot_linux-64 = "*"
+xcb-util-cursor = "==0.1.5"  ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726
 xorg-x11-server-common-cos7-x86_64 = "*"
 xorg-x11-server-xvfb-cos7-x86_64 = "*"
 xorg-xproto = "*"
@@ -130,8 +132,10 @@ mesa-libgl-devel-cos7-aarch64 = "*"
 mesa-libglapi-cos7-aarch64 = "*"
 mold = "*"
 pixman-cos7-aarch64 = "*"
+qt6-wayland = ">=6.8,<6.9"
 sed = "*"
 sysroot_linux-aarch64 = "*"
+xcb-util-cursor = "==0.1.5"  ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726
 xorg-x11-server-common-cos7-aarch64 = "*"
 xorg-x11-server-xvfb-cos7-aarch64 = "*"
 xorg-xproto = "*"
@@ -145,31 +149,31 @@ sed = "*"
 sed = "*"
 
 [target.win-64.dependencies]
-pthreads-win32 = "*"
+winpthreads-devel = "*"
 
 [pypi-dependencies]
 freecad-stubs = "*"
 
 ## Qt 6 Configuration Presets
 [target.linux-64.tasks]
-configure-debug = { cmd = [ "cmake", "--preset", "conda-linux-debug", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
-configure-release = { cmd = [ "cmake", "--preset", "conda-linux-release", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-debug = { cmd = [ "cmake", "--preset", "conda-linux-debug" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-release = { cmd = [ "cmake", "--preset", "conda-linux-release" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
 
 [target.linux-aarch64.tasks]
-configure-debug = { cmd = [ "cmake", "--preset", "conda-linux-debug", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on= ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
-configure-release = { cmd = [ "cmake", "--preset", "conda-linux-release", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on= ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-debug = { cmd = [ "cmake", "--preset", "conda-linux-debug" ], depends-on= ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-release = { cmd = [ "cmake", "--preset", "conda-linux-release" ], depends-on= ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
 
 [target.osx-64.tasks]
-configure-debug = { cmd = [ "cmake", "--preset", "conda-macos-debug", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
-configure-release = { cmd = [ "cmake", "--preset", "conda-macos-release", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-debug = { cmd = [ "cmake", "--preset", "conda-macos-debug" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-release = { cmd = [ "cmake", "--preset", "conda-macos-release" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
 
 [target.osx-arm64.tasks]
-configure-debug = { cmd = [ "cmake", "--preset", "conda-macos-debug", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
-configure-release = { cmd = [ "cmake", "--preset", "conda-macos-release", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-debug = { cmd = [ "cmake", "--preset", "conda-macos-debug" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-release = { cmd = [ "cmake", "--preset", "conda-macos-release" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
 
 [target.win-64.tasks]
-configure-debug = { cmd = [ "cmake", "--preset", "conda-windows-debug", "-DBUILD_REVERSEENGINEERING=OFF", "-DCMAKE_GENERATOR_PLATFORM=", "-DCMAKE_GENERATOR_TOOLSET=" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
-configure-release = { cmd = [ "cmake", "--preset", "conda-windows-release", "-DBUILD_REVERSEENGINEERING=OFF", "-DCMAKE_GENERATOR_PLATFORM=", "-DCMAKE_GENERATOR_TOOLSET=" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-debug = { cmd = [ "cmake", "--preset", "conda-windows-debug", "-DCMAKE_GENERATOR_PLATFORM=", "-DCMAKE_GENERATOR_TOOLSET=" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
+configure-release = { cmd = [ "cmake", "--preset", "conda-windows-release", "-DCMAKE_GENERATOR_PLATFORM=", "-DCMAKE_GENERATOR_TOOLSET=" ], depends-on = ["initialize"], env={ CFLAGS="", CXXFLAGS="", DEBUG_CFLAGS="", DEBUG_CXXFLAGS="" }}
 freecad-debug = { cmd = [ ".pixi/envs/default/Library/bin/FreeCAD.exe" ], depends-on = ["install-debug"]}
 freecad-release = { cmd = [ ".pixi/envs/default/Library/bin/FreeCAD.exe" ], depends-on = ["install-release"]}
 

src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp

@@ -126,7 +126,11 @@ namespace netgen {
 #endif
   //extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh);
   DLL_HEADER extern MeshingParameters mparam;
-  DLL_HEADER extern volatile multithreadt multithread;
+#if NETGEN_VERSION >= NETGEN_VERSION_STRING(6,2,2601)
+    using ngcore::multithread;
+#else
+    DLL_HEADER extern volatile multithreadt multithread;
+#endif
   DLL_HEADER extern bool merge_solids;
 }
 

src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp

@@ -112,7 +112,11 @@ namespace netgen {
   DLL_HEADER extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
 #endif
   DLL_HEADER extern MeshingParameters mparam;
-  DLL_HEADER extern volatile multithreadt multithread;
+#if NETGEN_VERSION >= NETGEN_VERSION_STRING(6,2,2601)
+    using ngcore::multithread;
+#else
+    DLL_HEADER extern volatile multithreadt multithread;
+#endif
 }
 using namespace nglib;
 using namespace std;

src/App/ApplicationDirectories.cpp

@@ -137,7 +137,10 @@ fs::path ApplicationDirectories::findPath(const fs::path& stdHome, const fs::pat
     // If a custom user home path is given, then don't modify it
     if (customHome.empty()) {
         for (const auto& it : subdirs) {
-            appData = appData / it;
+            if (!it.empty()) {
+                // Refuse to add an empty directory path component
+                appData = appData / it;
+            }
         }
     }
 
@@ -630,6 +633,9 @@ fs::path ApplicationDirectories::findHomePath(const char* sCall)
 #include <cstdio>
 #include <cstdlib>
 #include <sys/param.h>
+#if defined(__FreeBSD__)
+#include <sys/sysctl.h>
+#endif
 
 fs::path ApplicationDirectories::findHomePath(const char* sCall)
 {

src/App/AutoTransaction.h

@@ -31,31 +31,38 @@ namespace App
 
 class Application;
 
-/// Helper class to manager transaction (i.e. undo/redo)
+/**
+ * @brief A helper class to manage transactions (i.e. undo/redo).
+ *
+ * An AutoTransaction object is meant to be allocated on the stack and governs
+ * the transactions in that scope.
+ */
 class AppExport AutoTransaction
 {
 public:
-    /// Private new operator to prevent heap allocation
+     /// Delete the new operator to prevent heap allocation.
     void* operator new(std::size_t) = delete;
 
 public:
-    /** Constructor
+    /**
+     * @brief Construct an auto transaction.
      *
-     * @param name: optional new transaction name on construction
-     * @param tmpName: if true and a new transaction is setup, the name given is
+     * @param[in] name: optional new transaction name on construction
+     * @param[in] tmpName: if true and a new transaction is setup, the name given is
      * considered as temporary, and subsequent construction of this class (or
      * calling Application::setActiveTransaction()) can override the transaction
      * name.
      *
      * The constructor increments an internal counter
      * (Application::_activeTransactionGuard). The counter prevents any new
-     * active transaction being setup. It also prevents close (i.e. commits) the
-     * current active transaction until it reaches zero. It does not have any
-     * effect on aborting transaction, though.
+     * active transactions being setup. It also prevents to close
+     * (i.e. commits) the current active transaction until it reaches zero. It
+     * does not have any effect on aborting transactions though.
      */
     AutoTransaction(const char* name = nullptr, bool tmpName = false);
 
-    /** Destructor
+    /**
+     * @brief Destruct an auto transaction.
      *
      * This destructor decrease an internal counter
      * (Application::_activeTransactionGuard), and will commit any current
@@ -63,15 +70,19 @@ public:
      */
     ~AutoTransaction();
 
-    /** Close or abort the transaction
+    /**
+     * @brief Close or abort the transaction.
      *
      * This function can be used to explicitly close (i.e. commit) the
      * transaction, if the current transaction ID matches the one created inside
-     * the constructor. For aborting, it will abort any current transaction
+     * the constructor. For aborting, it will abort any current transaction.
+     *
+     * @param[in] abort: if true, abort the transaction; otherwise, commit it.
      */
     void close(bool abort = false);
 
-    /** Enable/Disable any AutoTransaction instance in the current stack
+    /**
+     * @brief Enable/Disable any AutoTransaction instance on the current stack.
      *
      * Once disabled, any empty temporary named transaction is closed. If there
      * are non-empty or non-temporary named active transaction, it will not be
@@ -79,6 +90,8 @@ public:
      *
      * This function may be used in, for example, Gui::Document::setEdit() to
      * allow a transaction live past any command scope.
+     *
+     * @param[in] enable: if true, enable the AutoTransaction; otherwise, disable it.
      */
     static void setEnable(bool enable);
 
@@ -87,47 +100,55 @@ private:
 };
 
 
-/** Helper class to lock a transaction from being closed or aborted.
+/**
+ * @brief Helper class to lock a transaction from being closed or aborted.
  *
- * The helper class is used to protect some critical transaction from being
+ * The helper class is used to protect some critical transactions from being
  * closed prematurely, e.g. when deleting some object.
  */
 class AppExport TransactionLocker
 {
 public:
-    /** Constructor
-     * @param lock: whether to activate the lock
+
+    /**
+     * @brief Construct a transaction locker.
+     *
+     * @param[in] lock: whether to activate the lock
      */
     TransactionLocker(bool lock = true);
 
-    /** Destructor
-     * Unlock the transaction is this locker is active
+    /**
+     * @brief Destruct a transaction locker.
+     *
+     * Unlock the transaction if this locker is active
      */
     ~TransactionLocker();
 
-    /** Activate or deactivate this locker
-     * @param enable: whether to activate the locker
+    /**
+     * @brief Activate or deactivate this locker.
      *
      * An internal counter is used to support recursive locker. When activated,
      * the current active transaction cannot be closed or aborted.  But the
      * closing call (Application::closeActiveTransaction()) will be remembered,
      * and performed when the internal lock counter reaches zero.
+     *
+     * @param enable: whether to activate the locker
      */
     void activate(bool enable);
 
-    /// Check if the locker is active
+    /// Check if the locker is active.
     bool isActive() const
     {
         return active;
     }
 
-    /// Check if transaction is being locked
+    /// Check if transaction is being locked.
     static bool isLocked();
 
     friend class Application;
 
 public:
-    /// Private new operator to prevent heap allocation
+    /// Delete the new operator to prevent heap allocation.
     void* operator new(std::size_t) = delete;
 
 private:

src/App/ComplexGeoData.cpp

@@ -199,12 +199,12 @@ const std::string& ComplexGeoData::elementMapPrefix()
 
 std::string ComplexGeoData::getElementMapVersion() const
 {
-    return "4";
+    return "5";
 }
 
 bool ComplexGeoData::checkElementMapVersion(const char* ver) const
 {
-    return !boost::equals(ver, "3") && !boost::equals(ver, "4") && !boost::starts_with(ver, "3.");
+    return !boost::ends_with(ver, "5");
 }
 
 size_t ComplexGeoData::getElementMapSize(bool flush) const

src/App/ComplexGeoData.h

@@ -279,7 +279,7 @@ public:
         return _elementMap->setElementName(element, name, masterTag, sid, overwrite);
     }
 
-    bool hasElementMap()
+    bool hasElementMap() const
     {
         return _elementMap != nullptr;
     }

src/App/Datums.cpp

@@ -179,10 +179,15 @@ App::DatumElement* LocalCoordinateSystem::getDatumElement(const char* role) cons
     if (featIt != features.end()) {
         return static_cast<App::DatumElement*>(*featIt);
     }
-    std::stringstream err;
-    err << "LocalCoordinateSystem \"" << getFullName() << "\" doesn't contain feature with role \""
-        << role << '"';
-    throw Base::RuntimeError(err.str().c_str());
+    // During restore, if role lookup fails (e.g. timing issues or fallback to internal name),
+    // we suppress the error. The default getSubObject will try to resolve it by Internal Name next.
+    if (!getDocument()->testStatus(App::Document::Restoring)) {
+        std::stringstream err;
+        err << "LocalCoordinateSystem \"" << getFullName()
+            << "\" doesn't contain feature with role \"" << role << '"';
+        throw Base::RuntimeError(err.str().c_str());
+    }
+    return nullptr;
 }
 
 App::Line* LocalCoordinateSystem::getAxis(const char* role) const