Use os.pathsep instead of hand-rolled equivalent

The ZIP installer now contains a `libs/bin` folder that contains
`ifcmerge`. Bonsai on `register()` adds this folder to the system `PATH`
for the current Blender session. Advantage of this is that we don't have
to fiddle with the registry on windows, or install files to
`~/.local/bin` on Linux, it _should_ work on Darwin, updates are
automatic, and we have a mechanism to ship other executables if
required.

(Note that ifcmerge.exe increases the size of the Windows Bonsai ZIP
download by about 7MB)

If Git isn't installed on Windows, the Git panel now offers to install
it from the Windows Package Manager Community Repository using `winget`.

.github/workflows/build_osx.yml

@@ -0,0 +1,138 @@
+name: Build IfcOpenShell OSX
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos
+            runner: macos-13
+            arch: x64
+            oldarch: 
+          - os: macos
+            runner: macos-14
+            arch: arm64
+            oldarch: m1
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Checkout Build Repository
+        uses: actions/checkout@v3
+        with:
+          repository: IfcOpenShell/build-outputs
+          path: ./build
+          ref: ${{ matrix.os }}-${{ matrix.arch }}
+          lfs: true
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+        
+      - name: Install Dependencies
+        run: |
+          brew update
+          brew install git bison autoconf automake libffi cmake findutils
+          echo "$(brew --prefix findutils)/libexec/gnubin" >> $GITHUB_PATH
+        
+      - name: Unpack Dependencies
+        run: |
+          install_root=$(find ./build -maxdepth 4 -name install)
+          find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \;
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: ${GITHUB_WORKFLOW}-${{ matrix.os }}
+
+      - name: Run Build Script
+        run: |
+          if [ "${{ matrix.os }}" == "macos" ]; then
+            DARWIN_C_SOURCE=-D_DARWIN_C_SOURCE
+          fi
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
+
+      - name: Pack Dependencies
+        run: |
+          cd build
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd build
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || true
+
+      - name: Package .zip archives
+        run: |
+          VERSION=v`cat VERSION`
+          cd ./build/`uname`/*/10.9/install/ifcopenshell
+          mkdir ~/output
+
+          ls -d python-* | while read py_version; do
+              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
+              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
+              py_version_major=python-${numbers}$postfix
+              pushd . > /dev/null
+              cd $py_version
+              if [ ! -d ifcopenshell ]; then
+                  mkdir ../ifcopenshell_
+                  mv * ../ifcopenshell_
+                  mv ../ifcopenshell_ ifcopenshell
+              fi
+              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
+              find ifcopenshell -name "*.pyc" -delete
+              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip ifcopenshell/*
+              mv *.zip ~/output
+              popd > /dev/null
+          done
+
+          cd bin
+          rm *.zip || true
+          ls | while read exe; do
+              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip $exe
+          done
+          mv *.zip ~/output
+          cd ..
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Overwrite aws cli
+        run: |
+          # Error: The `brew link` step did not complete successfully
+          # The formula built, but is not symlinked into /usr/local
+          # Could not symlink bin/idle3
+          # Target /usr/local/bin/idle3
+          # already exists. You may want to remove it:
+          #   rm '/usr/local/bin/idle3'
+          #
+          # To force the link and overwrite all conflicting files:
+          #   brew link --overwrite python@3.13
+          brew link --overwrite python@3.12
+          brew link --overwrite python@3.13
+          # https://github.com/rust-lang/rustup/pull/3989/files
+          brew install --overwrite awscli
+
+      - name: Upload .zip archives to S3
+        run: |
+          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive

.github/workflows/build_pyodide.yml

@@ -0,0 +1,54 @@
+name: Build IfcOpenShell WASM / Pyodide
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          path: IfcOpenShell
+
+      - name: Checkout Pyodide
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          repository: pyodide/pyodide
+          ref: '0.26.4'
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+          path: pyodide
+
+      - name: Build
+        run: |
+          VERSION=`cat IfcOpenShell/VERSION`
+          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/meta.yaml
+          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/setup.py
+          echo '#!/usr/bin/bash' > script.sh
+          echo 'cd pyodide' > script.sh
+          echo 'make && pip install ./pyodide-build' >> script.sh
+          echo 'cd ..' >> script.sh
+          echo 'mkdir -p packages/ifcopenshell' >> script.sh
+          echo 'cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell' >> script.sh
+          echo 'PYODIDE_ROOT=/src/pyodide \' >> script.sh
+          echo 'PATH=/src/pyodide/emsdk/emsdk:/src/pyodide/emsdk/emsdk/node/20.18.0_64bit/bin:/src/pyodide/emsdk/emsdk/upstream/emscripten:$PATH \' >> script.sh
+          echo 'pyodide build-recipes ifcopenshell --install' >> script.sh
+          chmod +x script.sh
+          sed -i s/--tty// pyodide/run_docker
+          pyodide/run_docker ./script.sh
+          mv dist/ifcopenshell-$VERSION-py3-none-any.whl dist/ifcopenshell-$VERSION+${GITHUB_SHA:0:7}-cp312-cp312-emscripten_3_1_58_wasm32.whl
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Upload .zip archives to S3
+        run: |
+          aws s3 cp dist s3://ifcopenshell-builds/ --recursive --exclude "*" --include "*.whl"

.github/workflows/build_rocky.yml

@@ -0,0 +1,115 @@
+name: Build IfcOpenShell Linux
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: ubuntu-20.04
+    container: rockylinux:8
+
+    steps:
+      - name: Install Dependencies
+        run: |
+          yum update -y
+          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
+                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
+                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
+                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
+                         findutils
+
+      - name: Install aws cli
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          ./aws/install
+          rm -rf awscliv2.zip aws
+          aws --version
+
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Checkout Build Repository
+        uses: actions/checkout@v3
+        with:
+          repository: IfcOpenShell/build-outputs
+          path: ./build
+          ref: rockylinux8-x64
+          lfs: true
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+
+      - name: Unpack Dependencies
+        run: |
+          install_root=$(find ./build -maxdepth 4 -name install)
+          find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \;
+
+      # Not supported on docker
+      # - name: ccache
+      #   uses: hendrikmuhs/ccache-action@v1
+      #   with:
+      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64
+
+      - name: Run Build Script
+        run: |
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
+
+      - name: Pack Dependencies
+        run: |
+          cd build
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd build
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || true
+
+      - name: Package .zip archives
+        run: |
+          VERSION=v`cat VERSION`
+          cd ./build/`uname`/*/install/ifcopenshell
+          mkdir ~/output
+
+          ls -d python-* | while read py_version; do
+              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
+              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
+              py_version_major=python-${numbers}$postfix
+              pushd . > /dev/null
+              cd $py_version
+              if [ ! -d ifcopenshell ]; then
+                  mkdir ../ifcopenshell_
+                  mv * ../ifcopenshell_
+                  mv ../ifcopenshell_ ifcopenshell
+              fi
+              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
+              find ifcopenshell -name "*.pyc" -delete
+              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip ifcopenshell/*
+              mv *.zip ~/output
+              popd > /dev/null
+          done
+
+          cd bin
+          rm *.zip || true
+          ls | while read exe; do
+              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip $exe
+          done
+          mv *.zip ~/output
+          cd ..
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Upload .zip archives to S3
+        run: |
+          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive

.github/workflows/build_win.yml

@@ -0,0 +1,122 @@
+name: Build IfcOpenShell Windows
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ['3.9.11', '3.10.3', '3.11.8', '3.12.1', '3.13.0']
+        arch: ['x64']
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Checkout Build Repository
+        uses: actions/checkout@v3
+        with:
+          repository: IfcOpenShell/build-outputs
+          path: _deps-vs2019-x64-installed
+          ref: windows-${{ matrix.arch }}
+          lfs: true
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+
+      - name: Install Dependencies
+        run: |
+          choco install -y sed 7zip.install awscli
+
+      - name: Install Python
+        run: |
+          $installer = "python-${{ matrix.python }}-amd64.exe"
+          $url = "https://www.python.org/ftp/python/${{ matrix.python }}/$installer"
+          Invoke-WebRequest -Uri $url -OutFile $installer
+          Start-Process -Wait -FilePath .\$installer -ArgumentList '/quiet InstallAllUsers=0 PrependPath=0 Include_test=0 TargetDir=C:\Python\${{ matrix.python }}'
+          Remove-Item .\$installer
+
+      - name: Unpack Dependencies
+        run: |
+          cd _deps-vs2019-x64-installed
+          Get-ChildItem -Path . -Filter 'cache-*.zip' | ForEach-Object {
+            7z x $_.FullName
+          }
+
+      - name: Run Build Script
+        shell: cmd
+        run: |
+          setlocal EnableDelayedExpansion
+          SET PYTHON_VERSION=${{ matrix.python }}
+          for /f "tokens=1,2,3 delims=." %%a in ("%PYTHON_VERSION%") do ( 
+              set PY_VER_MAJOR_MINOR=%%a%%b
+          )
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          SET IFCOS_INSTALL_PYTHON=FALSE
+          cd win
+          echo y | call build-deps.cmd vs2019-x64 Release
+          SET PYTHONHOME=C:\Python\${{ matrix.python }}
+          call run-cmake.bat vs2019-x64 -DENABLE_BUILD_OPTIMIZATIONS=On -DGLTF_SUPPORT=ON -DADD_COMMIT_SHA=ON -DVERSION_OVERRIDE=ON
+          call install-ifcopenshell.bat vs2019-x64 Release
+
+      - name: Pack Dependencies
+        run: |
+          cd _deps-vs2019-x64-installed
+          Get-ChildItem -Path . -Directory | ForEach-Object {
+            $cacheFile = "cache-$($_.Name).zip"
+            echo $cacheFile
+            if (!(Test-Path $cacheFile)) {
+              7z a $cacheFile $_.FullName
+            }
+          }
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd _deps-vs2019-x64-installed
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add *.zip
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || echo "Push failed"
+
+      - name: Package .zip Archives
+        run: |
+          $VERSION = 'v' + ((Get-Content VERSION).Trim())
+          $SHA = ${env:GITHUB_SHA}.Substring(0, 7)
+          $OUTPUT_DIR = "$env:USERPROFILE\output"
+          New-Item -ItemType Directory -Force -Path $OUTPUT_DIR
+
+          if ("${{ matrix.python }}" -eq "3.9.11") {
+            # only for the first python version the executables are assembled for upload
+            cd _installed-vs2019-x64/bin
+            Get-ChildItem -Path . | ForEach-Object {
+              echo $_
+              $exe = $_.Name
+              $baseName = $exe.Substring(0, $exe.Length - 4)
+              $zipName = "${baseName}-$VERSION-$SHA-win64.zip"
+              7z a $zipName $exe
+            }
+            mv *.zip $OUTPUT_DIR
+          }
+
+          $pyVersion = "${{ matrix.python }}"
+          $pyVersionMajor = ($pyVersion -split '\.')[0..1] -join ''
+          cd C:\Python\${{ matrix.python }}\Lib\site-packages
+          Remove-Item -Recurse -Force ifcopenshell\__pycache__ -ErrorAction SilentlyContinue
+          Get-ChildItem -Path ifcopenshell -Filter "*.pyc" -Recurse | Remove-Item -Force
+          $zipName = "ifcopenshell-python-$pyVersionMajor-$VERSION-$SHA-win64.zip"
+          7z a $zipName ifcopenshell
+          mv $zipName $OUTPUT_DIR
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Upload .zip Archives to S3
+        run: |
+          aws s3 cp $env:USERPROFILE\output s3://ifcopenshell-builds/ --recursive

.github/workflows/ci-bcf-pypi.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2 # https://github.com/actions/checkout
       - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
-          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
       - run: echo ${{ env.DATE }}
       - name: Get current date

.github/workflows/ci-bonsai-daily.yml

@@ -64,7 +64,10 @@ jobs:
         run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
       - name: Get current date
         id: date
-        run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+        # Include hours and minutes to release tag
+        # to avoid possibility of unstable repo's index.json
+        # pointing to the new file when index.json itself wasn't yet updated.
+        run: echo "date=$(date +'%y%m%d%H%M')" >> $GITHUB_OUTPUT
       - name: Compile
         run: |
           cd src/bonsai && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
@@ -101,7 +104,7 @@ jobs:
           set -x -e
 
           # Download Blender.
-          wget -q -O blender.tar.xz https://ftp.nluug.nl/pub/graphics/blender/release/Blender4.2/blender-4.2.0-linux-x64.tar.xz
+          wget -q -O blender.tar.xz https://ftp.nluug.nl/pub/graphics/blender/release/Blender4.3/blender-4.3.0-linux-x64.tar.xz
           tar -xf blender.tar.xz
 
           # Setup Blender.
@@ -144,9 +147,7 @@ jobs:
 
           # Install Sun Position extension.
           blender --online-mode --command extension sync
-          blender --online-mode --background --python-expr "import bpy; \
-          bpy.ops.extensions.package_install(repo_index=0, pkg_id='sun_position'); \
-          bpy.ops.preferences.addon_enable(module='bl_ext.blender_org.sun_position'); bpy.ops.wm.save_userpref()"
+          blender --online-mode --command extension install --enable --sync sun_position
 
           cd ../bonsai
           pip install pytest-blender

.github/workflows/ci-bonsai.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py310, py311, py312]
+        pyver: [py311, py312]
         config:
           - {
             name: "Windows Build",
@@ -32,15 +32,15 @@ jobs:
           }
           - {
             name: "Linux Build",
-            short_name: linux
+            short_name: linux,
           }
           - {
             name: "MacOS Build",
-            short_name: macos
+            short_name: macos,
           }
           - {
             name: "MacOS ARM Build",
-            short_name: macosm1
+            short_name: macosm1,
           }
     steps:
       - uses: actions/checkout@v2
@@ -53,8 +53,7 @@ jobs:
         run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
       - name: Compile
         run: |
-          cd src/bonsai &&
-          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
+          cd src/bonsai && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
       - name: Find zip file name
         id: find_zip
         run: |

.github/workflows/ci-ifcopenshell-docker.yml

@@ -93,7 +93,7 @@ jobs:
         lfs: true
     
     - name: Download 
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4.1.7
       with:
         # Artifact name
         name: ifcos-artifacts
@@ -116,6 +116,8 @@ jobs:
       with: 
         context: artifacts
         repository: aecgeeks/ifcopenshell
-        tags: aecgeeks/ifcopenshell:latest
+        # Since the dispatch is set to `tag`, `github.ref_name` should evaluate to the pushed tag
+        # On a workflow dispatch, `ref_name` will take on the value from the dispatch payload
+        tags: aecgeeks/ifcopenshell:${{ github.ref_name }}${{ github.ref_name == github.event.repository.default_branch && ',aecgeeks/ifcopenshell:latest' }}
         file: ./Dockerfile
         push: true

.github/workflows/ci.yml

@@ -15,6 +15,7 @@ on:
       - 'src/ifcparse/**'
       - 'src/ifcwrap/**'
       - 'src/qtviewer/**'
+      - 'src/svgfill/**'
       - 'src/serializers/**'
       - 'conda/**'
       - 'cmake/**'
@@ -126,6 +127,7 @@ jobs:
           python tests.py
           cd ../src/ifcopenshell-python
           mv ifcopenshell ifcopenshell-local # Force testing on installed module
+          pip install -e ../ifcpatch --no-deps # Needed for sql.py tests.
           make test
           cd ../bcf && make test
           pip install requests

.github/workflows/publish-pyodide-demo-app.yml

@@ -0,0 +1,48 @@
+name: Deploy Pyodide Demo App to GitHub Pages
+
+permissions:
+  id-token: write
+  pages: write
+
+on:
+  push:
+    paths:
+      - 'src/pyodide/**'
+      - '.github/workflows/publish-pyodide-demo-app.yml'
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+    - name: Set env
+      run: echo ok go
+      
+  build:
+    needs: activate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout (recursive)
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: src/pyodide/demo-app/
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -98,3 +98,5 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 
 # Brickschema
 src/bonsai/bonsai/bim/schema/Brick.ttl
+bonsaiDecoratorForLoads.code-workspace
+dev_environment.bat

.gitmodules

@@ -17,3 +17,9 @@
 [submodule "docs/cpp-api/assets/doxygen-awesome-css"]
 	path = docs/cpp-api/assets/doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
+[submodule "src/ifcopenshell-python/ifcopenshell/simple_spf"]
+	path = src/ifcopenshell-python/ifcopenshell/simple_spf
+	url = https://github.com/IfcOpenShell/step-file-parser
+[submodule "src/pyodide/demo-app/wheels"]
+	path = src/pyodide/demo-app/wheels
+	url = https://github.com/IfcOpenShell/wasm-wheels

README.md

@@ -12,7 +12,7 @@ is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending
 is possible at compile-time when using C++ and at run-time when using Python.
 
 In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application
-to convert IFC models to other formats), the ~~BlenderBIM~~ Bonsai Add-on (an add-on to Blender providing a graphical IFC authoring platform),
+to convert IFC models to other formats), Bonsai (an add-on to Blender providing a graphical IFC authoring platform),
 and many other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
 
 For more information, see:
@@ -24,8 +24,8 @@ For more information, see:
   * [IfcOpenShell Python Hello World Tutorial](https://docs.ifcopenshell.org/ifcopenshell-python/hello_world.html)
 * [Bonsai Website](https://bonsaibim.org)
 * [Bonsai Documentation](https://docs.bonsaibim.org/index.html)
-  * [Add-on Installation](https://docs.bonsaibim.org/users/installation.html)
-  * [Exploring an IFC model](https://docs.bonsaibim.org/users/exploring_an_ifc_model.html)
+  * [Add-on Installation](https://docs.bonsaibim.org/quickstart/installation.html)
+  * [Exploring an IFC model](https://docs.bonsaibim.org/quickstart/explore_model.html)
  
 Development is sponsored through your generous donations!
 
@@ -36,8 +36,8 @@ Contents
 
 | Name                      | Description                                                           | License             | Service |
 | ------------------------- | --------------------------------------------------------------------- | ------------------- | ------- |
-| bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) |
-| ~~blenderbim~~ Bonsai     | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=blenderbim-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=blenderbim&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
+| bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) [![Anaconda-Server Badge](https://anaconda.org/conda-forge/bcf-client/badges/version.svg)](https://anaconda.org/conda-forge/bcf-client) |
+| bonsai                    | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=bonsai-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=bonsai&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
 | bsdd                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bsdd?label=PyPI&color=006dad)](https://pypi.org/project/bsdd/) |
 | ifc2ca                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
 | ifc4d                     | Convert to and from IFC and project management software               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc4d?label=PyPI&color=006dad)](https://pypi.org/project/ifc4d/) |

VERSION

@@ -1 +1 @@
-0.7.11
+0.8.1

cmake/CMakeLists.txt

@@ -27,9 +27,11 @@ if(CCACHE_FOUND)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
 endif()
 
+add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
 cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0074 NEW)
-cmake_policy(SET CMP0078 OLD)
+cmake_policy(SET CMP0078 NEW)
 cmake_policy(SET CMP0086 NEW)
 if (POLICY CMP0144)
     cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables.
@@ -75,7 +77,7 @@ option(HDF5_SUPPORT "Enable HDF5 support (requires HDF5, zlib)" ON)
 option(WITH_PROJ "Enable output of Earth-Centered Earth-Fixed glTF output using the PROJ library" OFF)
 option(IFCXML_SUPPORT "Build IfcParse with ifcXML support (requires libxml2)." ON)
 option(USD_SUPPORT "Build IfcConvert with USD support (requires pixar's USD library)." OFF)
-option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." ON)
+option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." OFF)
 option(WITH_RELATIONSHIP_VALIDATION "Build IfcConvert with option to validate geometrical relationships." OFF)
 
 option(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
@@ -194,13 +196,25 @@ foreach(option_flag IN LISTS option_flags)
     convert_env_var_to_bool("${option_flag}")
 endforeach()
 
+set(CMAKE_FIND_ROOT_PATH_BACKUP "${CMAKE_FIND_ROOT_PATH}")
+
+macro(clear_wasm_sysroot)
 if(WASM_BUILD)
     # when using the nix/build-all.py build script we should not
     # look into the sysroot for most of the dependencies but rather
     # in the designated build/ folder created by the script.
-    set(CMAKE_FIND_ROOT_PATH_BACKUP "${CMAKE_FIND_ROOT_PATH}")
     set(CMAKE_FIND_ROOT_PATH "")
 endif()
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
+endmacro()
+
+macro(restore_wasm_sysroot)
+if(WASM_BUILD)
+    # reset to use sysroot
+    set(CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH_BACKUP}")
+endif()
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endmacro()
 
 if(WITH_CGAL)
     add_definitions(-DIFOPSH_WITH_CGAL)
@@ -221,7 +235,9 @@ endif()
 
 if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
     UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
+    clear_wasm_sysroot()
     find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
+    restore_wasm_sysroot()
     set(JSON_INCLUDE_DIR ${json_header_path})
 
     if(json_header_path)
@@ -328,13 +344,17 @@ if(USE_MMAP)
     add_definitions(-DUSE_MMAP)
 endif()
 
+clear_wasm_sysroot()
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+restore_wasm_sysroot()
 message(STATUS "Boost include files found in ${Boost_INCLUDE_DIRS}")
 message(STATUS "Boost libraries found in ${Boost_LIBRARY_DIRS}")
 
 if(NOT MINIMAL_BUILD)
     # libxml2 is required for IFCXML (optional) and SVGFILL (mandatory)
+    clear_wasm_sysroot()
     find_package(LibXml2 REQUIRED)
+    restore_wasm_sysroot()
 endif()
 
 if(IFCXML_SUPPORT)
@@ -350,6 +370,7 @@ if(BUILD_IFCGEOM)
     # Open CASCADE
     if(WITH_OPENCASCADE)
     if("${OCC_INCLUDE_DIR}" STREQUAL "")
+	clear_wasm_sysroot()
         find_path(OCC_INCLUDE_DIR Standard_Version.hxx
             PATHS
                 /usr/include/occt
@@ -357,6 +378,7 @@ if(BUILD_IFCGEOM)
                 /usr/include/opencascade
             REQUIRED
         )
+	restore_wasm_sysroot()
 
         if(OCC_INCLUDE_DIR)
             message(STATUS "Found Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
@@ -416,7 +438,9 @@ if(BUILD_IFCGEOM)
         message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
     endif()
 
+    clear_wasm_sysroot()
     find_library(libTKernel NAMES TKernel TKerneld PATHS ${OCC_LIBRARY_DIR} NO_DEFAULT_PATH)
+    restore_wasm_sysroot()
 
     if(libTKernel)
         message(STATUS "Required Open Cascade Library files found")
@@ -639,11 +663,6 @@ if(HDF5_SUPPORT)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_HDF5)
 endif(HDF5_SUPPORT)
 
-if(WASM_BUILD)
-    # reset to use sysroot
-    set(CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH_BACKUP}")
-endif()
-
 if(ENABLE_BUILD_OPTIMIZATIONS)
     if(MSVC)
         # NOTE: RelWithDebInfo and Release use O2 (= /Ox /Gl /Gy/ = Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy) by default,
@@ -730,6 +749,10 @@ if(MSVC)
     # endif()
 
 	add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
+	# See #5158.
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.40)
+		add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+	endif()
 else()
     add_definitions(-Wall -Wextra)
 
@@ -919,8 +942,10 @@ endif()
 
 if(BUILD_IFCGEOM)
     if(WITH_CGAL)
+	clear_wasm_sysroot()
         find_library(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
         find_library(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
+	restore_wasm_sysroot()
         if(NOT libGMP)
             message(FATAL_ERROR "Unable to find GMP library files, aborting")
         endif()
@@ -1045,10 +1070,19 @@ if(BUILD_CONVERT)
         target_include_directories(cityjson_converter PRIVATE ../src)
         set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} cityjson_converter)
 
+        install(TARGETS cityjson_converter
+            ARCHIVE DESTINATION ${LIBDIR}
+            LIBRARY DESTINATION ${LIBDIR}
+        )
+
         add_executable(cityjson_converter_exe ${CITYJSON_CONVERT_FILES})
         set_target_properties(cityjson_converter_exe PROPERTIES COMPILE_FLAGS "-DCITYJSON_EXECUTABLE")
         target_include_directories(cityjson_converter_exe PRIVATE ../src)
         target_link_libraries(cityjson_converter_exe ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
+
+        install(TARGETS cityjson_converter_exe
+            RUNTIME DESTINATION ${BINDIR}
+        )
     endif()
 
     # IfcConvert
@@ -1186,13 +1220,20 @@ install(TARGETS IfcParse
 )
 
 if(BUILD_IFCGEOM)
-    install(FILES ${IFCGEOM_H_FILES}
+    # install(FILES ${IFCGEOM_H_FILES}
+    #     DESTINATION ${INCLUDEDIR}/ifcgeom
+    # )
+
+    install(FILES ${SCHEMA_AGNOSTIC_H_FILES}
         DESTINATION ${INCLUDEDIR}/ifcgeom
     )
 
-    install(FILES ${SCHEMA_AGNOSTIC_H_FILES}
-        DESTINATION ${INCLUDEDIR}/ifcgeom_schema_agnostic
-    )
+    foreach(kernel ${GEOMETRY_KERNELS})
+        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
+         install(FILES ${IFCGEOM_H_FILES}
+            DESTINATION ${INCLUDEDIR}/ifcgeom/kernels/${kernel}
+        )
+    endforeach()
 
     install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom
         ARCHIVE DESTINATION ${LIBDIR}
@@ -1208,15 +1249,23 @@ if(BUILD_CONVERT)
         RUNTIME DESTINATION ${BINDIR}
     )
 
-    install(FILES ${SERIALIZERS_FILES}
+    install(FILES ${SERIALIZERS_H_FILES}
         DESTINATION ${INCLUDEDIR}/serializers/
     )
 
-    install(FILES ${SERIALIZERS_S_FILES}
+    install(FILES ${SERIALIZERS_S_H_FILES}
         DESTINATION ${INCLUDEDIR}/serializers/schema_dependent
     )
 endif(BUILD_CONVERT)
 
+if(BUILD_CONVERT OR BUILD_IFCPYTHON)
+    install(TARGETS geometry_serializer ${geometry_serializer_libraries}
+        ARCHIVE DESTINATION ${LIBDIR}
+        LIBRARY DESTINATION ${LIBDIR}
+        RUNTIME DESTINATION ${BINDIR}
+    )
+endif(BUILD_CONVERT OR BUILD_IFCPYTHON)
+
 # Cmake uninstall target
 if(NOT TARGET uninstall)
     configure_file(

nix/build-all.py

@@ -48,6 +48,10 @@
 #     on OS X El Capitan with homebrew:                                       #
 #          $ brew install git bison autoconf automake libffi cmake            #
 #                                                                             #
+#     on RHEL-related distros:                                                #
+#          $ yum install git gcc gcc-c++ autoconf bison make cmake            #
+#            mesa-libGL-devel libffi-devel fontconfig-devel bzip2             #
+#            automake patch                                                   #
 ###############################################################################
 import logging
 import os
@@ -78,11 +82,11 @@ PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")
 
-PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1"]
+PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1", "3.13.0"]
 JSON_VERSION = "v3.6.1"
 OCE_VERSION = "0.18.3"
-OCCT_VERSION = "7.5.3"
-BOOST_VERSION = "1.80.0"
+OCCT_VERSION = "7.8.1"
+BOOST_VERSION = "1.86.0"
 PCRE_VERSION = "8.41"
 LIBXML2_VERSION = "2.9.11"
 SWIG_VERSION = "4.0.2"
@@ -220,6 +224,7 @@ if "v" in flags:
 else:
     logger.setLevel(logging.INFO)
 
+OFF_ON = ["OFF", "ON"]
 BUILD_STATIC = "shared" not in flags
 ENABLE_FLAG = "--enable-static" if BUILD_STATIC else "--enable-shared"
 DISABLE_FLAG = "--disable-shared" if BUILD_STATIC else "--disable-static"
@@ -302,7 +307,7 @@ if platform.system() == "Darwin":
 BOOST_VERSION_UNDERSCORE = BOOST_VERSION.replace(".", "_")
 
 OCE_LOCATION = f"https://github.com/tpaviot/oce/archive/OCE-{OCE_VERSION}.tar.gz"
-BOOST_LOCATION = f"https://boostorg.jfrog.io/artifactory/main/release/{BOOST_VERSION}/source/"
+BOOST_LOCATION = f"https://github.com/boostorg/boost/releases/download/boost-{BOOST_VERSION}/"
 
 # Helper functions
 
@@ -331,7 +336,7 @@ def run_cmake(arg1, cmake_args, cmake_dir=None, cwd=None):
     if "wasm" in flags:
         wasm.append("emcmake")
         
-    run([*wasm, "cmake", P, *cmake_args, f"-DCMAKE_BUILD_TYPE={BUILD_CFG}"], cwd=cwd)
+    run([*wasm, "cmake", P, *cmake_args, f"-DCMAKE_BUILD_TYPE={BUILD_CFG}", f"-DBUILD_SHARED_LIBS={OFF_ON[not BUILD_STATIC]}"], cwd=cwd)
 
 
 def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
@@ -345,12 +350,15 @@ def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
         run([git, "clone", "--recursive", clone_url, target_dir])
     else:
         logger.info(f"directory '{target_dir}' already cloned. Pulling latest changes.")
+        run([git, "-C", target_dir, "fetch", "--all", "--tags"])
 
     # detect whether we are on a branch and pull
     if run([git, "rev-parse", "--abbrev-ref", "HEAD"], cwd=target_dir) != "HEAD":
         run([git, "pull", clone_url], cwd=target_dir)
 
     if revision != None:
+        run([git, "reset", "--hard"], cwd=target_dir)
+        run([git, "fetch", "--all"], cwd=target_dir)
         run([git, "checkout", revision], cwd=target_dir)
 
 
@@ -457,6 +465,9 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
         shutil.copytree(os.path.join(extract_dir, "boost"), os.path.join(DEPS_DIR, "install", f"boost-{BOOST_VERSION}", "boost"))
         logger.info(f"\rInstalled {name}     \n")
 
+    if "diskcleanup" in flags:
+        shutil.rmtree(build_dir, ignore_errors=True)
+
 cecho("Collecting dependencies:", GREEN)
 
 # Set compiler flags for 32bit builds on 64bit system
@@ -468,7 +479,7 @@ if platform.system() == "Darwin":
     ADDITIONAL_ARGS = [f"-mmacosx-version-min={TOOLSET}"] + ADDITIONAL_ARGS
 
 if "wasm" in flags:
-    ADDITIONAL_ARGS.extend(("-sWASM_BIGINT", "-fexceptions"))
+    ADDITIONAL_ARGS.extend(("-sWASM_BIGINT", "-fwasm-exceptions"))
 
 # If the linker supports GC sections, set it up to reduce binary file size
 # -fPIC is required for the shared libraries to work
@@ -517,7 +528,7 @@ if 'hdf5' in targets:
     # not supported
     orig = [os.environ[f] for f in compiler_flags]
     for f in compiler_flags:
-        os.environ[f] = re.sub("-flto(=\w+)?", "", os.environ[f])
+        os.environ[f] = re.sub(r"-flto(=\w+)?", "", os.environ[f])
 
     HDF5_MAJOR = ".".join(HDF5_VERSION.split(".")[:-1])
     build_dependency(
@@ -588,6 +599,12 @@ if USE_OCCT and "occ" in targets:
     if OCCT_VERSION == "7.7.1":
         patches.append("./patches/occt/no_ExpToCasExe.patch")
     
+    if OCCT_VERSION == "7.7.2":
+        patches.append("./patches/occt/no_ExpToCasExe_7_7_2.patch")
+
+    if OCCT_VERSION == "7.8.1":
+        patches.append("./patches/occt/no_ExpToCasExe_7_8_1.patch")
+    
     if "wasm" in flags:
         patches.append("./patches/occt/no_em_js.patch")
 
@@ -601,7 +618,7 @@ if USE_OCCT and "occ" in targets:
             "-DBUILD_RELEASE_DISABLE_EXCEPTIONS=Off",
             f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype"
         ],
-        download_url = "https://git.dev.opencascade.org/repos/occt.git",
+        download_url = "https://github.com/Open-Cascade-SAS/OCCT",
         download_name = "occt",
         download_tool=download_tool_git,
         patch=patches,
@@ -721,14 +738,16 @@ if "boost" in targets:
             "--with-thread",
             "--with-date_time",
             "--with-iostreams",
+            "--with-filesystem",
             f"link={LINK_TYPE}",
             *toolset,
             *map(str_concat("cxxflags"), CXXFLAGS.strip().split(' ')),
             *map(str_concat("linkflags"), LDFLAGS.strip().split(' ')),
             "stage", "-s", "NO_BZIP2=1"],
         download_url=BOOST_LOCATION,
-        patch="./patches/boost/boostorg_regex_62.patch",
-        download_name=f"boost_{BOOST_VERSION_UNDERSCORE}.tar.bz2"
+        # don't remember what this is, but fail on 1.86
+        # patch="./patches/boost/boostorg_regex_62.patch",
+        download_name=f"boost-{BOOST_VERSION}-b2-nodocs.tar.gz"
     )
     if "wasm" in flags:
         # only supported on nix for now
@@ -821,7 +840,6 @@ os.makedirs(IFCOS_DIR, exist_ok=True)
 executables_dir = os.path.join(IFCOS_DIR, "executables")
 os.makedirs(executables_dir, exist_ok=True)
 
-OFF_ON = ["OFF", "ON"]
 
 cmake_args = [
     "-DUSE_MMAP="                      "OFF",
@@ -963,7 +981,7 @@ if "IfcOpenShell-Python" in targets:
 
         logger.info(f"\rBuilding python {python_version} wrapper...   ")
 
-        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "_ifcopenshell_wrapper"], cwd=python_dir)
+        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "ifcopenshell_wrapper"], cwd=python_dir)
         run([make, "install/local"], cwd=os.path.join(python_dir, "ifcwrap"))
 
         if python_executable:
@@ -972,7 +990,11 @@ if "IfcOpenShell-Python" in targets:
             if platform.system() != "Darwin":
                 if BUILD_CFG == "Release":
                     # TODO: This symbol name depends on the Python version?
-                    run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", glob.glob(os.path.join(module_dir, "_ifcopenshell_wrapper*.so"))[0]], cwd=module_dir)
+                    so = glob.glob(os.path.join(module_dir, "_ifcopenshell_wrapper*.so"))[0]
+                    if "wasm" in flags:
+                        run(['wasm-strip', so, '-k', "dylink.0"])
+                    else:
+                        run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", so], cwd=module_dir)
 
             return module_dir
 

nix/patches/occt/no_ExpToCasExe_7_7_2.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1bacca1a48..11f931ad39 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -820,6 +820,8 @@ else()
+   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
+ endif()
+ 
++list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
++
+ # bison
+ if (BUILD_YACCLEX)
+   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")

nix/patches/occt/no_ExpToCasExe_7_8_1.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 86905287dc..9d0bce984c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -828,6 +828,8 @@ else()
+   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
+ endif()
+ 
++list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
++
+ # bison
+ if (BUILD_YACCLEX)
+   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")

pyodide/meta.yaml

@@ -3,11 +3,12 @@ package:
   version: 0.8.0
 
 source:
-  path: IfcOpenShell
+  path: ../../IfcOpenShell
 
 build:
   script: |
-    python nix/build-all.py --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py310 IfcOpenShell-Python
+    BUILD_CFG=Release python nix/build-all.py --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py312 IfcOpenShell-Python
+    mv package/ifcopenshell .
     cp pyodide/setup.py .
 
 about:

pyodide/setup.py

@@ -1,11 +1,11 @@
 from setuptools import setup, find_packages
 
-setup(name='IfcOpenShell',
+setup(name='ifcopenshell',
       version='0.8.0',
       description='IfcOpenShell is an open source (LGPL) software library for working with the Industry Foundation Classes (IFC) file format.',
       author='Thomas Krijnen',
       author_email='thomas@aecgeeks.com',
       url='http://ifcopenshell.org',
       packages=find_packages(),
-      package_data={'': ['*.so']},
+      package_data={'': ['*.so', '*.json']},
 )

pyproject.toml

@@ -4,7 +4,7 @@ include = '''
     src/(
         bcf
         |bcfserver
-        |blenderbim
+        |bonsai
         |bsdd
         |foundationserver
         |ifc2ca

src/bonsai/Makefile

@@ -66,7 +66,11 @@ BLENDER_PLATFORM:=linux-x64
 endif
 
 ifeq ($(PLATFORM), macos)
+ifeq ($(PYVERSION), py311)
 PYPI_PLATFORM:=--platform macosx_10_10_x86_64
+else
+PYPI_PLATFORM:=--platform macosx_10_13_x86_64
+endif
 BLENDER_PLATFORM:=macos-x64
 endif
 
@@ -81,9 +85,12 @@ BLENDER_PLATFORM:=windows-x64
 endif
 
 # Current build commit hash.
-OLD:=7e6607a
+OLD:=a2538fd
 .PHONY: bump
 bump:
+ifndef NEW
+	$(error ERROR: 'NEW' variable is not set (should be set with new commmit hash). Example use for 'bump' command: 'make bump NEW=0123456'.)
+endif
 	cd . && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
 	cd ../ifcopenshell-python/ && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
 
@@ -222,6 +229,17 @@ endif
 	# Required for Desktop icon and file association
 	cp -r bonsai/libs/desktop build/bonsai/libs/
 
+	# folder for executable files
+	mkdir -p build/bonsai/libs/bin
+
+	# required for three-way git merging
+ifeq ($(PLATFORM), win)
+	cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/2024-06-24/ifcmerge.zip
+	cd build/bonsai/libs/bin && unzip ifcmerge.zip && rm ifcmerge.zip
+else
+	cd build/bonsai/libs/bin && wget https://raw.githubusercontent.com/brunopostle/ifcmerge/main/ifcmerge && chmod +x ifcmerge
+endif
+
 	# Generate translations module for Bonsai build
 	git clone https://github.com/IfcOpenShell/bonsai-translations.git build/working
 	$(PYTHON) scripts/bonsai_translations.py -i "build/working" -o "build/bonsai"
@@ -267,36 +285,45 @@ endif
 	# See: https://projects.blender.org/blender/blender/issues/125091
 
 ifeq ($(PLATFORM), macosm1)
-	# Has universal and x86_64 builds.
-	prev_whl_name=$$(find build/bonsai/wheels/MarkupSafe-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
 	# Has universal and x86_64 builds.
 	prev_whl_name=$$(find build/bonsai/wheels/lxml-*.whl); \
 	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
 	mv "$$prev_whl_name" "$$whl_name";
 
 	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2/macosx_10_12_arm64/"); \
+	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_arm64/"); \
 	mv "$$prev_whl_name" "$$whl_name";
 
 	# Has only universal build.
 	prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
 	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
 	mv "$$prev_whl_name" "$$whl_name";
+
+	# has universal and x86_64 builds.
+	prev_whl_name=$$(find build/bonsai/wheels/fonttools-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	# Has only universal build.
+	prev_whl_name=$$(find build/bonsai/wheels/charset_normalizer-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
 endif
 ifeq ($(PLATFORM), macos)
+	# Has universal and arm64 builds.
+	prev_whl_name=$$(find build/bonsai/wheels/MarkupSafe-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
 	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2/macosx_10_9_x86_64/"); \
+	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \
 	mv "$$prev_whl_name" "$$whl_name";
 
 	prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
 	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
 	mv "$$prev_whl_name" "$$whl_name";
 
-	# has universal and amr64 builds.
-	prev_whl_name=$$(find build/bonsai/wheels/fonttools-*.whl); \
+	prev_whl_name=$$(find build/bonsai/wheels/charset_normalizer-*.whl); \
 	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
 	mv "$$prev_whl_name" "$$whl_name";
 endif
@@ -310,6 +337,12 @@ endif
 		exit 1; \
 	fi
 
+	# Temporary workaround for Blender not handling non-3.11 wheels #5743.
+	# Use '-n' as on macos x86-64 doesn't have a binary wheel and it autoincludes 'cp311'.
+	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/-cp39-/-cp$(PYNUMBER)-/"); \
+	mv -n "$$prev_whl_name" "$$whl_name";
+
 ifneq ($(PLATFORM), linux)
 	# Safeguard: in case one of `pip download` will break,
 	# it will produce a linux wheel for non-linux build (our github action machine is using linux).

src/bonsai/bonsai/__init__.py

@@ -56,7 +56,7 @@ bbim_semver: dict[str, Any] = {}
 
 # Accessed from bonsai dependency:
 last_error = None
-last_actions: deque = deque(maxlen=10)
+last_actions: deque = deque(maxlen=20)
 FIRST_INSTALLED_BBIM_VERSION: Union[str, None] = None
 REINSTALLED_BBIM_VERSION: Union[str, None] = None
 REGISTERED_BBIM_PACKAGE: str
@@ -317,7 +317,7 @@ if IN_BLENDER:
                     # But Blender currently doesn't support separate builds for different Python version,
                     # so those issues might still slip in.
                     box.label(text="Bonsai installed for wrong Python version.")
-                    box.label(text=f"Expected: {py}. Got: {binary_py}.")
+                    box.label(text=f"Expected binary version: {py}. Got: {binary_py}.")
                     # On reinstallation, dependencies versions doesn't change, so Blender will just ignore new dependencies.
                     # So, we need to make user will disable an extension (just uninstallation won't remove dependencies).
                     # Blender restart doesn't seem to be required in that case
@@ -325,11 +325,17 @@ if IN_BLENDER:
                     box.label(text="Try reinstalling with the correct Python version.")
                     box.label(text="Before reinstallation make sure to")
                     box.label(text="DISABLE Bonsai (uninstallation won't help).")
-                    box.label(text="You can download correct version below.")
+                    if py == "3.11":
+                        box.label(text="You can download correct version below.")
+                    else:
+                        box.label(text="Since you're using Python >3.11,")
+                        box.label(text="installation from Blender extensions platform")
+                        box.label(text="is not supported and you need to download")
+                        box.label(text="and install Bonsai from the link below.")
 
                 layout.operator("bim.copy_debug_information", text="Copy Error Message To Clipboard")
                 op = layout.operator("bim.open_uri", text="How Can I Fix This?")
-                op.uri = "https://docs.bonsaibim.org/users/troubleshooting.html#installation-issues"
+                op.uri = "https://docs.bonsaibim.org/guides/troubleshooting.html#installation-issues"
 
                 layout.label(text="Try Reinstalling:", icon="IMPORT")
                 op = layout.operator("bim.open_uri", text="Re-download Add-on")

src/bonsai/bonsai/bim/__init__.py

@@ -105,6 +105,7 @@ classes = [
     operator.ClippingPlaneCutWithCappings,
     operator.CloseBlendWarning,
     operator.CloseError,
+    operator.CopyTextToClipboard,
     operator.EditBlenderCollection,
     operator.FileAssociate,
     operator.FileUnassociate,
@@ -144,7 +145,7 @@ classes = [
     # Project overview
     ui.BIM_PT_tab_new_project_wizard,
     ui.BIM_PT_tab_project_info,
-    ui.BIM_PT_tab_spatial_decomposition,
+    ui.BIM_PT_tab_spatial,
     ui.BIM_PT_tab_project_setup,
     ui.BIM_PT_tab_geometry,
     ui.BIM_PT_tab_stakeholders,
@@ -190,6 +191,7 @@ classes = [
     # TODO: move this somewhere else and clean it up
     ui.BIM_PT_section_plane,
     ui.BIM_PT_section_with_cappings,
+    ui.BIM_PT_decorators_overlay,
 ]
 
 for mod in modules.values():
@@ -256,6 +258,10 @@ def register():
     icons = icon_preview
     bpy.app.translations.register("bonsai", translations_dict)
 
+    import bonsai.tool as tool
+
+    tool.Blender.ensure_bin_in_path()
+
 
 def unregister():
     global icons

src/bonsai/bonsai/bim/data/cache/.gitignore

@@ -1,2 +1,3 @@
 *
 !.gitignore
+!README.md

src/bonsai/bonsai/bim/data/cache/README.md

@@ -0,0 +1 @@
+This cache folder contains .h5 files. These files cache IFC geometry for performance only. You may safely clear the contents of this cache folder without losing data.