Space_at_origin_warning

.clang-tidy

@@ -1,4 +1,5 @@
 Checks:          'bugprone-*,cert-*,clang-analyzer-*,readability-*'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
+AnalyzeTemporaryDtors: false
 FormatStyle: none

.gersemirc

@@ -1,12 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/BlankSpruce/gersemi/0.24.0/gersemi/configuration.schema.json
-
-# Gersemi doesn't support autodetection of macros/functions from other files or from the current one
-# and requires to explicitly list directories/cmake files that define them.
-definitions: ["./cmake", "./src"]
-disable_formatting: false
-extensions: []
-indent: 4
-line_length: 120
-list_expansion: favour-inlining
-unsafe: false
-warn_about_unknown_commands: true

.github/dependabot.yml

@@ -6,7 +6,3 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/scripts/check-whitespace.py

@@ -1,377 +0,0 @@
-# /// script
-# dependencies = [
-#   "pytest",
-# ]
-# ///
-
-"""Check (and by default fix) whitespace issues in tracked source files:
-- stray CR, e.g. 'hello\\rworld' -> 'helloworld'
-- line ending mismatch, e.g. 'hello\\r\\n' -> 'hello\\n' (or vice versa)
-- missing newline at end of file
-- extra newline(s) at end of file
-- trailing whitespace at end of line
-"""
-
-import argparse
-import io
-import os
-import re
-import subprocess
-import sys
-from collections.abc import Callable
-from pathlib import Path
-from typing import BinaryIO, Literal, cast
-
-import pytest
-
-
-class C:
-    RED = "\033[31m"
-    GREEN = "\033[32m"
-    YELLOW = "\033[33m"
-    RESET = "\033[0m"
-
-
-CR = b"\r"
-CRLF = b"\r\n"
-LF = b"\n"
-
-LineSeparator = Literal[b"\r\n", b"\n"]
-SYSTEM_LINE_SEPARATOR = cast(LineSeparator, os.linesep.encode())
-
-
-class Checker:
-    def __init__(self, newline: LineSeparator = SYSTEM_LINE_SEPARATOR) -> None:
-        self.newline = newline
-        self.issues = 0
-
-    def report(self, label: str, issue: str) -> None:
-        self.issues += 1
-        print(f"{label}: {C.RED}{issue}{C.RESET}")
-
-    def check_stray_cr(self, filepath: Path, check: bool) -> None:
-        with filepath.open("r+b") as f:
-            self._check_stray_cr(f, str(filepath), check)
-
-    def _check_stray_cr(self, f: BinaryIO, label: str, check: bool) -> None:
-        # a CR is "stray" if it isn't immediately followed by a LF, i.e. not part of a CRLF pair
-        # CRLF/CR mismatch will be reported separately.
-        stray_cr = re.compile(rb"\r(?!\n)")
-
-        content = f.read()
-        matches = list(stray_cr.finditer(content))
-        if not matches:
-            return
-
-        line_numbers = dict.fromkeys(content.count(b"\n", 0, m.start()) + 1 for m in matches)
-        for line_number in line_numbers:
-            self.report(f"{label}:{line_number}", "stray carriage return")
-        if check:
-            return
-
-        f.seek(0)
-        f.write(stray_cr.sub(b"", content))
-        f.truncate()
-
-    def check_line_endings_mismatch(self, filepath: Path, check: bool) -> None:
-        with filepath.open("r+b") as f:
-            self._check_line_endings_mismatch(f, str(filepath), check)
-
-    def _check_line_endings_mismatch(self, f: BinaryIO, label: str, check: bool) -> None:
-        NEWLINE = self.newline
-
-        def get_line_ending(line: bytes) -> LineSeparator | None:
-            if line.endswith(CRLF):
-                return CRLF
-            if line.endswith(LF):
-                return LF
-            # last line with no trailing newline at all; check_eof_newline handles that
-            return None
-
-        changed = False
-        fixed_lines = []
-        for line_number, line in enumerate(f, start=1):
-            found = get_line_ending(line)
-            if found in (NEWLINE, None):
-                fixed_lines.append(line)
-                continue
-
-            self.report(f"{label}:{line_number}", f"line ending mismatch (expected {NEWLINE!r}, found {found!r})")
-            changed = True
-            content = line[: -len(found)]
-            fixed_lines.append(content + NEWLINE)
-
-        if changed and not check:
-            f.seek(0)
-            f.write(b"".join(fixed_lines))
-            f.truncate()
-
-    def check_eof_newline(self, filepath: Path, check: bool) -> None:
-        with filepath.open("r+b") as f:
-            self._check_eof_newline(f, str(filepath), check)
-
-    def _check_eof_newline(self, f: BinaryIO, label: str, check: bool) -> None:
-        NEWLINE = self.newline
-        NEWLINE_SIZE = len(NEWLINE)
-
-        size = f.seek(0, os.SEEK_END)
-        if size == 0:
-            return
-
-        trailing_newlines = 0
-        while True:
-            pos = f.seek((-trailing_newlines - 1) * NEWLINE_SIZE, os.SEEK_END)
-            if f.read(NEWLINE_SIZE) != NEWLINE:
-                break
-            trailing_newlines += 1
-            if pos == 0:
-                break
-
-        if trailing_newlines == 0:
-            self.report(label, "missing newline at end of file")
-            if check:
-                return
-            f.seek(0, os.SEEK_END)
-            f.write(NEWLINE)
-        elif trailing_newlines > 1:
-            self.report(label, f"{trailing_newlines} trailing newlines at end of file")
-            if check:
-                return
-            f.truncate(size - (trailing_newlines - 1) * NEWLINE_SIZE)
-
-    def check_trailing_whitespaces(self, filepath: Path, check: bool) -> None:
-        with filepath.open("r+b") as f:
-            self._check_trailing_whitespaces(f, str(filepath), check)
-
-    def _check_trailing_whitespaces(self, f: BinaryIO, label: str, check: bool) -> None:
-        NEWLINE = self.newline
-        NEWLINE_SIZE = len(NEWLINE)
-
-        changed = False
-        fixed_lines = []
-        for line_number, line in enumerate(f, start=1):
-            has_newline = line.endswith(NEWLINE)
-            content = line[:-NEWLINE_SIZE] if has_newline else line
-            stripped = content.rstrip()
-            if stripped != content:
-                self.report(f"{label}:{line_number}", "trailing whitespace")
-                changed = True
-            fixed_lines.append(stripped + (NEWLINE if has_newline else b""))
-
-        if changed and not check:
-            f.seek(0)
-            f.write(b"".join(fixed_lines))
-            f.truncate()
-
-
-CheckMethod = Callable[[Checker, BinaryIO, str, bool], None]
-
-
-class TestChecker:
-    def _assert_check(
-        self,
-        method: CheckMethod,
-        content: bytes,
-        expected_issues: int,
-        fixed: bytes,
-        check: bool,
-        line_ending: LineSeparator,
-        *,
-        transform: bool = True,
-    ) -> None:
-        checker = Checker(line_ending)
-        if line_ending == CRLF and transform:
-            content = content.replace(LF, CRLF)
-            fixed = fixed.replace(LF, CRLF)
-        buffer = io.BytesIO(content)
-        method(checker, buffer, "test", check)
-        assert buffer.getvalue() == (content if check else fixed)
-        assert checker.issues == expected_issues
-
-    @pytest.mark.parametrize(
-        ("content", "expected_issues", "fixed"),
-        (
-            # OK
-            (b"", 0, b""),
-            (b"hello\n", 0, b"hello\n"),
-            (b"line1\r\nline2\n", 0, b"line1\r\nline2\n"),
-            # ERR
-            (b"hello\rworld\n", 1, b"helloworld\n"),
-            (b"a\rb\rc\n", 1, b"abc\n"),
-            (b"hello\r", 1, b"hello"),
-        ),
-    )
-    @pytest.mark.parametrize("check", [False, True])
-    def test_check_stray_cr(self, content: bytes, expected_issues: int, fixed: bytes, check: bool) -> None:
-        # Don't parametrize by line endings, since in this case it doesn't matter.
-        self._assert_check(Checker._check_stray_cr, content, expected_issues, fixed, check, LF)
-
-    @pytest.mark.parametrize(
-        ("content", "expected_issues", "fixed", "line_ending"),
-        (
-            # OK
-            (b"", 0, b"", LF),
-            (b"hello\n", 0, b"hello\n", LF),
-            (b"hello\r\n", 0, b"hello\r\n", CRLF),
-            # ERR
-            (b"hello\r\n", 1, b"hello\n", LF),
-            (b"a\nb\r\nc\n", 1, b"a\nb\nc\n", LF),
-            (b"a\r\nb\r\n", 2, b"a\nb\n", LF),
-            (b"hello\n", 1, b"hello\r\n", CRLF),
-            (b"a\r\nb\nc\r\n", 1, b"a\r\nb\r\nc\r\n", CRLF),
-        ),
-    )
-    @pytest.mark.parametrize("check", [False, True])
-    def test_check_line_endings_mismatch(
-        self, content: bytes, expected_issues: int, fixed: bytes, line_ending: LineSeparator, check: bool
-    ) -> None:
-        self._assert_check(
-            Checker._check_line_endings_mismatch, content, expected_issues, fixed, check, line_ending, transform=False
-        )
-
-    @pytest.mark.parametrize(
-        ("content", "expected_issues", "fixed"),
-        (
-            # OK
-            (b"", 0, b""),
-            (b"hello\n", 0, b"hello\n"),
-            # ERR
-            (b"hello", 1, b"hello\n"),
-            (b"hello\n\n\n", 1, b"hello\n"),
-            (b"\n\n\n", 1, b"\n"),
-        ),
-    )
-    @pytest.mark.parametrize("check", [False, True])
-    @pytest.mark.parametrize("line_ending", [LF, CRLF])
-    def test_check_eof_newline(
-        self, content: bytes, expected_issues: int, fixed: bytes, check: bool, line_ending: LineSeparator
-    ) -> None:
-        self._assert_check(Checker._check_eof_newline, content, expected_issues, fixed, check, line_ending)
-
-    @pytest.mark.parametrize(
-        ("content", "expected_issues", "fixed"),
-        (
-            # OK
-            (b"", 0, b""),
-            (b"hello\n", 0, b"hello\n"),
-            (b"hello", 0, b"hello"),
-            # ERR
-            (b" ", 1, b""),
-            (b"hello ", 1, b"hello"),
-        ),
-    )
-    @pytest.mark.parametrize("check", [False, True])
-    @pytest.mark.parametrize("line_ending", [LF, CRLF])
-    def test_check_trailing_whitespaces(
-        self, content: bytes, expected_issues: int, fixed: bytes, check: bool, line_ending: LineSeparator
-    ) -> None:
-        self._assert_check(Checker._check_trailing_whitespaces, content, expected_issues, fixed, check, line_ending)
-
-    @staticmethod
-    def run_tests(extra_args: list[str] | None = None) -> None:
-        pytest.main([__file__, *(extra_args or [])])
-
-
-def existing_path(value: str) -> Path:
-    path = Path(value)
-    if not path.exists():
-        raise argparse.ArgumentTypeError(f"path not found: {value}")
-    return path
-
-
-# Python files are covered by `black`.
-PATTERNS = (
-    "*.cpp",
-    "*.h",
-    "*.i",
-)
-
-REPO_ROOT = Path(subprocess.check_output(["git", "rev-parse", "--show-toplevel"], text=True).strip())
-
-# Generated files; formatted by the express codegen, not by this script.
-IGNORED_DIRS = (REPO_ROOT / "src/ifcparse/schemas",)
-
-
-def get_tracked_files(root: Path | None = None) -> list[Path]:
-    output = subprocess.check_output(
-        ["git", "ls-files", "--others", "--cached", "--exclude-standard", *PATTERNS],
-        cwd=root,
-        text=True,
-    )
-    base = root if root is not None else Path()
-    filepaths = []
-    for line in output.splitlines():
-        filepath = base / line
-        if not any(filepath.resolve().is_relative_to(d) for d in IGNORED_DIRS):
-            filepaths.append(filepath)
-    return filepaths
-
-
-def main() -> int:
-    # anything after "--" is forwarded to pytest, e.g. `--test -- --capture=no`
-    argv = sys.argv[1:]
-    if "--" in argv:
-        split = argv.index("--")
-        argv, extra_args = argv[:split], argv[split + 1 :]
-    else:
-        extra_args = []
-
-    parser = argparse.ArgumentParser(
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        description=__doc__,
-    )
-    parser.add_argument("paths", type=existing_path, nargs="*", help="files or directories to check")
-    parser.add_argument(
-        "--check",
-        action="store_true",
-        help="only check for whitespace issues without applying fixes",
-    )
-    parser.add_argument(
-        "--test",
-        action="store_true",
-        help="run self-tests",
-    )
-    parser.add_argument(
-        "--verbose",
-        action="store_true",
-        help="print each checked path",
-    )
-    args = parser.parse_args(argv)
-
-    if args.test:
-        TestChecker.run_tests(extra_args)
-        return 0
-
-    if args.paths:
-        filepaths: list[Path] = []
-        for path in args.paths:
-            filepaths.extend(get_tracked_files(path) if path.is_dir() else [path])
-    else:
-        filepaths = get_tracked_files()
-
-    # dict.fromkeys() dedupes while preserving order, unlike set().
-    filepaths = list(dict.fromkeys(filepaths))
-
-    checker = Checker()
-    for filepath in filepaths:
-        if args.verbose:
-            print(f"checking {filepath}")
-        checker.check_stray_cr(filepath, args.check)
-        checker.check_line_endings_mismatch(filepath, args.check)
-        checker.check_eof_newline(filepath, args.check)
-        checker.check_trailing_whitespaces(filepath, args.check)
-    print(f"{len(filepaths)} file(s) checked.")
-    if not checker.issues:
-        color = C.GREEN
-    elif args.check:
-        color = C.RED
-    else:
-        color = C.YELLOW
-    outcome = "found" if args.check else "found and fixed"
-    print(f"{color}{checker.issues} issue(s) {outcome}.{C.RESET}")
-
-    return 1 if args.check and checker.issues else 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

.github/scripts/publish-bonsai-releases.py

@@ -1,95 +0,0 @@
-#!/usr/bin/env -S uv run
-# /// script
-# dependencies = [
-#     "PyGithub",
-#     "requests",
-# ]
-# ///
-
-import os
-from pathlib import Path
-
-import requests
-from github import Github
-from github.GitReleaseAsset import GitReleaseAsset
-
-EXTENSION_ID = "bonsai"
-CURRENT_PYTHON_VERSION = "py313"
-CURRENT_PLATFORMS = ["linux-x64", "macos-arm64", "windows-x64"]
-
-
-def publish_asset(asset: GitReleaseAsset, token: str, repo_root: Path) -> None:
-    """
-    Publish an asset to Blender Extensions.
-    Reference: https://extensions.blender.org/api/v1/swagger
-    """
-    temp_path = repo_root / asset.name
-
-    response = requests.get(asset.browser_download_url)
-    response.raise_for_status()
-    temp_path.write_bytes(response.content)
-
-    url = f"https://extensions.blender.org/api/v1/extensions/{EXTENSION_ID}/versions/upload/"
-    headers = {"Authorization": f"Bearer {token}"}
-
-    files = {"version_file": temp_path.read_bytes()}
-    response = requests.post(url, headers=headers, files=files)
-    response.raise_for_status()
-
-    temp_path.unlink()
-
-    print(f"✓ Published {asset.name}")
-
-
-def main() -> None:
-    token = os.getenv("BLENDER_EXTENSIONS_TOKEN")
-    if not token:
-        raise Exception("BLENDER_EXTENSIONS_TOKEN environment variable not set")
-
-    # Get the repository root
-    repo_root = Path(__file__).parent.parent.parent
-
-    # Read VERSION file
-    version_file = repo_root / "VERSION"
-    version = version_file.read_text().strip()
-
-    print(f"Current VERSION: {version}")
-
-    tag_name = f"bonsai-{version}"
-
-    # Get release from GitHub
-    gh = Github()
-    gh_repo = gh.get_repo("IfcOpenShell/IfcOpenShell")
-    release = gh_repo.get_release(tag_name)
-
-    assets = release.get_assets()
-
-    asset_platform_map: dict[str, tuple[GitReleaseAsset, str]] = {}
-    for asset in assets:
-        if CURRENT_PYTHON_VERSION not in asset.name:
-            continue
-        for platform in CURRENT_PLATFORMS:
-            if platform in asset.name:
-                asset_platform_map[asset.name] = (asset, platform)
-                break
-
-    if len(asset_platform_map) != len(CURRENT_PLATFORMS):
-        found_platforms = {platform for _, (_, platform) in asset_platform_map.items()}
-        missing_platforms = set(CURRENT_PLATFORMS) - found_platforms
-        raise Exception(
-            f"Expected {len(CURRENT_PLATFORMS)} assets but found {len(asset_platform_map)}. "
-            f"Missing: {', '.join(sorted(missing_platforms))}"
-        )
-
-    print("\nRelease assets:")
-    for asset_name in sorted(asset_platform_map.keys()):
-        print(f"- {asset_name}")
-
-    # https://extensions.blender.org/api/v1/swagger
-    print("\nPublishing assets to Blender Extensions:")
-    for asset_name, (asset, platform) in asset_platform_map.items():
-        publish_asset(asset, token, repo_root)
-
-
-if __name__ == "__main__":
-    main()

.github/workflows/black_to_github_annotations.py

@@ -1,41 +0,0 @@
-from __future__ import annotations
-
-import json
-import os
-import sys
-from typing import TypedDict
-
-import github_action_utils as gha_utils
-
-
-class Entry(TypedDict):
-    location: Location
-
-
-class Location(TypedDict):
-    path: str
-    lines: Lines
-
-
-class Lines(TypedDict):
-    begin: int
-    end: int
-
-
-json_data: list[Entry] = json.load(sys.stdin)
-
-if os.getenv("RUNNER_DEBUG"):
-    print("Debug: Black formatting JSON data:")
-    print(json.dumps(json_data, indent=2))
-
-for change in json_data:
-    location = change["location"]
-    path = location["path"]
-    lines = location["lines"]
-    gha_utils.error(
-        f"Black formatting issue in {path}",
-        title="Black Format Issue",
-        file=path,
-        line=lines["begin"],
-        end_line=lines["end"],
-    )

.github/workflows/build-bonsaiviewer-autodesk.yml

@@ -1,46 +0,0 @@
-# Lint/test gate for the bonsaiviewer-autodesk crate — nothing here ships.
-# The connector binary that reaches users is built by the platform pipelines
-# (build_rocky.yml, build_rocky_arm.yml, build_win.yml, build_osx.yml), each
-# of which runs packaging/build.py itself and bundles dist/autodesk/ into the
-# Bonsai Viewer archive.
-name: Test Bonsai Viewer Autodesk Connector
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - 'src/bonsaiviewer-autodesk/**'
-      - '.github/workflows/build-bonsaiviewer-autodesk.yml'
-  pull_request:
-    paths:
-      - 'src/bonsaiviewer-autodesk/**'
-      - '.github/workflows/build-bonsaiviewer-autodesk.yml'
-
-jobs:
-  test:
-    name: cargo-test
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        working-directory: src/bonsaiviewer-autodesk
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: dtolnay/rust-toolchain@stable
-
-      # cargo-target reuse across runs. Massive cold-build speedup,
-      # cheap on the GitHub Actions cache budget.
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: src/bonsaiviewer-autodesk
-
-      - name: cargo fmt --check
-        run: cargo fmt --all -- --check
-
-      - name: cargo clippy
-        run: cargo clippy --all-targets --all-features -- -D warnings
-
-      - name: cargo test
-        run: cargo test --all-features

.github/workflows/build_osx.yml

@@ -10,11 +10,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # x64 (Intel cross-compile) dropped while wgpu Qt is required:
-          # the runner is arm64 so `brew --prefix qt` returns the arm64
-          # prefix; we'd need a separate x86_64 Qt install under
-          # /usr/local to cross-build BonsaiViewer. Revisit if Intel-Mac
-          # demand resurfaces.
+          - os: macos
+            runner: macos-14
+            arch: x64
+            oldarch: 
           - os: macos
             runner: macos-14
             arch: arm64
@@ -22,12 +21,12 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           repository: IfcOpenShell/build-outputs
           path: ./build
@@ -35,27 +34,12 @@ jobs:
           lfs: true
           token: ${{ secrets.BUILD_REPO_TOKEN }}
 
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
-
       - name: Install Dependencies
         run: |
           brew update
           # preinstalled: xz, cmake
           brew install git bison autoconf automake libffi findutils
-          # qt brings in Qt6 + Svg; nix/build-all.py honours pre-set
-          # QT_DIR so BonsaiViewer doesn't try to aqtinstall (which is
-          # Linux-only).
-          brew install qt
           echo "$(brew --prefix findutils)/libexec/gnubin" >> $GITHUB_PATH
-          # Mac is using bison 2.5 by default, but we need 3.5+ for swig.
-          echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
-
-      # The bonsaiviewer-autodesk connector is a Rust crate; the "Package
-      # .zip archives" step below runs `cargo build --release` via
-      # packaging/build.py. Match the dedicated connector workflow's stable
-      # toolchain, rather than whatever Rust the runner image happens to ship.
-      - uses: dtolnay/rust-toolchain@stable
 
       - name: Install aws cli
         run: |
@@ -63,11 +47,11 @@ jobs:
 
       - name: Unpack Dependencies
         run: |
-          cd build
-          uv run ../nix/cache_dependencies.py unpack
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: mac-${{ matrix.arch }}
 
@@ -91,26 +75,13 @@ jobs:
             /usr/local/bin/brew install gettext openssl
           fi
           set -o pipefail
-          export QT_DIR="$(brew --prefix qt)"
-          # --shared mirrors build_rocky.yml after 27249770e: builds
-          # IfcOpenShell as shared libs so each plug-in dylib references
-          # libIfcParse / libIfcGeom via @rpath instead of statically
-          # embedding them — the dominant size win for BonsaiViewer.app
-          # (per-plugin libs go from ~30-50 MB to a few MB).
-          #
-          # IfcOpenShell-Python is back on after the ifcwrap rpath fix:
-          # INSTALL_RPATH "$ORIGIN" is a Linux-ism that macOS dyld bakes
-          # in as a literal string, so `@rpath/ifcopenshell.document.rdb
-          # .dylib` failed to resolve at import time. ifcwrap now sets
-          # INSTALL_RPATH to "@loader_path" on Apple.
           CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release \
-            BUILD_BONSAIVIEWER=ON QT_DIR="${QT_DIR}" \
-            uv run ./nix/build-all.py -v --diskcleanup --ifcopenshell-shared ${MAC_INTEL} \
+            python3 ./nix/build-all.py -v --diskcleanup ${MAC_INTEL} \
             | tee build.log
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: build-logs-osx-${{ matrix.arch }}
           path: |
@@ -122,7 +93,9 @@ jobs:
       - name: Pack Dependencies
         run: |
           cd build
-          uv run ../nix/cache_dependencies.py pack
+          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: |
@@ -136,28 +109,8 @@ jobs:
       - name: Package .zip archives
         run: |
           VERSION=v`cat VERSION`
-          # packaging/build.py stages the connector binary + connector.json
-          # into dist/autodesk/; the .app loop below copies that folder into
-          # the bundle. Same on-disk shape as the Linux and Windows builds.
-          uv run src/bonsaiviewer-autodesk/packaging/build.py
-          autodesk_connector_dir="$PWD/src/bonsaiviewer-autodesk/dist/autodesk"
-          test -d "$autodesk_connector_dir"
-
           cd ./build/`uname`/*/10.15/install/ifcopenshell
-          mkdir -p ~/output
-          install_root="$PWD"
-
-          stage_runtime_payload() {
-              dest="$1"
-              while IFS= read -r runtime_file; do
-                  cp -L "$runtime_file" "$dest/"
-              done < <(
-                  for runtime_dir in "$install_root/bin" "$install_root/lib" "$install_root/lib64"; do
-                      [ -d "$runtime_dir" ] || continue
-                      find "$runtime_dir" -type f \( -name "*.so" -o -name "*.so.*" -o -name "*.dylib" -o -name "*.dll" \)
-                  done
-              )
-          }
+          mkdir ~/output
 
           ls -d python-* | while read py_version; do
               postfix=`echo ${py_version: -1} | sed s/[0-9]//`
@@ -172,45 +125,21 @@ jobs:
               fi
               [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
               find ifcopenshell -name "*.pyc" -delete
-              stage_runtime_payload ifcopenshell
-              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip ifcopenshell
+              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
 
-          find "$install_root/bin" -maxdepth 1 -type f -perm /111 ! -name "*.zip" ! -name "*.so" ! -name "*.so.*" ! -name "*.dylib" ! -name "*.dll" | while read exe_path; do
-              exe=`basename "$exe_path"`
-              package_dir="$install_root/.package-${exe}"
-              rm -rf "$package_dir"
-              mkdir -p "$package_dir"
-              cp "$exe_path" "$package_dir/"
-              stage_runtime_payload "$package_dir"
-              pushd "$package_dir" > /dev/null
-              zip -qq -r "$HOME/output/${exe}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip" .
-              popd > /dev/null
-              rm -rf "$package_dir"
-          done
-
-          # .app bundles (e.g. BonsaiViewer.app) live at the install-prefix
-          # root because their install rule uses `BUNDLE DESTINATION "."` —
-          # that's the layout Qt's macdeployqt expects. macdeployqt has
-          # already embedded the Qt frameworks inside each bundle during
-          # install/strip, so the only thing left to stage is the connector.
-          find "$install_root" -maxdepth 1 -type d -name "*.app" | while read app_path; do
-              app=`basename "$app_path" .app`
-              if [ "$app" = "BonsaiViewer" ]; then
-                  # ConnectorDiscovery looks in applicationDirPath()/connectors,
-                  # which for a bundle is Contents/MacOS.
-                  mkdir -p "$app_path/Contents/MacOS/connectors"
-                  cp -a "$autodesk_connector_dir" "$app_path/Contents/MacOS/connectors/"
-              fi
-              pushd "$install_root" > /dev/null
-              zip -qq -r "$HOME/output/${app}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip" "$(basename "$app_path")"
-              popd > /dev/null
+          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@v6
+        uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}

.github/workflows/build_pyodide.yml

@@ -8,21 +8,14 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
-
-      - name: Install Python
-        # Installs latest Python version so it's preferred by uv over system Python.
-        run: uv python install
-
       - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           path: IfcOpenShell
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           repository: IfcOpenShell/build-outputs
           path: ifcopenshell_build
@@ -33,10 +26,10 @@ jobs:
       - name: Unpack Dependencies
         run: |
           cd ifcopenshell_build
-          uv run ../IfcOpenShell/nix/cache_dependencies.py unpack
+          python ../IfcOpenShell/pyodide/cache_dependencies.py unpack
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: ubuntu-22.04-${{ runner.arch }}
 
@@ -49,17 +42,30 @@ jobs:
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: build-logs-pyodide
           path: |
             ifcopenshell_build/*/*/logs/*.log
           retention-days: 30
 
+      - name: Run wheel tests
+        run: |
+          cp -r IfcOpenShell/pyodide/test test
+          # venv set up in build_pyodide.sh.
+          source .venv/bin/activate
+          uv pip install pytest-pyodide
+          PYODIDE_ROOT_DIST=`pyodide config get pyodide_root`/dist
+          # `pytest-pyodide` requires pyodide in 'pyodide' directory in cwd, when running `pytest`.
+          cp -r $PYODIDE_ROOT_DIST test/pyodide
+          cp dist/ifcopenshell-*.whl test/pyodide
+          cd test
+          pytest --capture=no
+
       - name: Pack Dependencies
         run: |
           cd ifcopenshell_build
-          uv run ../IfcOpenShell/nix/cache_dependencies.py pack
+          python ../IfcOpenShell/pyodide/cache_dependencies.py pack
 
       - name: Commit and Push Changes to Build Repository
         run: |
@@ -70,30 +76,8 @@ jobs:
           git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
           git push || echo "Push failed"
 
-      - name: Order wheel shared objects
-        run: |
-          uv run ./IfcOpenShell/pyodide/order_pyodide_wheel_shared_objects.py dist/ifcopenshell-*.whl
-
-      - name: Split packages
-        run: |
-          VERSION=v`cat ./IfcOpenShell/VERSION`
-          mkdir -p dist-modular
-          uv run ./IfcOpenShell/pyodide/split_pyodide_ifcopenshell_wheel.py dist/ifcopenshell-*.whl ./dist-modular
-          cd dist-modular
-          zip -r -qq ifcopenshell-modular-${VERSION}-${GITHUB_SHA:0:7}-pyodide.zip *.whl
-
-      - name: Run wheel tests
-        run: |
-          # venv set up in build_pyodide.sh.
-          source .venv/bin/activate
-          ln -s "$PWD/dist" IfcOpenShell/dist
-          ln -s "$PWD/dist-modular" IfcOpenShell/dist-modular
-          cd IfcOpenShell/pyodide
-          ./run_pytest.py setup
-          ./run_pytest.py run
-
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
@@ -102,4 +86,3 @@ jobs:
       - name: Upload .zip archives to S3
         run: |
           aws s3 cp dist s3://ifcopenshell-builds/ --recursive --exclude "*" --include "*.whl"
-          aws s3 cp dist-modular s3://ifcopenshell-builds/ --recursive --exclude "*" --include "*.zip"

.github/workflows/build_rocky.yml

@@ -6,42 +6,20 @@ on:
 jobs:
   build_ifcopenshell:
     runs-on: ubuntu-22.04
-    container: rockylinux:9
+    container: rockylinux:8
 
     steps:
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
-
-      - name: Install Python
-        # Installs latest Python version so it's preferred by uv over Rocky's system Python.
-        run: uv python install
-
       - name: Install Dependencies
         run: |
-          dnf update -y
-          dnf install -y epel-release
-          # --enablerepo=crb: libstdc++-static (libsupc++.a, needed by the
-          # bundled FLTK link) lives in Rocky's CodeReady Builder repo, which
-          # is disabled by default.
-          dnf install -y --enablerepo=crb gcc gcc-c++ git autoconf automake bison make zip cmake \
+          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 xz byacc patchelf libxkbcommon-devel                 \
-                         dbus-devel \
-                         libXext-devel libXinerama-devel libXcursor-devel libXrender-devel \
-                         libXfixes-devel libXft-devel pango-devel cairo-devel libstdc++-static
+                         findutils xz byacc
+          python3 -m pip install typing_extensions
           git config --global --add safe.directory '*'
 
-      - name: Install Rust
-        # The bonsaiviewer-autodesk connector is a Rust crate; the "Package
-        # .zip archives" step below runs `cargo build --release` via
-        # packaging/build.py. Match the dedicated connector workflow's stable
-        # toolchain (dtolnay/rust-toolchain@stable).
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-
       - name: Install aws cli
         run: |
           curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
@@ -51,41 +29,39 @@ jobs:
           aws --version
 
       - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           repository: IfcOpenShell/build-outputs
           path: ./build
-          ref: rockylinux9-x64
+          ref: rockylinux8-x64
           lfs: true
           token: ${{ secrets.BUILD_REPO_TOKEN }}
 
       - name: Unpack Dependencies
         run: |
-          cd build
-          uv run ../nix/cache_dependencies.py unpack
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        # TODO: Use tag after 1.2.20 releases.
+        uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639
         with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux9
+          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
 
       - name: Run Build Script
         shell: bash
         run: |
           set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3" ADD_COMMIT_SHA=1 BUILD_CFG=Release BUILD_BONSAIVIEWER=ON \
-            uv run --with aqtinstall ./nix/build-all.py \
-            -v --diskcleanup --ifcopenshell-shared 2>&1 \
-            | tee build.log
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: build-logs-rocky
           path: |
@@ -96,7 +72,9 @@ jobs:
       - name: Pack Dependencies
         run: |
           cd build
-          uv run ../nix/cache_dependencies.py pack
+          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: |
@@ -108,131 +86,11 @@ jobs:
           git push || true
 
       - name: Package .zip archives
-        shell: bash
         run: |
           VERSION=v`cat VERSION`
-          # bonsaiviewer-autodesk is now a Rust connector. packaging/build.py
-          # invokes `cargo build --release` and stages the binary +
-          # connector.json into dist/autodesk/. Same on-disk shape as the
-          # old PyInstaller flow so the symlink + zip steps below
-          # continue to work unchanged.
-          uv run src/bonsaiviewer-autodesk/packaging/build.py
-          autodesk_connector_dir="$PWD/src/bonsaiviewer-autodesk/dist/autodesk"
-          test -d "$autodesk_connector_dir"
-
           cd ./build/`uname`/*/install/ifcopenshell
-          mkdir -p ~/output
-          install_root="$PWD"
-          QT6_VERSION="${QT6_VERSION:-6.8.3}"
+          mkdir ~/output
 
-          if [ -z "${QT_DIR:-}" ]; then
-              for qt_candidate in "$(dirname "$install_root")"/qt6-${QT6_VERSION}-*/${QT6_VERSION}/*; do
-                  if [ -d "$qt_candidate/lib" ]; then
-                      QT_DIR="$qt_candidate"
-                      break
-                  fi
-              done
-          fi
-
-          # Ensure that all shared libraries in provided dest `$1`
-          # are present using their SONAMEs (at least as symlinks).
-          ensure_soname_links() {
-              dest="$1"
-              find "$dest" -maxdepth 1 -type f -name "*.so*" | while IFS= read -r shared_object; do
-                  # TODO: actual pattern is "Library soname" instead of "Shared library"?
-                  soname=$(readelf -d "$shared_object" 2>/dev/null | sed -n 's/.*(SONAME).*Shared library: \[\(.*\)\].*/\1/p' | head -n 1)
-                  [ -n "$soname" ] || continue
-                  [ -e "$dest/$soname" ] && continue
-                  ln -s "$(basename "$shared_object")" "$dest/$soname"
-              done
-          }
-
-          # Copy all libs from `install/ifcopenshell` to the provided `$1`.
-          # Set `$2` to `0` to skip including geometry writers.
-          stage_runtime_payload() {
-              dest="$1"
-              include_geometry_writers="${2:-1}"
-              while IFS= read -r runtime_file; do
-                  if [ "$include_geometry_writers" != "1" ] && [[ "$(basename "$runtime_file")" == ifcopenshell.geometry.writer.* ]]; then
-                      continue
-                  fi
-                  cp -P "$runtime_file" "$dest/"
-              done < <(
-                  for runtime_dir in "$install_root/bin" "$install_root/lib" "$install_root/lib64"; do
-                      [ -d "$runtime_dir" ] || continue
-                      find "$runtime_dir" \( -type f -o -type l \) \( -name "*.so" -o -name "*.so.*" -o -name "*.dylib" -o -name "*.dll" \)
-                  done
-              )
-              ensure_soname_links "$dest"
-          }
-
-          # Copy all libs from `QT_DIR` to the provided `$2`.
-          stage_qt_runtime_payload() {
-              exe_path="$1"
-              dest="$2"
-              [ -n "${QT_DIR:-}" ] && [ -d "$QT_DIR/lib" ] || return 0
-
-              # Skip executables that don't depend on QT (don't have `libQt6` referenced).
-              if ! LD_LIBRARY_PATH="$QT_DIR/lib:${LD_LIBRARY_PATH:-}" ldd "$exe_path" 2>/dev/null | grep -q "libQt6"; then
-                  return 0
-              fi
-
-              # Copy all QT libs to `dest`.
-              find "$QT_DIR/lib" -maxdepth 1 \( -type f -o -type l \) -name "*.so*" -exec cp -P {} "$dest/" \;
-              ensure_soname_links "$dest"
-
-              # Copy QT plugins.
-              if [ -d "$QT_DIR/plugins" ]; then
-                  pushd "$QT_DIR/plugins" > /dev/null
-                  find . \( -type f -o -type l \) -name "*.so*" | while IFS= read -r plugin_file; do
-                      mkdir -p "$dest/plugins/$(dirname "$plugin_file")"
-                      cp -P "$plugin_file" "$dest/plugins/$plugin_file"
-                  done
-                  popd > /dev/null
-                  # Point plugins rpath to `$dest`.
-                  if [ -d "$dest/plugins" ]; then
-                      find "$dest/plugins" -type f -name "*.so*" -exec patchelf --set-rpath '$ORIGIN/../..:$ORIGIN' {} \;
-                  fi
-              fi
-
-              find "$dest" -maxdepth 1 -type f -name "*.so*" -exec patchelf --set-rpath '$ORIGIN' {} \;
-
-              printf "[Paths]\nPrefix = .\n" > "$dest/qt.conf"
-          }
-
-          # Check all binaries in the dest `$1`
-          # and report if they're still missing dependencies or are static.
-          check_runtime_dependencies() {
-              package_dir="$1"
-              missing=0
-              # Iterate over all .so files.
-              while IFS= read -r binary_file; do
-                  # Skip non-binaries.
-                  readelf -h "$binary_file" >/dev/null 2>&1 || continue
-                  # Report non-dynamic binaries.
-                  if ! env -u LD_LIBRARY_PATH ldd "$binary_file" > "$package_dir/.ldd.out" 2>&1; then
-                      echo "ldd failed for $binary_file"
-                      cat "$package_dir/.ldd.out"
-                      missing=1
-                      continue
-                  fi
-                  # Report missing dependencies.
-                  if grep -q "not found" "$package_dir/.ldd.out"; then
-                      echo "Missing runtime dependencies for $binary_file"
-                      grep "not found" "$package_dir/.ldd.out"
-                      missing=1
-                  fi
-              done < <(find "$package_dir" -type f \( -perm /111 -o -name "*.so" -o -name "*.so.*" \))
-              rm -f "$package_dir/.ldd.out"
-              # TODO: should error?
-              if [ "$missing" -ne 0 ]; then
-                  echo "Runtime dependency check found issues; continuing packaging."
-              fi
-              return 0
-          }
-
-          # Iterate over all built Python wrappers in `install/ifcopenshell/python-x.y.z`.
-          # and zip them, bundling all dynamic libs from `lib`.
           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 '.'`
@@ -246,37 +104,21 @@ jobs:
               fi
               [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
               find ifcopenshell -name "*.pyc" -delete
-              # TODO: packs qt libs also?
-              stage_runtime_payload ifcopenshell
-              zip -y -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip ifcopenshell
+              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip ifcopenshell/*
               mv *.zip ~/output
               popd > /dev/null
           done
 
-          # Iterate over all executables in `install/ifcopenshell/bin` and zip them.
-          # Each zip bundles dynamic libs from `lib` and also qt libs.
-          find "$install_root/bin" -maxdepth 1 -type f -perm /111 ! -name "*.zip" ! -name "*.so" ! -name "*.so.*" ! -name "*.dylib" ! -name "*.dll" | while read exe_path; do
-              exe=`basename "$exe_path"`
-              package_dir="$install_root/.package-${exe}"
-              rm -rf "$package_dir"
-              mkdir -p "$package_dir"
-              cp "$exe_path" "$package_dir/"
-              patchelf --set-rpath '$ORIGIN' "$package_dir/$exe"
-              stage_runtime_payload "$package_dir" 0
-              stage_qt_runtime_payload "$exe_path" "$package_dir"
-              if [ "$exe" = "BonsaiViewer" ]; then
-                  mkdir -p "$package_dir/connectors"
-                  cp -a "$autodesk_connector_dir" "$package_dir/connectors/"
-              fi
-              check_runtime_dependencies "$package_dir"
-              pushd "$package_dir" > /dev/null
-              zip -y -qq -r "$HOME/output/${exe}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip" .
-              popd > /dev/null
-              rm -rf "$package_dir"
+          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@v6
+        uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}

.github/workflows/build_rocky_arm.yml

@@ -6,54 +6,20 @@ on:
 jobs:
   build_ifcopenshell:
     runs-on: ubuntu-22.04-arm
-    # Rocky 10 (glibc 2.39) — aqt's official Qt6 ARM binaries are built
-    # against glibc 2.38, which Rocky 9 (glibc 2.34) can't run (moc fails to
-    # load). The legacy arm64v8/rockylinux Docker image stopped at 9; Rocky 10
-    # is published under the rockylinux/rockylinux namespace.
-    container:
-      image: rockylinux/rockylinux:10
-      # The community rockylinux image omits PATH from its config (the old
-      # Docker Official arm64v8/rockylinux set it), so GitHub Actions `run:`
-      # steps fail with `exec: "sh": not found` — docker exec has no /usr/bin
-      # to resolve the shell. Restore a standard PATH; GITHUB_PATH prepends
-      # (uv, cargo) are still layered on top by the runner.
-      env:
-        PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+    container: arm64v8/rockylinux:8
 
     steps:
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
-
-      - name: Install Python
-        # Installs latest Python version so it's preferred by uv over Rocky's system Python.
-        run: uv python install
-
       - name: Install Dependencies
         run: |
-          dnf update -y
-          dnf install -y epel-release
-          # --enablerepo=crb: libstdc++-static (libsupc++.a, needed by the
-          # bundled FLTK link) lives in Rocky's CodeReady Builder repo, which
-          # is disabled by default.
-          dnf install -y --enablerepo=crb gcc gcc-c++ git autoconf automake bison make zip cmake \
+          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 xz byacc patchelf libxkbcommon-devel                 \
-                         dbus-devel \
-                         libXext-devel libXinerama-devel libXcursor-devel libXrender-devel \
-                         libXfixes-devel libXft-devel pango-devel cairo-devel libstdc++-static
+                         findutils xz byacc
+          python3 -m pip install typing_extensions
           git config --global --add safe.directory '*'
 
-      - name: Install Rust
-        # The bonsaiviewer-autodesk connector is a Rust crate; the "Package
-        # .zip archives" step below runs `cargo build --release` via
-        # packaging/build.py. Match the dedicated connector workflow's stable
-        # toolchain (dtolnay/rust-toolchain@stable).
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-
       - name: Install aws cli
         run: |
           curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip"
@@ -63,41 +29,39 @@ jobs:
           aws --version
 
       - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           repository: IfcOpenShell/build-outputs
           path: ./build
-          ref: rockylinux9-arm64
+          ref: rockylinux8-arm64
           lfs: true
           token: ${{ secrets.BUILD_REPO_TOKEN }}
 
       - name: Unpack Dependencies
         run: |
-          cd build
-          uv run ../nix/cache_dependencies.py unpack
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        # TODO: Use tag after 1.2.20 releases.
+        uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639
         with:
-          key: ubuntu-22.04-${{ runner.arch }}-rockylinux10
+          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
 
       - name: Run Build Script
         shell: bash
         run: |
           set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3" ADD_COMMIT_SHA=1 BUILD_CFG=Release BUILD_BONSAIVIEWER=ON \
-            uv run --with aqtinstall ./nix/build-all.py \
-            -v --diskcleanup --ifcopenshell-shared 2>&1 \
-            | tee build.log
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
 
       - name: Upload Build Logs
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: build-logs-rocky-arm64
           path: |
@@ -108,7 +72,9 @@ jobs:
       - name: Pack Dependencies
         run: |
           cd build
-          uv run ../nix/cache_dependencies.py pack
+          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: |
@@ -120,111 +86,10 @@ jobs:
           git push || true
 
       - name: Package .zip archives
-        shell: bash
         run: |
           VERSION=v`cat VERSION`
-          # bonsaiviewer-autodesk is now a Rust connector. packaging/build.py
-          # invokes `cargo build --release` and stages the binary +
-          # connector.json into dist/autodesk/. Same on-disk shape as the
-          # old PyInstaller flow so the symlink + zip steps below
-          # continue to work unchanged.
-          uv run src/bonsaiviewer-autodesk/packaging/build.py
-          autodesk_connector_dir="$PWD/src/bonsaiviewer-autodesk/dist/autodesk"
-          test -d "$autodesk_connector_dir"
-
           cd ./build/`uname`/*/install/ifcopenshell
-          mkdir -p ~/output
-          install_root="$PWD"
-          QT6_VERSION="${QT6_VERSION:-6.8.3}"
-
-          if [ -z "${QT_DIR:-}" ]; then
-              for qt_candidate in "$(dirname "$install_root")"/qt6-${QT6_VERSION}-*/${QT6_VERSION}/*; do
-                  if [ -d "$qt_candidate/lib" ]; then
-                      QT_DIR="$qt_candidate"
-                      break
-                  fi
-              done
-          fi
-
-          ensure_soname_links() {
-              dest="$1"
-              find "$dest" -maxdepth 1 -type f -name "*.so*" | while IFS= read -r shared_object; do
-                  soname=$(readelf -d "$shared_object" 2>/dev/null | sed -n 's/.*(SONAME).*Shared library: \[\(.*\)\].*/\1/p' | head -n 1)
-                  [ -n "$soname" ] || continue
-                  [ -e "$dest/$soname" ] && continue
-                  ln -s "$(basename "$shared_object")" "$dest/$soname"
-              done
-          }
-
-          stage_runtime_payload() {
-              dest="$1"
-              include_geometry_writers="${2:-1}"
-              while IFS= read -r runtime_file; do
-                  if [ "$include_geometry_writers" != "1" ] && [[ "$(basename "$runtime_file")" == ifcopenshell.geometry.writer.* ]]; then
-                      continue
-                  fi
-                  cp -P "$runtime_file" "$dest/"
-              done < <(
-                  for runtime_dir in "$install_root/bin" "$install_root/lib" "$install_root/lib64"; do
-                      [ -d "$runtime_dir" ] || continue
-                      find "$runtime_dir" \( -type f -o -type l \) \( -name "*.so" -o -name "*.so.*" -o -name "*.dylib" -o -name "*.dll" \)
-                  done
-              )
-              ensure_soname_links "$dest"
-          }
-
-          stage_qt_runtime_payload() {
-              exe_path="$1"
-              dest="$2"
-              [ -n "${QT_DIR:-}" ] && [ -d "$QT_DIR/lib" ] || return 0
-
-              if ! LD_LIBRARY_PATH="$QT_DIR/lib:${LD_LIBRARY_PATH:-}" ldd "$exe_path" 2>/dev/null | grep -q "libQt6"; then
-                  return 0
-              fi
-
-              find "$QT_DIR/lib" -maxdepth 1 \( -type f -o -type l \) -name "*.so*" -exec cp -P {} "$dest/" \;
-              ensure_soname_links "$dest"
-
-              if [ -d "$QT_DIR/plugins" ]; then
-                  pushd "$QT_DIR/plugins" > /dev/null
-                  find . \( -type f -o -type l \) -name "*.so*" | while IFS= read -r plugin_file; do
-                      mkdir -p "$dest/plugins/$(dirname "$plugin_file")"
-                      cp -P "$plugin_file" "$dest/plugins/$plugin_file"
-                  done
-                  popd > /dev/null
-                  if [ -d "$dest/plugins" ]; then
-                      find "$dest/plugins" -type f -name "*.so*" -exec patchelf --set-rpath '$ORIGIN/../..:$ORIGIN' {} \;
-                  fi
-              fi
-
-              find "$dest" -maxdepth 1 -type f -name "*.so*" -exec patchelf --set-rpath '$ORIGIN' {} \;
-
-              printf "[Paths]\nPrefix = .\n" > "$dest/qt.conf"
-          }
-
-          check_runtime_dependencies() {
-              package_dir="$1"
-              missing=0
-              while IFS= read -r binary_file; do
-                  readelf -h "$binary_file" >/dev/null 2>&1 || continue
-                  if ! env -u LD_LIBRARY_PATH ldd "$binary_file" > "$package_dir/.ldd.out" 2>&1; then
-                      echo "ldd failed for $binary_file"
-                      cat "$package_dir/.ldd.out"
-                      missing=1
-                      continue
-                  fi
-                  if grep -q "not found" "$package_dir/.ldd.out"; then
-                      echo "Missing runtime dependencies for $binary_file"
-                      grep "not found" "$package_dir/.ldd.out"
-                      missing=1
-                  fi
-              done < <(find "$package_dir" -type f \( -perm /111 -o -name "*.so" -o -name "*.so.*" \))
-              rm -f "$package_dir/.ldd.out"
-              if [ "$missing" -ne 0 ]; then
-                  echo "Runtime dependency check found issues; continuing packaging."
-              fi
-              return 0
-          }
+          mkdir ~/output
 
           ls -d python-* | while read py_version; do
               postfix=`echo ${py_version: -1} | sed s/[0-9]//`
@@ -239,34 +104,21 @@ jobs:
               fi
               [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
               find ifcopenshell -name "*.pyc" -delete
-              stage_runtime_payload ifcopenshell
-              zip -y -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip ifcopenshell
+              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip ifcopenshell/*
               mv *.zip ~/output
               popd > /dev/null
           done
 
-          find "$install_root/bin" -maxdepth 1 -type f -perm /111 ! -name "*.zip" ! -name "*.so" ! -name "*.so.*" ! -name "*.dylib" ! -name "*.dll" | while read exe_path; do
-              exe=`basename "$exe_path"`
-              package_dir="$install_root/.package-${exe}"
-              rm -rf "$package_dir"
-              mkdir -p "$package_dir"
-              cp "$exe_path" "$package_dir/"
-              patchelf --set-rpath '$ORIGIN' "$package_dir/$exe"
-              stage_runtime_payload "$package_dir" 0
-              stage_qt_runtime_payload "$exe_path" "$package_dir"
-              if [ "$exe" = "BonsaiViewer" ]; then
-                  mkdir -p "$package_dir/connectors"
-                  cp -a "$autodesk_connector_dir" "$package_dir/connectors/"
-              fi
-              check_runtime_dependencies "$package_dir"
-              pushd "$package_dir" > /dev/null
-              zip -y -qq -r "$HOME/output/${exe}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip" .
-              popd > /dev/null
-              rm -rf "$package_dir"
+          cd bin
+          rm *.zip || true
+          ls | while read exe; do
+              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip $exe
           done
+          mv *.zip ~/output
+          cd ..
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}

.github/workflows/build_win.yml

@@ -5,38 +5,23 @@ on:
 
 jobs:
   build_ifcopenshell:
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - arch: x64
-            runs_on: windows-2022
-            deps_dir: _deps-vs2022-x64-installed
-            vcvars: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
-            build_branch: windows-x64
-            zip_suffix: win64
-
-          - arch: ARM64
-            runs_on: windows-11-arm
-            deps_dir: _deps-vs2022-ARM64-installed
-            vcvars: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat"'
-            build_branch: windows-arm64
-            zip_suffix: win-arm64
-
-    runs-on: ${{ matrix.runs_on }}
-
+        arch: ['x64']
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
       - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           repository: IfcOpenShell/build-outputs
-          path: ${{ matrix.deps_dir }}
-          ref: ${{ matrix.build_branch }}
+          path: _deps-vs2022-x64-installed
+          ref: windows-${{ matrix.arch }}
           lfs: true
           token: ${{ secrets.BUILD_REPO_TOKEN }}
 
@@ -46,49 +31,30 @@ jobs:
 
       - name: Unpack Dependencies
         run: |
-          cd ${{ matrix.deps_dir }}
+          cd _deps-vs2022-x64-installed
           Get-ChildItem -Path . -Filter 'cache-*.zip' | ForEach-Object {
-            Write-Host "Extracting $($_.Name)"
-            7z x -bso0 -bsp0 $_.FullName
-            if ($LASTEXITCODE -ne 0) {
-              throw "Failed to extract $($_.Name) with 7z exit code $LASTEXITCODE."
-            }
+            7z x $_.FullName
           }
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        # TODO: Use tag after 1.2.20 releases.
+        uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639
         with:
           key: win-${{ matrix.arch }}
           # Windows ccache needs ~1GB
           # and with default 500MB some cache gets deleted, leading to misses.
           max-size: 5000MB
 
-      - name: Set up Python for connector build
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.12'
-
-      # Build the Autodesk connector before the C++ build: build-all-win.py
-      # bundles it next to BonsaiViewer.exe while archiving the executables.
-      # bonsaiviewer-autodesk is a Rust connector; packaging/build.py runs
-      # `cargo build --release` and stages the binary + connector.json into
-      # dist/autodesk/.
-      - name: Build Autodesk connector
-        working-directory: src/bonsaiviewer-autodesk
-        run: python packaging/build.py
-
       - name: Run Build Script And Pack .zip Archives
         shell: cmd
-        env:
-          TARGET_ARCH: ${{ matrix.arch }}  # lets the Python script know which arch to target (optional override)
         run: |
-          call ${{ matrix.vcvars }}
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           cd win
           python build-all-win.py
 
       - name: Pack Dependencies
         run: |
-          cd ${{ matrix.deps_dir }}
+          cd _deps-vs2022-x64-installed
           Get-ChildItem -Path . -Directory | ForEach-Object {
             $cacheFile = "cache-$($_.Name).zip"
             echo $cacheFile
@@ -99,16 +65,15 @@ jobs:
 
       - name: Commit and Push Changes to Build Repository
         run: |
-          cd ${{ matrix.deps_dir }}
+          cd _deps-vs2022-x64-installed
           git config user.name "IfcOpenBot"
           git config user.email "ifcopenbot@ifcopenshell.org"
-          git checkout -B ${{ matrix.build_branch }}
           git add *.zip
           git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
-          git push --set-upstream origin ${{ matrix.build_branch }} || echo "Push failed"
+          git push || echo "Push failed"
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}

.github/workflows/check_repo_ci_jobs.py

@@ -1,9 +1,9 @@
-import os
 import pathlib
 import shutil
-import zipfile
 
 import requests
+import zipfile
+import os
 
 # To test this locally, set these environment variables
 REPO_OWNER = os.environ.get("REPO_OWNER", "IfcOpenShell/IfcOpenShell")

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

@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7 # https://github.com/actions/checkout
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5 # https://github.com/actions/checkout
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           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

.github/workflows/ci-black-formatting.yaml

@@ -0,0 +1,68 @@
+name: ci-black-formatting
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint-formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Action - checkout repository
+        uses: actions/checkout@v5
+
+      - name: Action - install python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.9"
+
+      - name: Action - install python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+          uv tool install ruff
+          uv tool install black
+          uv tool install poethepoet
+
+      # black doesn't catch all syntax errors, so we check them explicitly.
+      - name: Check syntax errors
+        id: syntax-errors
+        run: |
+          ERROR=0
+          python3.9 -W error -m compileall -q src/ifcopenshell-python || ERROR=1
+          python3.11 -W error -m compileall -q src/bonsai || ERROR=1
+          exit $ERROR
+        continue-on-error: true
+
+      - name: Black formatter
+        id: black
+        run: |
+          black --diff --check .
+        continue-on-error: true
+
+      - name: Ruff check
+        id: ruff
+        run: |
+          ERROR=0
+          poe ruff-main || ERROR=1
+          poe ruff-old || ERROR=1
+          exit $ERROR
+        continue-on-error: true
+
+      - name: Final check
+        run: |
+          ERROR=0
+          if [ "${{ steps.syntax-errors.outcome }}" != "success" ]; then
+            echo "::error::Syntax errors check failed, see 'syntax-errors' step for the details." && ERROR=1
+          fi
+          if [ "${{ steps.black.outcome }}" != "success" ]; then
+            echo "::error::Black formatting check failed, see 'black' step for the details." && ERROR=1
+          fi
+          if [ "${{ steps.ruff.outcome }}" != "success" ]; then
+            echo "::error::Ruff check failed, see 'ruff' step for the details." && ERROR=1
+          fi
+          exit $ERROR

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

@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v5
         with:
           fetch-tags: true
           fetch-depth: 0

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

@@ -24,15 +24,9 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell'
-    outputs:
-      timestamp: ${{ steps.timestamp.outputs.timestamp }}
     steps:
-    - name: Get current timestamp
-      id: timestamp
-      # 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 "timestamp=$(date +'%y%m%d%H%M')" >> $GITHUB_OUTPUT
+    - name: Set env
+      run: echo ok go
 
   build:
     needs: activate
@@ -41,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py311, py312, py313]
+        pyver: [py311, py312]
         config:
           - {
             name: "Windows Build",
@@ -59,20 +53,21 @@ jobs:
             name: "MacOS ARM Build",
             short_name: macosm1,
           }
-        exclude:
-          # Python 3.13 is needed for Blender 5.1+ and Blender dropped Intel Mac support in 5.0.
-          - pyver: py313
-            config:
-              short_name: macos
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'
       - name: Get current version
         id: version
-        run: echo "version=$(sed -E 's/[[:alpha:]]+[0-9]+$//' VERSION)" >> $GITHUB_OUTPUT
+        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
+      - name: Get current date
+        id: date
+        # 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 }}
@@ -88,8 +83,8 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.find_zip.outputs.filepath }}
           asset_name: ${{ steps.find_zip.outputs.filename }}
-          release_name: "bonsai-${{steps.version.outputs.version}}-alpha${{ needs.activate.outputs.timestamp }} (unstable)"
-          tag: "bonsai-${{steps.version.outputs.version}}-alpha${{ needs.activate.outputs.timestamp }}"
+          release_name: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}} (unstable)"
+          tag: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}}"
           overwrite: true
           body: "See README in https://github.com/IfcOpenShell/bonsai_unstable_repo/ on how to setup autoupdates for daily Bonsai builds."
 
@@ -98,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout bonsai_unstable_repo repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           repository: IfcOpenShell/bonsai_unstable_repo
           token: ${{ secrets.IFCOPENBOT_TOKEN }}
@@ -109,7 +104,7 @@ jobs:
           # Ensure Bonsai and ifcsverchok enable/disable works before uploading to extensions repo.
 
           # Download Blender.
-          wget -q -O blender.tar.xz https://download.blender.org/release/Blender5.2/blender-5.2.0-linux-x64.tar.xz
+          wget -q -O blender.tar.xz https://download.blender.org/release/Blender4.5/blender-4.5.0-linux-x64.tar.xz
           tar -xf blender.tar.xz
 
           # Setup Blender.
@@ -122,7 +117,7 @@ jobs:
           pip install -r requirements.txt
           python setup_extensions_repo.py --last-tag
           cd ..
-          bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py313*-linux-x64.zip)"
+          bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py311*-linux-x64.zip)"
 
           # Install Bonsai.
           blender --command extension install-file -r user_default -e $bonsai_zip
@@ -179,7 +174,8 @@ jobs:
           blender --online-mode --command extension install --enable --sync sun_position
 
           cd IfcOpenShell/src/bonsai
-          pip install -r requirements-dev.txt
+          pip install pytest-blender
+          pip install pytest-bdd
           blender --background --python scripts/setup_pytest.py
           blender --python-expr "import bonsai; print(bonsai.bbim_semver); import ifcopenshell; print(ifcopenshell.version)" --background
           make test

.github/workflows/ci-bonsai.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py311, py312, py313]
+        pyver: [py311, py312]
         config:
           - {
             name: "Windows Build",
@@ -42,14 +42,9 @@ jobs:
             name: "MacOS ARM Build",
             short_name: macosm1,
           }
-        exclude:
-          # Python 3.13 is needed for Blender 5.1+ and Blender dropped Intel Mac support in 5.0.
-          - pyver: py313
-            config:
-              short_name: macos
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'

.github/workflows/ci-bsdd-pypi.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifc4d-pypi.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifc5d-pypi.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifccityjson-pypi.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifcclash-pypi.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifcconvert.yml

@@ -37,8 +37,8 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           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

.github/workflows/ci-ifccsv-pypi.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifcdiff-pypi.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifcedit-pypi.yaml

@@ -1,35 +0,0 @@
-name: ci-ifcedit-pypi
-
-on:
-  workflow_dispatch:
-
-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
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
-        with:
-          python-version: '3.11'
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcedit &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcedit/dist

.github/workflows/ci-ifcfm-pypi.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifcmcp-pypi.yaml

@@ -1,36 +0,0 @@
-name: ci-ifcmcp-pypi
-
-on:
-  workflow_dispatch:
-
-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
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
-        with:
-          python-version: '3.11'
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcmcp &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcmcp/dist
-          verbose: true

.github/workflows/ci-ifcopenshell-conda-cleaner.yml

@@ -24,7 +24,7 @@ jobs:
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell'
     steps:
-      - uses: mamba-org/setup-micromamba@v3 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v2 # https://github.com/mamba-org/setup-micromamba
         with:
           environment-name: test-env
           create-args: >-

.github/workflows/ci-ifcopenshell-conda-daily.yml

@@ -21,15 +21,13 @@ jobs:
       date: ${{ steps.date.outputs.date }}
       verdate: ${{ steps.verdate.outputs.verdate }}
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v5
       - name: Set env
         run: echo ok go
       
       - name: Get current version
         id: version
-        # Strip any trailing prerelease label and number; the dated alpha
-        # suffix is added below.
-        run: echo "version=$(sed -E 's/[[:alpha:]]+[0-9]+$//' VERSION)" >> $GITHUB_OUTPUT
+        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
       
       - name: Get current date
         id: date
@@ -56,7 +54,8 @@ jobs:
         platform: [
           { name: win, distver: windows-latest, pkg_dir: 'win-64' },
           { name: linux, distver: ubuntu-latest, pkg_dir: 'linux-64' },
-          { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' }
+          { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' },
+          { name: macOS-x86, distver: macos-13, pkg_dir: 'osx-64' }
         ]
     steps:
       - name: Set Swap Space
@@ -77,7 +76,7 @@ jobs:
             echo "ARTIFACTS_DIR=/home/runner/work/artifacts" >> $GITHUB_ENV
           fi
       
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
 
@@ -86,7 +85,7 @@ jobs:
         run: |
           curl -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz | tar -xvJf - -C /Users/runner/work/
 
-      - uses: mamba-org/setup-micromamba@v3 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v2 # https://github.com/mamba-org/setup-micromamba
         with:
           environment-name: test-env
           create-args: >-

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

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: activate
     steps:
-    - uses: actions/checkout@v7
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
 
@@ -31,17 +31,20 @@ jobs:
         sudo apt-get install --no-install-recommends \
         git cmake gcc g++ libboost-all-dev python3-all-dev swig libpcre3-dev libxml2-dev \
         libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-        libcgal-dev nlohmann-json3-dev libeigen3-dev
+        libhdf5-dev libcgal-dev nlohmann-json3-dev libeigen3-dev
 
     -
       name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.23
+      uses: hendrikmuhs/ccache-action@v1.2
 
     - 
       name: Build ifcopenshell
       run: |
         mkdir build && cd build
         cmake \
+         -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+         -DCMAKE_CXX_STANDARD=17 \
          -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
          -DCMAKE_BUILD_TYPE=Release \
          -DCMAKE_PREFIX_PATH=/usr \
@@ -60,6 +63,7 @@ jobs:
          -DMPFR_INCLUDE_DIR=/usr/include \
          -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
          -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+         -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
          -DGLTF_SUPPORT=On \
          -DJSON_INCLUDE_DIR=/usr/include \
          -DEIGEN_DIR=/usr/include/eigen3 \
@@ -72,7 +76,7 @@ jobs:
         make package
       working-directory: build
     - name: Upload 
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v5
       with:
         # Artifact name
         name: ifcos-artifacts
@@ -85,31 +89,31 @@ jobs:
     name: Docker Build, Tag, Push
 
     steps:
-    - uses: actions/checkout@v7
+    - uses: actions/checkout@v5
       with:
         lfs: true
     
     - name: Download 
-      uses: actions/download-artifact@v8.0.1
+      uses: actions/download-artifact@v6.0.0
       with:
         # Artifact name
         name: ifcos-artifacts
         path: artifacts/
     -
       name: Set up QEMU
-      uses: docker/setup-qemu-action@v4
+      uses: docker/setup-qemu-action@v3
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v4        
+      uses: docker/setup-buildx-action@v3        
     - 
       name: Login to Dockerhub
-      uses: docker/login-action@v4 
+      uses: docker/login-action@v3 
       with:
         username: aecgeeks
         password: ${{ secrets.DOCKER_HUB_TOKEN }}
     - 
       name: Build container image
-      uses: docker/build-push-action@v7
+      uses: docker/build-push-action@v6
       with: 
         context: artifacts
         repository: aecgeeks/ifcopenshell

.github/workflows/ci-ifcopenshell-python-pypi.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313, py314]
         config:
           - {
             name: "Windows 64bit",
@@ -47,10 +47,10 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           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

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

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313, py314]
         config:
           - {
             name: "Windows 64bit",
@@ -38,10 +38,10 @@ jobs:
             short_name: macosm164
           }
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           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

.github/workflows/ci-ifcpatch-pypi.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifcquery-pypi.yaml

@@ -1,35 +0,0 @@
-name: ci-ifcquery-pypi
-
-on:
-  workflow_dispatch:
-
-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
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
-        with:
-          python-version: '3.11'
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcquery &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcquery/dist

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

@@ -25,14 +25,14 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'
       - name: Get current version
         id: version
-        run: echo "version=$(sed -E 's/[[:alpha:]]+[0-9]+$//' VERSION)" >> $GITHUB_OUTPUT
+        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
       - name: Get current date
         id: date
         run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT

.github/workflows/ci-ifcsverchok.yml

@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'

.github/workflows/ci-ifctester-org.yml

@@ -10,9 +10,9 @@ jobs:
   publish_website:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v5
       - name: Checkout ifctester_org_static_html
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           repository: IfcOpenShell/ifctester_org_static_html
           token: ${{ secrets.IFCOPENBOT_TOKEN }}

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

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
       - name: Compile

.github/workflows/ci-ifcwrap-standalone.yml

@@ -1,166 +0,0 @@
-# This file was generated with the assistance of an AI coding tool.
-name: ci-ifcwrap-standalone
-
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - ".github/workflows/ci-ifcwrap-standalone.yml"
-      - "cmake/**"
-      - "src/ifcwrap/**"
-      - "src/ifcparse/**"
-      - "src/ifcgeom/**"
-      - "src/serializers/**"
-      - "src/ifcconvert/**"
-      - "src/ifcopenshell-python/**"
-      - "src/svgfill/**"
-  push:
-    paths:
-      - ".github/workflows/ci-ifcwrap-standalone.yml"
-      - "cmake/**"
-      - "src/ifcwrap/**"
-      - "src/ifcparse/**"
-      - "src/ifcgeom/**"
-      - "src/serializers/**"
-      - "src/ifcconvert/**"
-      - "src/ifcopenshell-python/**"
-      - "src/svgfill/**"
-
-env:
-  IFCOPENSHELL_PREFIX: ${{ github.workspace }}/ifcopenshell-install
-
-jobs:
-  build-ifcopenshell:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          submodules: recursive
-
-      - name: Install C++ dependencies
-        run: |
-          sudo apt update
-          sudo apt-get install --no-install-recommends -y \
-            cmake \
-            bison \
-            gcc \
-            g++ \
-            libboost-date-time-dev \
-            libboost-filesystem-dev \
-            libboost-iostreams-dev \
-            libboost-program-options-dev \
-            libboost-regex-dev \
-            libboost-system-dev \
-            libboost-thread-dev \
-            libeigen3-dev \
-            libocct-data-exchange-dev \
-            libocct-draw-dev \
-            libocct-foundation-dev \
-            libocct-modeling-algorithms-dev \
-            libocct-modeling-data-dev \
-            libocct-ocaf-dev \
-            libocct-visualization-dev \
-            libpcre3-dev \
-            libpcre2-dev \
-            libtbb-dev \
-            libxml2-dev \
-            libxi-dev \
-            occt-misc \
-            tcl-dev \
-            tk-dev
-
-      - name: Build SWIG
-        # IfcOpenShell requires SWIG 4.1+, ubuntu-22.04 ships 4.0.2.
-        run: |
-          sudo apt-get remove --purge -y swig swig4.0
-          git clone https://github.com/swig/swig --branch v4.2.1 --depth 1
-          cmake -S swig -B swig/build -DCMAKE_BUILD_TYPE=Release
-          cmake --build swig/build -j "$(nproc)"
-          sudo cmake --install swig/build
-          swig -version
-
-      - name: Configure minimal IfcOpenShell
-        run: |
-          cmake -S cmake -B build-ifcopenshell \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX="${IFCOPENSHELL_PREFIX}" \
-            -DCMAKE_PREFIX_PATH=/usr \
-            -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
-            -DMINIMAL_BUILD=ON \
-            -DBUILD_IFCPYTHON=OFF \
-            "-DSCHEMA_VERSIONS=4x3_add2"
-
-      - name: Build and install minimal IfcOpenShell
-        run: |
-          cmake --build build-ifcopenshell --target install -j "$(nproc)"
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v7
-        with:
-          python-version: 3.11
-
-      - name: Install Python import dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install numpy typing_extensions
-
-      - name: Configure standalone IfcPython
-        run: |
-          PYTHON_EXECUTABLE="$(python -c 'import sys; print(sys.executable)')"
-          PYTHON_INCLUDE_DIR="$(python -c 'import sysconfig; print(sysconfig.get_path("include"))')"
-
-          cmake -S src/ifcwrap -B "build-ifcwrap-311" \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_PREFIX_PATH="${IFCOPENSHELL_PREFIX};/usr" \
-            -DPython_EXECUTABLE:FILEPATH="${PYTHON_EXECUTABLE}" \
-            -DPython_INCLUDE_DIR:PATH="${PYTHON_INCLUDE_DIR}" \
-            -DPYTHON_EXECUTABLE:FILEPATH="${PYTHON_EXECUTABLE}" \
-            -DPYTHON_INCLUDE_DIR:PATH="${PYTHON_INCLUDE_DIR}"
-
-      - name: Build and install standalone IfcPython
-        run: |
-          cmake --build "build-ifcwrap-311" --target install -j "$(nproc)"
-
-      - name: Import installed IfcPython
-        run: |
-          PYTHONPATH="${RUNNER_TEMP}/ifcopenshell-python" python - <<'PY'
-          import ifcopenshell
-
-          print("IfcOpenShell import ok:", ifcopenshell.version)
-          PY
-
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v7
-        with:
-          python-version: 3.12
-
-      - name: Install Python import dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install numpy typing_extensions
-
-      - name: Configure standalone IfcPython
-        run: |
-          PYTHON_EXECUTABLE="$(python -c 'import sys; print(sys.executable)')"
-          PYTHON_INCLUDE_DIR="$(python -c 'import sysconfig; print(sysconfig.get_path("include"))')"
-
-          cmake -S src/ifcwrap -B "build-ifcwrap-312" \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_PREFIX_PATH="${IFCOPENSHELL_PREFIX};/usr" \
-            -DPython_EXECUTABLE:FILEPATH="${PYTHON_EXECUTABLE}" \
-            -DPython_INCLUDE_DIR:PATH="${PYTHON_INCLUDE_DIR}" \
-            -DPYTHON_EXECUTABLE:FILEPATH="${PYTHON_EXECUTABLE}" \
-            -DPYTHON_INCLUDE_DIR:PATH="${PYTHON_INCLUDE_DIR}"
-
-      - name: Build and install standalone IfcPython
-        run: |
-          cmake --build "build-ifcwrap-312" --target install -j "$(nproc)"
-
-      - name: Import installed IfcPython
-        run: |
-          PYTHONPATH="${RUNNER_TEMP}/ifcopenshell-python" python - <<'PY'
-          import ifcopenshell
-
-          print("IfcOpenShell import ok:", ifcopenshell.version)
-          PY

.github/workflows/ci-lint.yaml

@@ -1,124 +0,0 @@
-name: ci-lint
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  lint-formatting:
-    runs-on: ubuntu-latest
-    env:
-      MIN_IOS_PY_VERSION: "3.10"
-      MIN_BLENDER_PY_VERSION: "3.11"
-    steps:
-      - name: Action - checkout repository
-        uses: actions/checkout@v7
-
-      - name: Action - install python
-        uses: actions/setup-python@v7
-        with:
-          python-version: ${{ env.MIN_IOS_PY_VERSION }}
-
-      - name: Action - install python
-        uses: actions/setup-python@v7
-        with:
-          python-version: ${{ env.MIN_BLENDER_PY_VERSION }}
-
-      - name: Install dependencies
-        run: |
-          curl -LsSf https://astral.sh/uv/install.sh | sh
-          cat requirements-tools.txt | xargs -L1 uv tool install
-
-      # black doesn't catch all syntax errors, so we check them explicitly.
-      - name: Check syntax errors
-        id: syntax-errors
-        run: |
-          ERROR=0
-          # Using 2 Python versions - one minimum required for IfcOpenShell
-          # and other that's used by Blender currently.
-          python${{ env.MIN_IOS_PY_VERSION }} -W error -m compileall -q src/ifcopenshell-python || ERROR=1
-          python${{ env.MIN_BLENDER_PY_VERSION }} -W error -m compileall -q src/bonsai || ERROR=1
-          exit $ERROR
-        continue-on-error: true
-
-      - name: Black formatter
-        id: black
-        uses: psf/black@stable
-        continue-on-error: true
-
-      # Same check as above, but just for creating github annotations.
-      - name: Black formatter annotations
-        id: black-annotations
-        run: |
-          uv tool install black-codeclimate
-          pip install github_action_utils
-          black --diff --check . | black-codeclimate | python .github/workflows/black_to_github_annotations.py
-        continue-on-error: true
-
-      - name: ty check (venv setup)
-        run: poe ty-venv
-
-      - name: ty check (bonsai)
-        id: ty-bonsai
-        run: poe ty-bonsai
-        continue-on-error: true
-
-      - name: ty check (ios)
-        id: ty-ios
-        run: poe ty-ios
-        continue-on-error: true
-
-      - name: Ruff check
-        id: ruff
-        run: |
-          # Ensure execution continues, since we need to cache the output.
-          set +e
-
-          ERROR=0
-          # Keep colored output inside action logs, strip it from color codes for summary.
-          uv tool install ansi2txt
-          # `ruff` disables color output in CI by default.
-          export FORCE_COLOR="1"
-
-          run_check() {
-            local out
-            out="$("$@" 2>&1)"
-            local exit_code=$?
-
-            if [ "$exit_code" -ne 0 ]; then
-              ERROR=1
-            fi
-
-            # Rerun just for GitHub annotations.
-            "$@" --output-format=github || true
-
-            echo "$out"
-            echo "\`\`\`python" >> $GITHUB_STEP_SUMMARY
-            echo "$out" | ansi2txt >> $GITHUB_STEP_SUMMARY
-            echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          }
-
-          run_check poe ruff
-
-          exit $ERROR
-        continue-on-error: true
-
-      - name: Final check
-        run: |
-          ERROR=0
-          if [ "${{ steps.syntax-errors.outcome }}" != "success" ]; then
-            echo "::error::Syntax errors check failed, see 'syntax-errors' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.black.outcome }}" != "success" ]; then
-            echo "::error::Black formatting check failed, see Summary or 'black' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.ruff.outcome }}" != "success" ]; then
-            echo "::error::Ruff check failed, see Summary or 'ruff' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.ty-bonsai.outcome }}" != "success" ]; then
-            echo "::error::ty check (bonsai) failed, see 'ty check (bonsai)' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.ty-ios.outcome }}" != "success" ]; then
-            echo "::error::ty check (ios) failed, see 'ty check (ios)' step for the details." && ERROR=1
-          fi
-          exit $ERROR

.github/workflows/ci-pyodide-wasm-release.yml

@@ -1,46 +0,0 @@
-name: Release Pyodide WASM Wheel
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout IfcOpenShell
-        uses: actions/checkout@v7
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-
-      - name: Build wheel
-        working-directory: pyodide
-        run: uv run pack_wheel.py --build
-
-      - name: Find wheel
-        id: wheel
-        run: |
-          WHEEL=$(ls pyodide/dist/ifcopenshell-*.whl)
-          echo "path=$WHEEL" >> $GITHUB_OUTPUT
-          echo "name=$(basename $WHEEL)" >> $GITHUB_OUTPUT
-
-      - name: Checkout wasm-wheels
-        uses: actions/checkout@v7
-        with:
-          repository: IfcOpenShell/wasm-wheels
-          path: wasm-wheels
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Commit and push wheel to wasm-wheels
-        run: |
-          WHEEL_NAME="${{ steps.wheel.outputs.name }}"
-          cp "${{ steps.wheel.outputs.path }}" "wasm-wheels/$WHEEL_NAME"
-          cd wasm-wheels
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add "$WHEEL_NAME"
-          git commit -m "Add $WHEEL_NAME"
-          VERSION=$(cat ../VERSION)
-          git tag "v${VERSION}"
-          git push origin main
-          git push origin "v${VERSION}"

.github/workflows/ci.yml

@@ -10,14 +10,11 @@ on:
       - 'src/ifcgeomserver/**'
       - 'src/ifcjni/**'
       - 'src/ifcmax/**'
-      - 'src/ifc5d/**'
-      - 'src/ifcedit/**'
-      - 'src/ifcmcp/**'
       - 'src/ifcopenshell-python/**'
       - '!src/ifcopenshell-python/docs/**'
       - 'src/ifcparse/**'
-      - 'src/ifcquery/**'
       - 'src/ifcwrap/**'
+      - 'src/qtviewer/**'
       - 'src/svgfill/**'
       - 'src/serializers/**'
       - 'conda/**'
@@ -37,39 +34,27 @@ jobs:
   compile-and-test:
     runs-on: ubuntu-22.04
     needs: activate
-    strategy:
-      fail-fast: false
-      matrix:
-        build_shared_libs: [ON, OFF]
-    env:
-      # Colored output for cmake.
-      CLICOLOR_FORCE: "1"
-      CMAKE_COLOR_DIAGNOSTICS: "ON"
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v5
         with:
             submodules: recursive
 
       - name: Set up Python
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
         with:
           python-version: 3.11
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely pyparsing psutil
+          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
           pip install src/bcf --no-deps
+          pip install git+https://github.com/zdhoward/aud
           pip install pytest-xdist==3.8.0
 
       - name: Install C++ dependencies
         run: |
           sudo apt update
-          # `occt-misc` is only needed for 22.04, since it has cmake configs.
-          # In 24.04+, the needed files were moved `libocct-foundation-dev` and `occt-misc` can be removed.
-          # Other libs in `OCCT_CMAKE_DEPS` are needed only for cmake config to work properly, they're not used directly.
-          OCCT_CMAKE_DEPS="occt-misc libocct-draw-dev tcl-dev tk-dev libxi-dev"
-
           sudo apt-get install --no-install-recommends \
           git cmake gcc g++ \
           libboost-date-time-dev \
@@ -82,11 +67,13 @@ jobs:
           libpcre3-dev libxml2-dev \
           libtbb-dev nlohmann-json3-dev \
           libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-          ${OCCT_CMAKE_DEPS} \
-          libcgal-dev libeigen3-dev
+          libhdf5-dev libcgal-dev libeigen3-dev
           
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        # TODO: temporarily pointing to 1.2.19 to get notified by dependabot when 1.2.20 is released
+        # to update hardcoded references to commits in some other workflows.
+        # Then we can switch back to 1.2 in all actions.
+        uses: hendrikmuhs/ccache-action@v1.2.19
         with:
           key: ubuntu-22.04-${{ runner.arch }}
 
@@ -121,7 +108,7 @@ jobs:
           cd OpenCOLLADA
           git checkout v1.6.68
           patch -p1 --batch --forward -i ../nix/patches/opencollada/pr622_and_disable_subdirs.patch
-          patch -p1 --batch --forward -i ../nix/patches/opencollada/config_select_libs_by_use_shared.patch
+          patch -p1 --batch --forward -i ../nix/patches/opencollada/allow_static_libraries_config_on_unix.patch
           mkdir build && cd build
           cmake .. \
             -DCMAKE_BUILD_TYPE=Release \
@@ -131,31 +118,6 @@ jobs:
             -DCMAKE_CXX_FLAGS_INIT="-fPIC"
           sudo make -j$(nproc) install
 
-      # We need zstd and libxml2 just for cmake config files to test the examples build.
-      # zslibzstd-dev has cmake config only on Ubuntu 24.04+.
-      - name : Build zstd
-        run: |
-          git clone https://github.com/facebook/zstd --depth 1 --branch v1.5.7
-          cd zstd
-          # `build` already exists.
-          mkdir build_ && cd build_
-          cmake ../build/cmake -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          sudo cmake --build . --target install -j $(nproc)
-
-      # libxml2-dev doesn't have cmake configs even on Ubuntu 24.04+.
-      - name: Build libxml2
-        run: |
-          git clone https://gitlab.gnome.org/GNOME/libxml2.git --branch v2.13.8 --depth 1
-          cd libxml2
-          mkdir build && cd build
-          cmake .. \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          sudo cmake --build . --target install -j $(nproc)
-
       # Ubuntu has `swig` package, but we build it to match the version we use in the main build.
       # To avoid failing tests when checking stub generation.
       - name: build swig
@@ -163,8 +125,9 @@ jobs:
           # Remove default swig to avoid conflicts.
           sudo apt remove --purge swig swig4.0
           sudo apt-get install -y libpcre2-dev bison
-          git clone https://github.com/swig/swig --branch v4.2.1 --depth 1
+          git clone https://github.com/swig/swig
           cd swig
+          git checkout v4.1.0
           mkdir build && cd build
           cmake .. \
             -DCMAKE_BUILD_TYPE=Release \
@@ -178,18 +141,21 @@ jobs:
           echo ${{ env.pythonLocation }}
           
           mkdir build && cd build
+          # Ubuntu 22.04's libocct-foundation-dev package doesn't have Config.cmake, so we provide OCC paths directly.
+          # In later versions of Ubuntu, this can be simplified and the OCC paths can be removed.
           cmake \
+               -DCMAKE_CXX_STANDARD=17 \
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_PREFIX_PATH=/usr \
                -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
+               -DOCC_INCLUDE_DIR=/usr/include/opencascade \
+               -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
                -DPYTHON_EXECUTABLE:FILEPATH=${{ env.pythonLocation }}/bin/python \
                -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
                -DUSE_MMAP=On \
-               -DBUILD_SHARED_LIBS=${{ matrix.build_shared_libs }} \
                "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \
                -DGLTF_SUPPORT=On \
                -DWITH_ROCKSDB=On \
-               -DBUILD_EXAMPLES=ON \
              ../cmake
           sudo make -j $(nproc)
           sudo make install
@@ -212,21 +178,6 @@ jobs:
         run: |
           IfcConvert test/input/acad2010_walls.ifc test/input/acad2010_walls.obj
 
-      - name: Build standalone examples to test cmake package
-        run: |
-          set -x
-          cd src/examples
-          mkdir build && cd build
-          cmake .. -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          cmake --build .
-          ./IfcOpenHouse                && test -f IfcOpenHouse.ifc
-          ./IfcParseExamples IfcOpenHouse.ifc
-          ./IfcAdvancedHouse            && test -f IfcAdvancedHouse.ifc 
-          ./IfcAlignment                && test -f FHWA_Bridge_Geometry_Alignment_Example.ifc
-          ./IfcSimplifiedAlignment      && test -f FHWA_Bridge_Geometry_Alignment_Example_Simplified.ifc
-
       - name: Test ifcopenshell-python
         run: |
           cd test
@@ -242,28 +193,12 @@ jobs:
           pip install deepdiff
           cd ../ifcdiff && make test || ERROR=1
           cd ../ifcpatch && make test || ERROR=1
-          pip install -e ../ifc5d --no-deps
-          pip install odfpy openpyxl
-          cd ../ifc5d && make test || ERROR=1
-          pip install -e ../ifcquery --no-deps
-          cd ../ifcquery && make test || ERROR=1
-          pip install -e ../ifcedit --no-deps
-          cd ../ifcedit && make test || ERROR=1
-          # Pinned <2: mcp 2.0.0 renamed mcp.server.fastmcp.FastMCP to
-          # mcp.server.mcpserver.MCPServer, which ifcmcp doesn't support yet.
-          pip install "mcp>=1.0,<2"
-          pip install -e ../ifcmcp --no-deps
-          cd ../ifcmcp && make test || ERROR=1
           pip install -e ../ifctester --no-deps
           cd ../ifctester && make test || ERROR=1
-          make build-ids-docs || ERROR=1
           # Run mathutils related tests at the end to ensure no other code is relying on mathutils.
-          # mathutils only has pre-built wheels for Python 3.13+; skip on older versions.
           cd ../ifcopenshell-python
-          if python -c "import sys; sys.exit(0 if sys.version_info >= (3, 13) else 1)"; then
-            pip install mathutils
-            make test-mathutils || ERROR=1
-          fi
+          pip install mathutils
+          make test-mathutils || ERROR=1
           if [ $ERROR -ne 0 ]; then
             echo "One or more tests failed";
             exit 1;

.github/workflows/docs-deployment-unstable.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 

.github/workflows/docs-deployment.yml

@@ -0,0 +1,36 @@
+name: Build and Deploy Stable Documentation
+
+on:
+  workflow_dispatch:  # Manual trigger
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          cd src/bonsai/docs
+          pip install -r requirements.txt  # Run pip install from the docs directory
+
+      - name: Build documentation
+        run: |
+          cd src/bonsai/docs
+          make html
+
+      - name: Deploy to GitHub Pages (Stable)
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          external_repository: IfcOpenShell/bonsaibim_org_docs
+          publish_branch: main
+          cname: docs.bonsaibim.org
+          publish_dir: src/bonsai/docs/_build/html

.github/workflows/publish-aichat-app.yaml

@@ -1,65 +0,0 @@
-name: Deploy AI chat App to static page repo
-
-permissions:
-  id-token: write
-  pages: write
-
-on:
-  push:
-    paths:
-      - 'src/ifcchat/**'
-      - '.github/workflows/publish-aichat-app.yaml'
-    branches:
-      - v0.8.0
-  workflow_dispatch:
-
-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@v7
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Checkout intermediate Pages repo
-        uses: actions/checkout@v7
-        with:
-          repository: IfcOpenShell/aichat_ifcopenshell_org_static_html
-          ref: gh-pages
-          path: output
-          token: ${{ secrets.WEBSITE_PUBLISH }}
-      - name: Sync demo app into target subfolder
-        run: |
-          rsync -av --delete --exclude='.git/' src/ifcchat/ output/
-      - name: Setup Python
-        uses: actions/setup-python@v7
-        with:
-          python-version: "3.x"
-      - name: Download wheels
-        working-directory: output/
-        run: |
-          pip download ifcquery==0.8.5 ifcopenshell-mcp==0.8.5 ifcedit==0.8.5 lark==1.3.1 isodate==0.7.2 --no-deps -d ./dist
-      - name: Commit and push if changed
-        working-directory: output
-        run: |
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
-
-          git add .
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-            exit 0
-          fi
-
-          git commit  -m "$(git log --oneline -1)"
-          git push origin gh-pages

.github/workflows/publish-bonsai-releases.yml

@@ -1,16 +0,0 @@
-name: Publish Bonsai Releases
-
-on:
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-
-      - uses: astral-sh/setup-uv@v7
-
-      - run: uv run .github/scripts/publish-bonsai-releases.py
-        env:
-          BLENDER_EXTENSIONS_TOKEN: ${{ secrets.BLENDER_EXTENSIONS_TOKEN }}

.github/workflows/publish-cpp-api-docs.yml

@@ -1,87 +0,0 @@
-# This file was generated with the assistance of an AI coding tool.
-
-name: Publish C++ API documentation
-
-on:
-  push:
-    branches:
-      - v0.9.0
-    paths:
-      - '.github/workflows/publish-cpp-api-docs.yml'
-      - 'docs/cpp-api/**'
-      - 'src/ifcgeom/**'
-      - 'src/ifcparse/**'
-      - 'src/serializers/**'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: publish-cpp-api-docs
-  cancel-in-progress: false
-
-jobs:
-  publish:
-    if: github.repository == 'IfcOpenShell/IfcOpenShell'
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout IfcOpenShell
-        uses: actions/checkout@v7
-
-      - name: Set up Python
-        uses: actions/setup-python@v7
-        with:
-          python-version: '3.10'
-
-      - name: Install documentation dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install --yes doxygen graphviz
-          python -m pip install --requirement docs/cpp-api/requirements.txt
-
-      - name: Build C++ API documentation
-        working-directory: docs/cpp-api
-        run: |
-          export PROJECT_NUMBER="$(git rev-parse --short HEAD)"
-          python -m sphinx -M html . output -W --keep-going
-
-      - name: Checkout documentation repository
-        uses: actions/checkout@v7
-        with:
-          repository: IfcOpenShell/cpp_docs
-          ref: master
-          path: published-docs
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Replace published documentation
-        run: |
-          publish_tree="${RUNNER_TEMP}/published-docs-tree"
-          mkdir -p "${publish_tree}/v0.9.0-latest"
-
-          rsync --archive docs/cpp-api/output/html/ "${publish_tree}/v0.9.0-latest/"
-          touch "${publish_tree}/.nojekyll"
-
-          if [[ -f published-docs/CNAME ]]; then
-            cp published-docs/CNAME "${publish_tree}/CNAME"
-          fi
-
-          rsync --archive --delete --exclude='.git/' "${publish_tree}/" published-docs/
-
-      - name: Commit and push if changed
-        working-directory: published-docs
-        env:
-          SOURCE_SHA: ${{ github.sha }}
-        run: |
-          git config user.name 'IfcOpenBot'
-          git config user.email 'IfcOpenBot@users.noreply.github.com'
-
-          git add --all
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-            exit 0
-          fi
-
-          git commit -m "Update C++ API docs from ${SOURCE_SHA:0:7}"
-          git push origin master

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

@@ -1,4 +1,4 @@
-name: Deploy Pyodide Demo App to static page repo
+name: Deploy Pyodide Demo App to GitHub Pages
 
 permissions:
   id-token: write
@@ -11,7 +11,6 @@ on:
       - '.github/workflows/publish-pyodide-demo-app.yml'
     branches:
       - v0.8.0
-  workflow_dispatch:
 
 jobs:
   activate:
@@ -27,31 +26,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout (recursive)
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           fetch-depth: 0
-      - name: Checkout intermediate Pages repo
-        uses: actions/checkout@v7
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v4
         with:
-          repository: IfcOpenShell/wasm_ifcopenshell_org_static_html
-          ref: gh-pages
-          path: output
-          token: ${{ secrets.WEBSITE_PUBLISH }}
-      - name: Sync demo app into target subfolder
-        run: |
-          rsync -av --delete --exclude='.git/' src/pyodide/demo-app/ output/
-      - name: Commit and push if changed
-        working-directory: output
-        run: |
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
+          path: src/pyodide/demo-app/
 
-          git add .
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-            exit 0
-          fi
-
-          git commit -m "$(git log --oneline -1)"
-          git push origin gh-pages
+  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

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Install C++ dependencies
@@ -36,7 +36,7 @@ jobs:
           swig libpcre3-dev libxml2-dev \
           libtbb-dev nlohmann-json3-dev \
           libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-          libcgal-dev opencollada-dev
+          libhdf5-dev libcgal-dev opencollada-dev
           
       - name: Build
         env:
@@ -46,6 +46,7 @@ jobs:
           mkdir build && cd build
           cmake \
            -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
+           -DCMAKE_CXX_STANDARD=17 \
            -DCMAKE_BUILD_TYPE=Release \
            -DCMAKE_PREFIX_PATH=/usr \
            -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -64,6 +65,7 @@ jobs:
            -DMPFR_INCLUDE_DIR=/usr/include \
            -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
            -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+           -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
            -DOPENCOLLADA_INCLUDE_DIR=/usr/include/opencollada \
            -DOPENCOLLADA_LIBRARY_DIR=/usr/lib/opencollada/ \
            ../cmake

.gitignore

@@ -4,21 +4,13 @@
 /_deps-vs*-x*-installed/
 /_installed-vs*-x*/
 /build/
-/build.log
-/output/
-/src/examples/build/
-# ifctester docs output
-/src/ifctester/test/build/
 
 # output directories
 /cmake/out/
 /src/examples/out/
 /src/ifcmax/out/
 /src/ifcwrap/out/
-/src/ifctester/webapp/public/pyodide/
-# pyodide wheels
-/dist/
-/dist-modular/
+/src/qtviewer/out/
 
 /win/BuildDepsCache*.txt
 
@@ -26,14 +18,10 @@
 __pycache__
 *.py.bak
 venv
-uv.lock
 
 # Visual Studio Code files
 .vscode
-!.vscode/launch.json
-!.vscode/tasks.json
 .vs
-/*.code-workspace
 
 # PyCharm files
 .idea
@@ -89,14 +77,8 @@ src/ifcopenshell-python/test/build
 # bonsai i18n
 src/bonsai/bonsai/translations.py
 
-# bonsai external dependencies (cloned for just ty checks)
-src/bonsai/external_dependencies/
-
-# bonsai test temp/cache files
+# bonsai test temp files
 src/bonsai/test/files/temp
-src/bonsai/test/files/*.cache.blend
-src/bonsai/test/files/*.cache.json
-src/bonsai/test/files/*.cache.sqlite
 
 # bonsai data
 src/bonsai/bonsai/bim/data/build/
@@ -110,15 +92,6 @@ src/bonsai/bonsai/bim/data/webui/running_pid.json
 src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper*.so
 src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 
-# plugins
-src/ifcopenshell-python/ifcopenshell/ifcopenshell_document_*.so
-src/ifcopenshell-python/ifcopenshell/ifcopenshell_geometry_*.so
-src/ifcopenshell-python/ifcopenshell/ifcopenshell_parse_schema*.so
-src/ifcopenshell-python/ifcopenshell/libifcopenshell.geometry.so
-src/ifcopenshell-python/ifcopenshell/libifcopenshell.geometry.writer.so
-src/ifcopenshell-python/ifcopenshell/libifcopenshell.parse.so
-src/ifcopenshell-python/ifcopenshell/libifcopenshell.plugin.so
-
 # apple
 .DS_Store
 
@@ -126,9 +99,6 @@ src/ifcopenshell-python/ifcopenshell/libifcopenshell.plugin.so
 .clangd
 # clangd cache
 .cache
-# Useful for symlinking json compilation database from cmake,
-# allowing clang commands without `-p path/to/build`.
-/compile_commands.json
 
 # Brickschema
 src/bonsai/bonsai/bim/schema/Brick.ttl
@@ -140,14 +110,3 @@ dev_environment.bat
 
 src/ifcopenshell-python/ifcopenshell/express/*.exp
 src/ifcopenshell-python/ifcopenshell/express/*.exp.cache.dat
-
-
-# temp files from AI coding tools
-*.claude
-CLAUDE.local.md
-*.py.tmp*
-*.json.tmp*
-
-# bonsaiviewer-autodesk connector build artifacts
-/src/bonsaiviewer-autodesk/build/
-/src/bonsaiviewer-autodesk/dist/

.gitmodules

@@ -5,15 +5,18 @@
 [submodule "src/ifcopenshell-python/ifcopenshell/mvd"]
 	path = src/ifcopenshell-python/ifcopenshell/mvd
 	url = https://github.com/opensourceBIM/python-mvdxml/
+[submodule "src/svgfill"]
+	path = src/svgfill
+	url = https://github.com/IfcOpenShell/svgfill
 [submodule "src/ifcopenshell-python/test/Sample-BIM-Files"]
 	path = src/ifcopenshell-python/test/Sample-BIM-Files
 	url = https://github.com/IfcOpenShell/ids-test-files
+[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
-[submodule "src/svgfill/3rdparty/svgpp"]
-	path = src/svgfill/3rdparty/svgpp
-	url = https://github.com/svgpp/svgpp

.vscode/launch.json

@@ -1,24 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-
-        {
-            "name": "Python Debugger: Remote Attach",
-            "type": "debugpy",
-            "request": "attach",
-            "connect": {
-                "host": "localhost",
-                "port": 5678
-            },
-            "pathMappings": [
-                {
-                    "localRoot": "${config:bonsai.localRoot}",
-                    "remoteRoot": "${config:bonsai.remoteRoot}"
-                }
-            ]
-        }
-    ]
-}

.vscode/tasks.json

@@ -1,53 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Configure bonsai/vscode development environment",
-            "type": "shell",
-            "command": "${input:blenderPath}",
-            "args": [
-                "--background",
-                "--python", "${workspaceFolder}/src/bonsai/scripts/dev_environment_vscode_config.py"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Launch blender with debugpy",
-            "type": "shell",
-            "command": "blender",
-            "options": {
-                "cwd": "${config:bonsai.blenderPath}"
-            },
-            "args": [
-                "--python-expr",
-                "import debugpy; debugpy.listen(5678)"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Install debugpy in Blender",
-            "type": "shell",
-            "command": "blender",
-            "options": {
-                "cwd": "${config:bonsai.blenderPath}"
-            },
-            "args": [
-                "--background",
-                "--python-expr",
-                "import os, sys, subprocess; path=os.path.abspath(sys.executable); subprocess.call([path, '-m', 'ensurepip']); subprocess.call([path, '-m', 'pip', 'install', '--upgrade', 'debugpy'])"
-            ],
-            "problemMatcher": []
-        }
-         
-    ],
-    "inputs": [
-        {
-            "id": "blenderPath",
-            "type": "promptString",
-            "description": "Enter the path to the blender executable",
-            "default": "blender"
-        }
-    ]
-}

AGENTS.md

@@ -1,153 +0,0 @@
-<!-- This file was generated with the assistance of an AI coding tool. -->
-
-# AGENTS.md
-
-Guidelines for AI coding agents contributing to IfcOpenShell. This file is
-intended to be read by all AI agents regardless of platform (Claude Code,
-Copilot, Cursor, etc.) in addition to any tool-specific configuration files.
-
-Human contributors using AI tools should also read this document carefully,
-as they are responsible for ensuring their contributions comply with these
-guidelines.
-
-## Project Overview
-
-IfcOpenShell is an open source library for working with Industry Foundation
-Classes (IFC). It provides C++ and Python APIs, geometry processing, and an
-ecosystem of tools including IfcConvert and the Bonsai Blender add-on.
-
-## Licensing
-
-All contributions must be compatible with the project's licensing:
-
-- **Library code** (everything except Bonsai): **LGPL-3.0-or-later**
-- **Bonsai** (`src/bonsai/`): **GPL-3.0-or-later**
-
-There is no Contributor License Agreement (CLA). By submitting a pull request,
-you agree that your contribution is licensed under the applicable license above.
-
-## Indicating AI-Generated Code
-
-Contributors must clearly indicate when code has been generated or
-substantially written by an AI tool.
-
-### Commits
-
-Commits that modify existing code must include a note in the **body** of the
-commit message (not the subject line) indicating that the change was
-AI-generated. For example:
-
-```
-Fix off-by-one error in element iteration
-
-The loop termination condition was incorrect when processing
-IfcRelAggregates relationships.
-
-Generated with the assistance of an AI coding tool.
-```
-
-### New Files
-
-New files that are AI-generated must include a comment near the top of the
-file indicating this. Use the appropriate comment syntax for the language:
-
-```python
-# This file was generated with the assistance of an AI coding tool.
-```
-
-```cpp
-// This file was generated with the assistance of an AI coding tool.
-```
-
-### Pull Requests
-
-Pull requests containing AI-generated code must indicate in the PR description
-which parts of the contribution are AI-generated. If the entire PR is
-AI-generated, state that clearly. If only specific commits or files are
-AI-generated, identify them.
-
-## Pull Request Guidelines
-
-### Scope and Size
-
-- Each pull request should address a **single issue or feature**.
-- Do not mix unrelated changes (e.g., bug fixes with refactoring or style
-  changes) in the same PR.
-- Large pull requests should be broken down into **multiple small, standalone
-  commits** that are each easy to review independently. Rewrite commit history
-  for this purpose if necessary.
-- PRs that are minimal, focused solutions to a specific problem are much more
-  likely to be accepted.
-
-### What to Avoid
-
-- **Over-engineering**: Do not add features, abstractions, or configurability
-  beyond what is needed to solve the immediate problem.
-- **Scope creep**: Do not make changes to files or code that are not directly
-  related to the task at hand.
-- **Unnecessary additions**: Do not add docstrings, comments, type annotations,
-  or error handling to code you did not otherwise need to change.
-- **Cosmetic changes**: Do not reformat, rename, or reorganize code that is
-  unrelated to your change.
-
-## Commit Messages
-
-- The **subject line** must be **50 characters or less**.
-- Use the **imperative mood** (e.g., "Fix crash in geometry kernel", not
-  "Fixed crash" or "Fixes crash").
-- A commit message can be a single line if the purpose is obvious from the
-  subject alone.
-- Otherwise, add a blank line after the subject followed by a short explanation
-  of a few lines in the body.
-
-## Code Style
-
-### Python
-
-- **Line length**: 120 characters
-- **Formatter**: black
-- **Linter**: ruff
-- Configuration is in `pyproject.toml`
-
-### C++
-
-- **Standard**: C++17 minimum
-- **Formatter**: clang-format (configuration in `.clang-format`)
-- **Linter**: clang-tidy (configuration in `.clang-tidy`)
-
-Run linters and formatters **before submitting** your pull request. Do not rely
-on CI to catch formatting issues.
-
-## Testing
-
-- Pull requests with test coverage are **much more likely to be merged**.
-- If tests are appropriate and feasible for your change, they should be
-  included.
-- Tests are not required for every change (e.g., documentation-only changes),
-  but the expectation is that testable code changes come with tests.
-- Python tests use **pytest** and are located in `test/` or `tests/` directories
-  within each package under `src/`.
-- Run the existing test suite for the package you modified before submitting.
-
-## Architecture Quick Reference
-
-### Directory Structure
-
-- `src/ifcparse/` — C++ IFC file parsing
-- `src/ifcgeom/` — C++ geometry processing (OpenCASCADE and CGAL kernels)
-- `src/serializers/` — Output format serializers (glTF, Collada, SVG, etc.)
-- `src/ifcwrap/` — SWIG Python bindings
-- `src/ifcconvert/` — CLI conversion tool
-- `src/ifcopenshell-python/` — Python API (`ifcopenshell` package)
-- `src/bonsai/` — Blender add-on (GPL-3.0-or-later)
-- `src/ifctester/` — IDS model auditing
-- `src/ifcpatch/` — IFC file manipulation scripts
-- `src/ifcdiff/` — IFC model comparison
-- `src/ifcclash/` — Clash detection
-- `src/ifccsv/` — Schedule import/export
-
-### IFC Schema Versions
-
-The library supports IFC2x3 TC1, IFC4 Add2 TC1, IFC4x1, IFC4x2, and
-IFC4x3 Add2. Schema-specific code is compiled conditionally. Be aware of
-which schema versions your change affects.

Dockerfile

@@ -27,7 +27,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu focal-proposed main restricted" |
                     libboost-all-dev \
                     libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev \
                     libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-                    python3-pytest ; \
+                    libhdf5-serial-dev python3-pytest ; \
     rm -rf /var/lib/apt/lists/* ; 
 
 COPY . /home/IfcOpenShell/

README.md

@@ -18,7 +18,7 @@ and many other libraries, CLI apps, and more. Support is also provided for auxil
 
 For more information, see:
 
-* [IfcOpenShell Website](https://ifcopenshell.org)
+* [IfcOpenShell Website](http://ifcopenshell.org)
 * [IfcOpenShell Documentation](https://docs.ifcopenshell.org)
   * [IfcOpenShell C++ Installation](https://docs.ifcopenshell.org/ifcopenshell/installation.html)
   * [IfcOpenShell Python Installation](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html)
@@ -50,14 +50,11 @@ Contents
 | [ifcconvert](https://docs.ifcopenshell.org/ifcconvert.html)                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
 | [ifccsv](https://docs.ifcopenshell.org/ifccsv.html)                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
 | [ifcdiff](https://docs.ifcopenshell.org/ifcdiff.html)                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
-| [ifcedit](https://docs.ifcopenshell.org/ifcedit.html)                   | CLI wrapper for ifcopenshell.api IFC model mutation functions         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcedit?label=PyPI&color=006dad)](https://pypi.org/project/ifcedit/) |
 | [ifcfm](https://docs.ifcopenshell.org/ifcfm.html)                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
 | [ifcmax](https://docs.ifcopenshell.org/ifcmax.html)                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
-| [ifcmcp](https://docs.ifcopenshell.org/ifcmcp.html)                    | MCP server for querying and editing IFC building models               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcopenshell-mcp?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell-mcp/) |
-| [ifcopenshell-python](https://docs.ifcopenshell.org/ifcopenshell-python.html)       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) [![Pyodide WASM Wheels tag](https://img.shields.io/github/v/tag/ifcopenshell/wasm-wheels?sort=semver&label=pyodide-wasm-wheels)](https://github.com/IfcOpenShell/wasm-wheels) |
+| [ifcopenshell-python](https://docs.ifcopenshell.org/ifcopenshell-python.html)       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) [Pyodide WASM Wheels](https://github.com/IfcOpenShell/wasm-wheels#pyodide-test-wheels) |
 | [ifcpatch](https://docs.ifcopenshell.org/ifcpatch.html)                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
-| [ifcquery](https://docs.ifcopenshell.org/ifcquery.html)                  | CLI tool for querying and inspecting IFC building models              | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcquery?label=PyPI&color=006dad)](https://pypi.org/project/ifcquery/) |
-| [ifcsverchok](https://docs.ifcopenshell.org/ifcsverchok.html)               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
+| [ifcsverchok](https://docs.ifcopenshell.org/ifcsverchok.html)               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
 | [ifctester](https://docs.ifcopenshell.org/ifctester.html)                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |
 
 The IfcOpenShell C++ codebase is split into multiple interal libraries:
@@ -70,6 +67,7 @@ The IfcOpenShell C++ codebase is split into multiple interal libraries:
 | ifcjni                    | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | ifcparse                  | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | ifcwrap                   | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
+| qtviewer                  | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | serializers               | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 
 [LGPL]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/COPYING.LESSER "LGPL-3.0-or-later"

VERSION

@@ -1 +1 @@
-0.9.0alpha0
+0.8.5

aws/lambda/example_handler/__init__.py

@@ -1,6 +1,6 @@
-import boto3
 import ifcopenshell
 import ifcopenshell.util.element
+import boto3
 
 s3 = boto3.client('s3')
 

choco/bonsai/blenderbim.nuspec

@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>blenderbim-nightly</id>
-    <version>blenderbim_build_version</version>
+    <version>blenderbim_build_version-alpha</version>
     <packageSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</packageSourceUrl>
     <owners>fbpyr</owners>
     <!-- == SOFTWARE SPECIFIC SECTION == -->

choco/bonsai/choco_release.py

@@ -3,33 +3,30 @@
 apt update && apt install git wget curl ptpython mono-devel micro
 mkdir -p /home/runner/work/IfcOpenShell && cd /home/runner/work/IfcOpenShell
 git clone https://github.com/IfcOpenShell/IfcOpenShell
-cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/bonsai/
+cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/
 micro choco_release.py # paste this script, comment out push command
 export CHOCO_TOKEN="secret_choco_release_token"
 python3 choco_release.py
 """
-
 import datetime
 import hashlib
 import os
 import pathlib
 import re
-import subprocess
-from typing import NoReturn
 from urllib import request
-
 from github import Github
+from typing import NoReturn
 
 
 def get_repo_tag_names() -> list[str]:
-    git_return = subprocess.check_output("git tag -l", text=True)
+    git_return = os.popen("git tag -l").read()
     tag_names = [tag_name for tag_name in git_return.split("\n") if tag_name]
     print(f"{len(tag_names)} tag_names found in repo")
     return tag_names
 
 
 def request_repo_info(url: str):
-    req = request.Request(url)
+    req  = request.Request(url)
     resp = request.urlopen(req)
     if not resp.status == 200:
         print(f"[ERROR] could not contact server: {url}")
@@ -80,21 +77,15 @@ def get_release_zip(tag: str) -> tuple[str, str]:
     raise Exception(f"Couldn't find the release matching '{python_version}' and '{TARGET_OS}' in tag '{tag}'.")
 
 
-def run(command: str) -> None:
-    subprocess.check_output(command)
-
-
 start = datetime.datetime.now()
 
-URL_CHOCO_PACKAGE = "https://community.chocolatey.org/packages/blender"
-URL_BLENDER_CMAKE = (
-    "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
-)
-RE_BLENDER_VERSION_MIN_MAJ = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
-RE_BLENDER_VERSION_MIN_MAJ_PAT = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
+URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
+RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
 RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
 
-BLENDERBIM_DIR = pathlib.Path("/home/runner/work/IfcOpenShell/IfcOpenShell/choco/bonsai/")
+BLENDERBIM_DIR = pathlib.Path("/home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/")
 
 print("_____ check choco release needed?")
 
@@ -105,7 +96,7 @@ should_release = False
 target_release_tag = ""
 TARGET_OS = "windows-x64"
 
-git_status = subprocess.check_output("git status", text=True)
+git_status = os.popen("git status").read()
 print(git_status)
 
 for tag_name in get_repo_tag_names():
@@ -151,11 +142,11 @@ print(f"{blender_python_version_maj_min=}")
 python_version = f"py{found[0].replace('.', '')}"
 print(f"{python_version=}")
 
-blenderbim_build_version = target_release_tag.replace("bonsai-", "")
+blenderbim_build_version = target_release_tag.replace("blenderbim-", "")
 
 # url_blenderbim_py3x_win_zip
 release_zip_file_name, url_blenderbim_py3x_win_zip = get_release_zip(target_release_tag)
-subprocess.check_call(f"wget {url_blenderbim_py3x_win_zip} --no-verbose")
+os.popen(f"wget {url_blenderbim_py3x_win_zip} --no-verbose").read()
 
 # sha256sum_blenderbim_py310_win_zip
 sha256sum_blenderbim_py3x_win_zip = get_file_sha256_hash(release_zip_file_name)
@@ -169,15 +160,15 @@ topics = {
         "path": HERE_DIR / "blenderbim.nuspec",
         "key_values": {
             "latest_blender_version_maj_min_pat": latest_blender_release_maj_min_pat,
-            "blenderbim_build_version": blenderbim_build_version,
+            "blenderbim_build_version"          : blenderbim_build_version,
         },
     },
     "install": {
         "path": HERE_DIR / "tools" / "chocolateyinstall.ps1",
         "key_values": {
-            "url_blenderbim_py3x_win_zip": url_blenderbim_py3x_win_zip,
+            "url_blenderbim_py3x_win_zip"      : url_blenderbim_py3x_win_zip,
             "sha256sum_blenderbim_py3x_win_zip": sha256sum_blenderbim_py3x_win_zip,
-            "latest_blender_version_maj_min": blender_version_min_maj,
+            "latest_blender_version_maj_min"   : blender_version_min_maj,
         },
     },
     "uninstall": {
@@ -209,13 +200,13 @@ print("[INFO] inserting dynamic chocolatey package parameters successful")
 print("\n_____ build choco.exe with mono")
 
 choco_version = "1.1.0"
-run(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet")
-run(f"tar -xzf {choco_version}.tar.gz")
+os.popen(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet").read()
+os.popen(f"tar -xzf {choco_version}.tar.gz").read()
 print("choco tar unpack successful")
 os.chdir("choco-1.1.0")
-run("./build.sh")
+os.popen("./build.sh").read()
 
-run("cp -r build_output/chocolatey /opt/chocolatey")
+os.popen("cp -r build_output/chocolatey /opt/chocolatey").read()
 os.chdir(BLENDERBIM_DIR)
 
 if pathlib.Path("/opt/chocolatey/choco.exe").exists():
@@ -223,15 +214,11 @@ if pathlib.Path("/opt/chocolatey/choco.exe").exists():
 
 print("\n_____ build choco pack")
 
-run("mono /opt/chocolatey/choco.exe pack --allow-unofficial")
-run(
-    'mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial'
-)
+os.popen("mono /opt/chocolatey/choco.exe pack --allow-unofficial").read()
+os.popen('mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial').read()
 
 print("\n_____ build choco push")
-run(
-    'mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose'
-)
+os.popen('mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose').read()
 
 print(f"choco push of version: {target_release_tag} successful!")
 print(f"it took: {datetime.datetime.now() - start}")

choco/bonsai/tools/disable_blenderbim_addon.py

@@ -1,5 +1,6 @@
 import bpy
 
+
 bpy.ops.preferences.addon_disable(module='blenderbim')
 bpy.ops.wm.save_userpref()
 

choco/bonsai/tools/enable_blenderbim_addon.py

@@ -1,5 +1,6 @@
 import bpy
 
+
 bpy.ops.preferences.addon_enable(module='blenderbim')
 bpy.ops.wm.save_userpref()
 

cmake/CMakeLists.txt

@@ -27,23 +27,6 @@ endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON) # not necessary, but encouraged
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# The VERSION file in the repository root is the single source of truth for the
-# release version. Read it unconditionally so a plain source build reports the
-# real version through buildinfo.cpp instead of the stale hardcoded 0.8.0
-# fallback (see #8164). VERSION_OVERRIDE still controls the branch name used
-# when ADD_COMMIT_SHA embeds a commit sha.
-file(READ "../VERSION" "RELEASE_VERSION_")
-string(STRIP "${RELEASE_VERSION_}" RELEASE_VERSION)
-message(STATUS "Detected version '${RELEASE_VERSION}'")
-
-# CMake's project(VERSION) only accepts numeric components. Keep the complete
-# release identifier for build information, but use its numeric release part
-# for PROJECT_VERSION, SOVERSION, and generated CMake package metadata.
-string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" PROJECT_VERSION_NUMERIC "${RELEASE_VERSION}")
-if(NOT PROJECT_VERSION_NUMERIC)
-    message(FATAL_ERROR "VERSION must start with a numeric major.minor.patch version: '${RELEASE_VERSION}'")
-endif()
-
 add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
 
 if(POLICY CMP0141) # 3.25+
@@ -63,77 +46,46 @@ endif()
 # Include utility macros and functions
 include(utilities.cmake)
 
-# Use a SemVer-compatible spelling for CPack artifact names. A trailing
-# alphabetic label and number is separated from the numeric version by a
-# hyphen: for example, 0.9.0alpha0 becomes 0.9.0-alpha0.
+# use extra version to make pre-release using eg semver
 if(NOT DEFINED EXTRA_VERSION)
-    if(RELEASE_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+([A-Za-z]+)([0-9]+)$")
-        set(EXTRA_VERSION "-${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
-    else()
-        set(EXTRA_VERSION "")
-    endif()
+    set(EXTRA_VERSION "-alpha.3")
 endif()
 
 option(MINIMAL_BUILD "The build is to make a minimal version of IFC converter from OCCT into IFC." OFF)
 option(WASM_BUILD "Build a WebAssembly binary." OFF)
 
 option(ENABLE_BUILD_OPTIMIZATIONS "Enable certain compiler and linker optimizations on RelWithDebInfo and Release builds." OFF)
-option(BUILD_SHARED_LIBS "Build IfcOpenShell as shared libraries (required)." ON)
+option(BUILD_SHARED_LIBS "Build IfcParse and IfcGeom as shared libs (SO/DLL)." OFF)
 option(MSVC_PARALLEL_BUILD "Multi-threaded compilation in Microsoft Visual Studio (/MP)" OFF)
 option(USE_VLD "Use Visual Leak Detector for debugging memory leaks, MSVC-only." OFF)
 option(USE_MMAP "Adds a command line options to parse IFC files from memory mapped files using Boost.Iostreams" OFF)
 option(NO_WARN "Disable all warnings" OFF)
-option(CREATE_BUNDLE "Copy .so files and don't create RPATHS or SOVERSION symlinks" )
 
 option(BUILD_IFCGEOM "Build IfcGeom." ON)
 option(BUILD_IFCPYTHON "Build IfcPython." ON)
-option(BUILD_IFCPARSE_EXPERIMENTAL_WRAPPER "Build the experimental Clang-generated ifcparse Python wrapper." OFF)
 option(BUILD_CONVERT "Build IfcConvert executable." ON)
 option(BUILD_DOCUMENTATION "Build IfcOpenShell Documentation." OFF)
 option(BUILD_EXAMPLES "Build example applications." ON)
 option(BUILD_GEOMSERVER "Build IfcGeomServer executable (Open CASCADE is required)." ON)
 option(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." OFF)
-option(BUILD_IFCMODEL_UI "Build minimal Qt IFC model UI prototype" OFF)
-option(BUILD_BONSAIVIEWER "Build Bonsai Viewer" OFF) # Requires Qt6 + OpenGL 4.5
-option(BUILD_IFCOPENSHELL_PARSE_TESTS "Build C++ unit tests for IfcParse (fetches Catch2 v3)" OFF)
-option(BUILD_IFCOPENSHELL_GEOMETRY_TESTS "Build C++ unit tests for IfcGeom (fetches Catch2 v3)" OFF)
-option(BUILD_BONSAIVIEWER_TESTS "Build unit tests for Bonsai Viewer core (fetches Catch2 v3)" OFF)
-option(BUILD_BONSAIVIEWER_WGPU "Build the experimental wgpu backend (fetches wgpu-native binary release)" OFF)
-# IfcViewer (the GL static lib) now links against IfcViewerWgpu because
-# SceneLoader drives the wgpu viewport. Auto-enable the wgpu subproject
-# whenever BUILD_BONSAIVIEWER is on so the link target exists.
-if(BUILD_BONSAIVIEWER AND NOT BUILD_BONSAIVIEWER_WGPU)
-    message(STATUS "BUILD_BONSAIVIEWER implies BUILD_BONSAIVIEWER_WGPU "
-                   "(SceneLoader uses ViewportWindow); auto-enabling.")
-    set(BUILD_BONSAIVIEWER_WGPU ON)
-endif()
+option(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer" OFF) # QtViewer requires Qt6
 option(BUILD_PACKAGE "" OFF)
 
-option(
-    IFCOPENSHELL_DEPLOY_QT_RUNTIME
-    "Deploy Qt runtime dependencies for installed Qt applications."
-    ON
-)
-option(
-    IFCOPENSHELL_DEPLOY_QT_TRANSLATIONS
-    "Deploy Qt translation catalogs with installed Qt applications."
-    OFF
-)
-
 option(WITH_OPENCASCADE "Enable geometry interpretation using Open CASCADE" ON)
 option(WITH_CGAL "Enable geometry interpretation using CGAL" ON)
-option(WITH_MANIFOLD "Enable geometry interpretation using Manifold" OFF)
 option(COLLADA_SUPPORT "Build IfcConvert with COLLADA support (requires OpenCOLLADA)." ON)
 option(GLTF_SUPPORT "Build IfcConvert with glTF support (requires json.hpp)." OFF)
+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(WITH_RELATIONSHIP_VALIDATION "Build IfcConvert with option to validate geometrical relationships." OFF)
 option(WITH_ROCKSDB "Support a RocksDB key-value store as a file backend in IfcOpenShell" OFF)
 option(WITH_ZSTD "Use Zstd compression in RocksDB writes" OFF)
 
 option(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
-option(USE_DEBUG_PYTHON "Use debug binaries when building Debug IfcPython on Windows." OFF)
 option(ADD_COMMIT_SHA "Add commit sha and branch in version number, requires git" OFF)
-option(VERSION_OVERRIDE "Use VERSION as the branch label when commit information is embedded" OFF)
+option(VERSION_OVERRIDE "Override the version defined in buildinfo.cpp with the file VERSION in the repository root" OFF)
 
 set(
     PYTHON_MODULE_INSTALL_DIR
@@ -141,28 +93,19 @@ set(
     "Directory to install IfcPython package to. By default package is installed in found Python's site-packages."
 )
 
-project(IfcOpenShell VERSION ${PROJECT_VERSION_NUMERIC})
+if (VERSION_OVERRIDE)
+    file(READ "../VERSION" "RELEASE_VERSION_")
+    string(STRIP "${RELEASE_VERSION_}" RELEASE_VERSION)
+    message(STATUS "Detected version '${RELEASE_VERSION}'")
+else()
+    set(RELEASE_VERSION "0.8.0")
+endif()
+
+project(IfcOpenShell VERSION ${RELEASE_VERSION})
 
 # Make sure CMake modules in this project are found first
 list(PREPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
-# Catch2 is fetched only when an explicit C++ test family is enabled, so the
-# default build remains offline-capable.
-if(BUILD_IFCOPENSHELL_PARSE_TESTS OR BUILD_IFCOPENSHELL_GEOMETRY_TESTS OR BUILD_BONSAIVIEWER_TESTS)
-    include(FetchContent)
-    FetchContent_Declare(
-        Catch2
-        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-        GIT_TAG        v3.5.4
-        GIT_SHALLOW    TRUE
-    )
-    FetchContent_MakeAvailable(Catch2)
-    list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
-    include(CTest)
-    include(Catch)
-    enable_testing()
-endif()
-
 if(MINIMAL_BUILD)
     message(STATUS "Setting options for minimal build")
     set(BUILD_GEOMSERVER OFF)
@@ -170,6 +113,8 @@ if(MINIMAL_BUILD)
     set(WITH_CGAL OFF)
     set(COLLADA_SUPPORT OFF)
     set(GLTF_SUPPORT OFF)
+    set(HDF5_SUPPORT OFF)
+    set(IFCXML_SUPPORT OFF)
     set(USD_SUPPORT OFF)
 endif()
 
@@ -214,7 +159,14 @@ endif()
 
 include(GNUInstallDirs)
 
-set(IFCOPENSHELL_EXPORT_TARGETS "${PROJECT_NAME}Targets")
+# Specify paths to install files
+if(NOT BINDIR)
+    set(BINDIR bin)
+endif()
+if(NOT IS_ABSOLUTE ${BINDIR})
+    set(BINDIR ${CMAKE_INSTALL_BINDIR})
+endif()
+message(STATUS "BINDIR: ${BINDIR}")
 
 if(NOT INCLUDEDIR)
     set(INCLUDEDIR include)
@@ -224,11 +176,26 @@ if(NOT IS_ABSOLUTE ${INCLUDEDIR})
 endif()
 message(STATUS "INCLUDEDIR: ${INCLUDEDIR}")
 
-if(MSVC)
-    message(WARNING "Building DLLs against the static VC run-time. This is not recommended if the DLLs are to be redistributed.")
-    # C4521: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
-    # There will be couple hundreds of these so suppress them away, https://msdn.microsoft.com/en-us/library/esew7y1w.aspx
-    add_definitions(-wd4251)
+if(NOT LIBDIR)
+    set(LIBDIR lib)
+endif()
+if(NOT IS_ABSOLUTE ${LIBDIR})
+    set(LIBDIR ${CMAKE_INSTALL_LIBDIR})
+endif()
+message(STATUS "LIBDIR: ${LIBDIR}")
+
+set(IFCOPENSHELL_LIBRARY_DIR "") # for *nix rpaths
+
+if(BUILD_SHARED_LIBS)
+    add_definitions(-DIFC_SHARED_BUILD)
+    if(MSVC)
+        message(WARNING "Building DLLs against the static VC run-time. This is not recommended if the DLLs are to be redistributed.")
+        # C4521: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
+        # There will be couple hundreds of these so suppress them away, https://msdn.microsoft.com/en-us/library/esew7y1w.aspx
+        add_definitions(-wd4251)
+    endif()
+
+    set(IFCOPENSHELL_LIBRARY_DIR "${LIBDIR}")
 endif()
 
 UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
@@ -250,38 +217,44 @@ endforeach()
 
 if(WITH_CGAL)
     find_package(CGAL REQUIRED)
+    if(TARGET CGAL::CGAL)
+        link_libraries(CGAL::CGAL)
+    endif()
+    add_definitions(-DIFOPSH_WITH_CGAL)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
     list(APPEND GEOMETRY_KERNELS cgal)
 endif()
 
-if(BUILD_IFCGEOM AND WITH_OPENCASCADE)
-    find_package(OpenCASCADE REQUIRED)
-    # Map OpenCASCADE_LIBRARIES variable from OpenCASCADEConfig.cmake to OpenCASCADE_LIBRARIES used by kernel generic cmake file
-    set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES})
+if(WITH_OPENCASCADE)
+    add_definitions(-DIFOPSH_WITH_OPENCASCADE)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_OPENCASCADE)
     list(APPEND GEOMETRY_KERNELS opencascade)
 endif()
 
-message(STATUS "BUILD_IFCGEOM WITH_MANIFOLD: ${BUILD_IFCGEOM} ${WITH_MANIFOLD}")
-
-if(BUILD_IFCGEOM AND WITH_MANIFOLD)
-    find_package(manifold CONFIG REQUIRED)
-    if(TARGET manifold::manifold)
-        set(MANIFOLD_LIBRARIES manifold::manifold)
-    elseif(TARGET manifold)
-        set(MANIFOLD_LIBRARIES manifold)
-    else()
-        message(FATAL_ERROR "Unable to determine manifold target")
-    endif()
-    list(APPEND GEOMETRY_KERNELS manifold)
-endif()
-
-if(BUILD_IFCGEOM)
-    list(APPEND GEOMETRY_KERNELS passthrough)
-endif()
-
 if(GLTF_SUPPORT)
-    find_package(nlohmann_json REQUIRED)
+    UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
+    if(NOT JSON_INCLUDE_DIR)
+        find_package(nlohmann_json CONFIG)
+        if(nlohmann_json_DIR)
+            link_libraries(nlohmann_json::nlohmann_json)
+        else()
+            message(STATUS "Unable to find nlohmann_json package, trying to find it as a header-only library.")
+        endif()
+    endif()
+
+    if(NOT nlohmann_json_DIR)
+        find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
+        set(JSON_INCLUDE_DIR ${json_header_path})
+
+        if(json_header_path)
+            message(STATUS "JSON for Modern C++ header file found in '${JSON_INCLUDE_DIR}'.")
+        else()
+            message(FATAL_ERROR "Unable to find JSON for Modern C++ header file / package, aborting")
+        endif()
+    endif()
+
+    add_definitions(-DWITH_GLTF)
+    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF)
 endif()
 
 # Add USD support to serializers
@@ -304,19 +277,9 @@ if (WITH_ROCKSDB)
     endif()
 
     message(STATUS "RocksDB: found at '${RocksDB_DIR}'.")
-    add_library(IFCOPENSHELL_RocksDB INTERFACE)
-    set(IFCOPENSHELL_ROCKSDB_TARGET IFCOPENSHELL_RocksDB)
-    set(ROCKSDB_LIBRARIES "IFCOPENSHELL_RocksDB")
-    target_compile_definitions(IFCOPENSHELL_RocksDB INTERFACE IFOPSH_WITH_ROCKSDB)
+    add_definitions(-DIFOPSH_WITH_ROCKSDB)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB)
-    # See https://github.com/facebook/rocksdb/issues/981.
-    if(TARGET RocksDB::rocksdb)
-        target_link_libraries(IFCOPENSHELL_RocksDB INTERFACE RocksDB::rocksdb)
-    elseif(TARGET RocksDB::rocksdb-shared)
-        target_link_libraries(IFCOPENSHELL_RocksDB INTERFACE RocksDB::rocksdb-shared)
-    else()
-        message(FATAL_ERROR "RocksDB found but neither RocksDB::rocksdb nor RocksDB::rocksdb-shared target exists")
-    endif()
+    link_libraries(RocksDB::rocksdb)
 
     if (WITH_ZSTD)
         # @todo do we actually need the zstd include dir or rather just pass
@@ -324,9 +287,11 @@ if (WITH_ROCKSDB)
         # detect based on rocksdb API?
         find_package(zstd CONFIG REQUIRED)
         message(STATUS "zstd: found at '${zstd_DIR}'.")
-    endif()
+        link_libraries(zstd::libzstd_static)
 
-    install(TARGETS IFCOPENSHELL_RocksDB EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})
+        add_definitions(-DIFOPSH_WITH_ROCKSDB_ZSTD)
+        set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB_ZSTD)
+    endif()
 endif()
 
 # Find Boost: On win32 the (hardcoded) default is to use static libraries and
@@ -362,8 +327,7 @@ if(WASM_BUILD)
 else()
     # @todo review this, shouldn't this be all possible header-only now?
     # ... or rewritten using C++17 features?
-    # set(BOOST_COMPONENTS system program_options regex thread date_time iostreams)
-    set(BOOST_COMPONENTS program_options regex thread date_time iostreams)
+    set(BOOST_COMPONENTS system program_options regex thread date_time iostreams)
 endif()
 
 if(USE_MMAP)
@@ -373,16 +337,44 @@ if(USE_MMAP)
     else()
         set(BOOST_COMPONENTS ${BOOST_COMPONENTS} iostreams)
     endif()
+
+    add_definitions(-DUSE_MMAP)
 endif()
 
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 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)
+    if(IFCXML_SUPPORT)
+        find_package(LibXml2 REQUIRED)
+    endif()
+endif()
+
+if(IFCXML_SUPPORT)
+    add_definitions(-DWITH_IFCXML)
+    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_IFCXML)
+endif()
+
+if(BUILD_IFCGEOM)
+    # Open CASCADE
+    if(WITH_OPENCASCADE)
+        find_package(OpenCASCADE REQUIRED)
+    endif(WITH_OPENCASCADE)
+endif(BUILD_IFCGEOM)
+
 if(COLLADA_SUPPORT)
     find_package(OpenCOLLADA REQUIRED)
 endif()
 
+if(HDF5_SUPPORT)
+    find_package(HDF5 REQUIRED COMPONENTS C CXX)
+
+    add_definitions(-DWITH_HDF5)
+    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_HDF5)
+endif(HDF5_SUPPORT)
+
 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,
@@ -493,9 +485,14 @@ else()
     endif()
 endif(MSVC)
 
-include_directories(${INCLUDE_DIRECTORIES}
-	${Boost_INCLUDE_DIRS}
-    ${CGAL_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${MPFR_INCLUDE_DIR}
+
+find_package(Eigen3 REQUIRED)
+link_libraries(Eigen3::Eigen)
+
+include_directories(${INCLUDE_DIRECTORIES} ${OPENCOLLADA_INCLUDE_DIRS}
+	${Boost_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}
+    ${CGAL_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${MPFR_INCLUDE_DIR} ${USD_INCLUDE_DIR}
+    ${TBB_INCLUDE_DIR}
 )
 
 if(NOT SCHEMA_VERSIONS)
@@ -509,6 +506,13 @@ endif()
 
 message(STATUS "IFC SCHEMA_VERSIONS that will be used for the build: ${SCHEMA_VERSIONS}.")
 
+foreach(schema ${SCHEMA_VERSIONS})
+    add_definitions(-DHAS_SCHEMA_${schema})
+endforeach()
+
+string(REPLACE ";" ")(" schema_version_seq "(${SCHEMA_VERSIONS})")
+add_definitions(-DSCHEMA_SEQ=${schema_version_seq})
+
 if(COMPILE_SCHEMA)
     # @todo, this appears to be untested at the moment
     find_package(PythonInterp)
@@ -549,9 +553,8 @@ if(COMPILE_SCHEMA)
 
     # Bootstrap the parser
     message(STATUS "Compiling schema, this will take a while...")
-    execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} bootstrap.py
-        WORKING_DIRECTORY ../src/ifcopenshell-python/ifcopenshell/express
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} bootstrap.py express.bnf
+        WORKING_DIRECTORY ../src/ifcexpressparser
         OUTPUT_FILE express_parser.py
         RESULT_VARIABLE SUCCESS)
 
@@ -560,8 +563,7 @@ if(COMPILE_SCHEMA)
     endif()
 
     # Generate code
-    execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} ../ifcopenshell-python/ifcopenshell/express/express_parser.py ../../${COMPILE_SCHEMA}
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} ../ifcexpressparser/express_parser.py ../../${COMPILE_SCHEMA}
         WORKING_DIRECTORY ../src/ifcparse
         OUTPUT_VARIABLE COMPILED_SCHEMA_NAME)
 
@@ -578,20 +580,32 @@ if(NOT Boost_VERSION LESS 105800)
     add_definitions(-DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE)
 endif()
 
-add_subdirectory(../src/plugin plugin)
-
 add_subdirectory(../src/ifcparse ifcparse)
 set(IFCOPENSHELL_LIBRARIES IfcParse)
-if(BUILD_IFCOPENSHELL_PARSE_TESTS)
-    add_subdirectory(../src/ifcparse/tests ifcparse/tests)
+
+if(BUILD_IFCGEOM)
+	foreach(schema ${SCHEMA_VERSIONS})
+		set(IFCGEOM_SCHEMA_LIBRARIES ${IFCGEOM_SCHEMA_LIBRARIES} geometry_mapping_ifc${schema})
+	endforeach()
+    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
 endif()
 
-if(BUILD_EXAMPLES OR BUILD_BONSAIVIEWER)
-    add_subdirectory(../src/helpers helpers)
-endif()
+if(BUILD_CONVERT OR BUILD_IFCPYTHON)
+	if(WITH_OPENCASCADE)
+        foreach(schema ${SCHEMA_VERSIONS})
+            set(GEOM_SERIALIZER_SCHEMA_LIBRARIES ${GEOM_SERIALIZER_SCHEMA_LIBRARIES} GeometrySerializers_ifc${schema})
 
-if(BUILD_IFCPARSE_EXPERIMENTAL_WRAPPER)
-    add_subdirectory(../src/wrappergen wrappergen)
+            add_library(geometry_serializer_ifc${schema} STATIC ../src/ifcgeom/Serialization/schema/Serialization.cpp)
+            set_target_properties(geometry_serializer_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOMSERIALIZATION_EXPORTS -DIfcSchema=Ifc${schema}")
+            target_link_libraries(geometry_serializer_ifc${schema} ${OpenCASCADE_LIBRARIES})
+            list(APPEND geometry_serializer_libraries geometry_serializer_ifc${schema})
+        endforeach()
+
+        add_library(geometry_serializer STATIC ../src/ifcgeom/Serialization/Serialization.h ../src/ifcgeom/Serialization/Serialization.cpp)
+        set_target_properties(geometry_serializer PROPERTIES COMPILE_FLAGS "-DIFC_GEOMSERIALIZATION_EXPORTS")
+        target_link_libraries(geometry_serializer ${geometry_serializer_libraries} IfcParse)
+        set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} geometry_serializer ${geometry_serializer_libraries})
+    endif()
 endif()
 
 if(BUILD_IFCGEOM)
@@ -614,16 +628,43 @@ if(BUILD_IFCGEOM)
     endif()
 
     add_subdirectory(../src/ifcgeom ifcgeom)
-    if(BUILD_IFCOPENSHELL_GEOMETRY_TESTS)
-        add_subdirectory(../src/ifcgeom/tests ifcgeom/tests)
+    
+    # IfcGeom
+    foreach(schema ${SCHEMA_VERSIONS})
+        file(GLOB IFCGEOM_I_FILES ../src/ifcgeom/mapping/*.i)
+        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/mapping/*.h)
+        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/mapping/*.cpp)
+        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES} ${IFCGEOM_I_FILES})
+
+        add_library(geometry_mapping_ifc${schema} STATIC ${IFCGEOM_FILES})
+        set_target_properties(geometry_mapping_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
+        target_link_libraries(geometry_mapping_ifc${schema} IfcParse)
+        if (NOT BUILD_SHARED_LIBS)
+            target_link_libraries(geometry_mapping_ifc${schema} IfcGeom)
+        endif()
+        list(APPEND mapping_libraries geometry_mapping_ifc${schema})
+    endforeach()
+
+    # IfcGeom (schema agnostic)
+    file(GLOB SCHEMA_AGNOSTIC_H_FILES ../src/ifcgeom/*.h)
+    file(GLOB SCHEMA_AGNOSTIC_CPP_FILES ../src/ifcgeom/*.cpp)
+    set(SCHEMA_AGNOSTIC_FILES ${SCHEMA_AGNOSTIC_H_FILES} ${SCHEMA_AGNOSTIC_CPP_FILES})
+
+    add_library(IfcGeom ${SCHEMA_AGNOSTIC_FILES})
+    set_target_properties(IfcGeom PROPERTIES COMPILE_FLAGS -DIFC_GEOM_EXPORTS VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+
+    if(UNIX)
+        find_package(Threads)
     endif()
-elseif(BUILD_IFCOPENSHELL_GEOMETRY_TESTS)
-    message(FATAL_ERROR "BUILD_IFCOPENSHELL_GEOMETRY_TESTS requires BUILD_IFCGEOM=ON.")
+
+    target_link_libraries(IfcGeom IfcParse ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT} ${OpenCASCADE_LIBRARIES})
+
 endif(BUILD_IFCGEOM)
 
-if(BUILD_CONVERT OR BUILD_IFCPYTHON OR BUILD_BONSAIVIEWER)
+if(BUILD_CONVERT OR BUILD_IFCPYTHON)
     add_subdirectory(../src/serializers serializers)
-endif(BUILD_CONVERT OR BUILD_IFCPYTHON OR BUILD_BONSAIVIEWER)
+    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} ${SERIALIZER_SCHEMA_LIBRARIES})
+endif(BUILD_CONVERT OR BUILD_IFCPYTHON)
 
 if(BUILD_CONVERT)
     add_subdirectory(../src/ifcconvert ifcconvert)
@@ -685,11 +726,6 @@ if(ADD_COMMIT_SHA)
     endif()
 endif(ADD_COMMIT_SHA)
 
-# Always expose the release version (from the VERSION file) to buildinfo.cpp so
-# that a build without commit-sha info reports the correct version instead of a
-# stale hardcoded fallback. See #8164.
-target_compile_definitions(IfcParse PRIVATE IFCOPENSHELL_VERSION_STRING=${RELEASE_VERSION})
-
 if(MSVC)
     # @todo still needs to be understood better, but the cgal and cgal-simple kernel cause multiply defined boost lambda placeholders _1 ... _3
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
@@ -699,7 +735,12 @@ endif()
 
 # Documentation
 if(BUILD_DOCUMENTATION)
-    add_subdirectory(../docs/cpp-api docs/cpp-api)
+    set(CMAKE_MODULE_PATH "../docs/cmake")
+    add_subdirectory(../docs docs)
+endif()
+
+if(BUILD_IFCPYTHON)
+    add_subdirectory(../src/ifcwrap ifcwrap)
 endif()
 
 if(BUILD_EXAMPLES)
@@ -710,16 +751,12 @@ if(BUILD_IFCMAX)
     add_subdirectory(../src/ifcmax ifcmax)
 endif()
 
-if(BUILD_IFCPYTHON AND WITH_CGAL)
+if(WITH_CGAL)
     add_subdirectory(../src/svgfill svgfill)
 endif()
 
-if(BUILD_IFCPYTHON)
-    add_subdirectory(../src/ifcwrap ifcwrap)
-endif()
-
-if(BUILD_IFCMODEL_UI)
-    add_subdirectory(../src/ifcmodel-ui ifcmodel-ui)
+if(BUILD_QTVIEWER)
+    add_subdirectory(../src/qtviewer qtviewer)
 endif()
 
 if(BUILD_IFCGEOM)
@@ -743,20 +780,22 @@ if(BUILD_IFCGEOM)
         )
     endforeach()
 
-    install(
-        TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom
-        EXPORT ${IFCOPENSHELL_EXPORT_TARGETS}
+    install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom
+        ARCHIVE DESTINATION ${LIBDIR}
+        LIBRARY DESTINATION ${LIBDIR}
+        RUNTIME DESTINATION ${BINDIR}
     )
 endif(BUILD_IFCGEOM)
-if(BUILD_BONSAIVIEWER)
-    # IfcViewer is the unified scene + render lib since the wgpu/ifcviewer
-    # merge — wgpu-native is fetched inside its CMakeLists.txt.
-    add_subdirectory(../src/ifcviewer ifcviewer)
-    if(BUILD_BONSAIVIEWER_WGPU)
-        add_subdirectory(../src/ifcviewer-minimal ifcviewer-minimal)
+
+if(BUILD_CONVERT OR BUILD_IFCPYTHON)
+    if(WITH_OPENCASCADE)
+        install(TARGETS geometry_serializer ${geometry_serializer_libraries}
+            ARCHIVE DESTINATION ${LIBDIR}
+            LIBRARY DESTINATION ${LIBDIR}
+            RUNTIME DESTINATION ${BINDIR}
+        )
     endif()
-    add_subdirectory(../src/bonsaiviewer bonsaiviewer)
-endif()
+endif(BUILD_CONVERT OR BUILD_IFCPYTHON)
 
 # Cmake uninstall target
 if(NOT TARGET uninstall)
@@ -799,7 +838,7 @@ endforeach(COMPONENT)
 
 set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_CONTACT}")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libxml2, libocct-foundation-dev, libocct-modeling-algorithms-dev, libocct-modeling-data-dev, libocct-ocaf-dev, libocct-visualization-dev, libocct-data-exchange-dev, libpython3-dev, python3-pytest ${BOOST_DEPS}")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libxml2, libocct-foundation-dev, libocct-modeling-algorithms-dev, libocct-modeling-data-dev, libocct-ocaf-dev, libocct-visualization-dev, libocct-data-exchange-dev, libhdf5-serial-dev, libpython3-dev, python3-pytest ${BOOST_DEPS}")
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
@@ -809,5 +848,3 @@ set(CPACK_DEBIAN_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
 # set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/debian/postinst")
 
 include(CPack)
-
-include(package_export.cmake)

cmake/CMakePresets.json

@@ -15,6 +15,7 @@
         "BUILD_CONVERT": "ON",
         "BUILD_IFCMAX": "OFF",
         "IFCXML_SUPPORT": "ON",
+        "HDF5_SUPPORT": "ON",
         "SCHEMA_VERSIONS": "4x3_add2",
         "CMAKE_GENERATOR_PLATFORM": "",
         "CMAKE_GENERATOR_TOOLSET": ""
@@ -49,6 +50,8 @@
         "MPFR_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
         "Boost_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
         "Boost_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
+        "HDF5_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
+        "HDF5_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
         "ZLIB_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include"
       }
     },
@@ -107,4 +110,4 @@
       }
     }
   ]
-}
+}

cmake/FindCGAL.cmake

@@ -6,17 +6,13 @@
 # - `GMP_LIBRARY_DIR`
 # - `MPFR_INCLUDE_DIR`
 # - `MPFR_LIBRARY_DIR`
-# If input variables are not specified, try to find CGAL config.
+# If input variables are not specified, try to find HDF5 config.
 # Input variables could also be provided as environment variables.
 #
-# Output targets:
-# - `IFCOPENSHELL_CGAL`
+# Output variables:
+# - `CGAL_INCLUDE_DIR`
 #
 
-if(TARGET IFCOPENSHELL_CGAL)
-    return()
-endif()
-
 UNIFY_ENVVARS_AND_CACHE(CGAL_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(CGAL_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(GMP_INCLUDE_DIR)
@@ -24,21 +20,7 @@ UNIFY_ENVVARS_AND_CACHE(GMP_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(MPFR_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(MPFR_LIBRARY_DIR)
 
-if(CGAL_INCLUDE_DIR)
-    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)
-    if(NOT libGMP)
-        message(FATAL_ERROR "Unable to find GMP library files, aborting")
-    endif()
-    if(NOT libMPFR)
-        message(FATAL_ERROR "Unable to find MPFR library files, aborting")
-    endif()
-
-    add_library(CGAL::CGAL INTERFACE IMPORTED)
-    target_include_directories(CGAL::CGAL INTERFACE "${CGAL_INCLUDE_DIR}")
-    target_include_directories(CGAL::CGAL INTERFACE "${GMP_INCLUDE_DIR}" "${MPFR_INCLUDE_DIR}")
-    target_link_libraries(CGAL::CGAL INTERFACE "${libMPFR}" "${libGMP}")
-else()
+if(NOT CGAL_INCLUDE_DIR)
     # CGAL is not respecting default Boost_USE_STATIC_LIBS value
     # and sometiems it's getting in the way.
     if(NOT DEFINED Boost_USE_STATIC_LIBS)
@@ -46,11 +28,8 @@ else()
     else()
         set(CGAL_Boost_USE_STATIC_LIBS "${Boost_USE_STATIC_LIBS}")
     endif()
-    # Annoyingly this is producing CMP0167 boost warnings, because it's unsetting cmake policies
-    # and using FindBoost module. But there's nothing we can do about it,
-    # since everything happens in the scope of CGAL config. I guess it's be resolved in CGAL 6.1.0.
-    find_package(CGAL CONFIG)
-    if(NOT CGAL_FOUND)
+    find_package(CGAL CONFIG REQUIRED)
+    if(NOT CGAL_DIR)
         message(
             FATAL_ERROR
             "CGAL_SUPPORT enabled, but CGAL_INCLUDE_DIR wasn't provided and CGAL package couldn't be found."
@@ -59,10 +38,5 @@ else()
     message(STATUS "CGAL: found config at '${CGAL_DIR}'.")
 endif()
 
-# Adding another `IFCOPENSHELL_CGAL` target, because we want to add compile definitions to it,
-# but in `CGALconfig.cmake` `CGAL::CGAL` is an alias, so you can't add properties to it.
-add_library(IFCOPENSHELL_CGAL INTERFACE)
-target_link_libraries(IFCOPENSHELL_CGAL INTERFACE CGAL::CGAL)
-target_compile_definitions(IFCOPENSHELL_CGAL INTERFACE IFOPSH_WITH_CGAL)
+add_definitions(-DIFOPSH_WITH_CGAL)
 set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
-install(TARGETS IFCOPENSHELL_CGAL EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})

cmake/FindHDF5.cmake

@@ -0,0 +1,109 @@
+#
+# Input variables:
+# - `HDF5_INCLUDE_DIR`
+# - `HDF5_LIBRARY_DIR`
+# - `HDF5_LIBRARIES`
+# If input variables are not specified, try to find HDF5 config.
+# Input variables could also be provided as environment variables.
+#
+# Output variables:
+# - `HDF5_INCLUDE_DIR`
+# - `HDF5_LIBRARY_DIR`
+# - `HDF5_LIBRARIES`
+#
+
+UNIFY_ENVVARS_AND_CACHE(HDF5_INCLUDE_DIR)
+UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARY_DIR)
+UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARIES)
+
+# To avoid cyclic calls to this file
+list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
+
+if("${HDF5_INCLUDE_DIR}" STREQUAL "")
+    message(STATUS "No HDF5 include directory specified")
+else()
+    set(HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}" CACHE FILEPATH "HDF5 header files")
+endif()
+
+if("${HDF5_LIBRARY_DIR}" STREQUAL "")
+    message(STATUS "No HDF5 library directory specified")
+else()
+    set(HDF5_LIBRARY_DIR "${HDF5_LIBRARY_DIR}" CACHE FILEPATH "HDF5 library files")
+endif()
+
+if(HDF5_LIBRARY_DIR)
+    # result of the HDF5 ctest package
+    # Find zlib using cmake find_library. How should this be implemented?
+    # FIND_LIBRARY(NAMES z libz libz_debug PATHS ... NO_DEFAULT_PATH)
+    if("$ENV{CONDA_BUILD}" STREQUAL "")
+        # result of the HDF5 ctest package
+        if(WIN32)
+            set(zlib_post lib)
+            set(lib_ext lib)
+        else()
+            set(lib_ext a)
+        endif()
+
+        if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+            set(debug_postfix "_debug")
+        endif()
+
+        set(HDF5_LIBRARIES
+            "${HDF5_LIBRARY_DIR}/libhdf5_cpp${debug_postfix}.${lib_ext}"
+            "${HDF5_LIBRARY_DIR}/libhdf5${debug_postfix}.${lib_ext}"
+            "${HDF5_LIBRARY_DIR}/libz${zlib_post}${debug_postfix}.${lib_ext}"
+            "${HDF5_LIBRARY_DIR}/libsz${debug_postfix}.${lib_ext}"
+            "${HDF5_LIBRARY_DIR}/libaec${debug_postfix}.${lib_ext}"
+        )
+
+    else()
+        message(STATUS "Packaging hdf5 and zlib for conda distribution")
+
+        if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+            # macOS
+            set(zlib_post libz)
+            set(lib_ext dylib)
+            set(HDF5_LIBRARIES
+                "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
+                "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
+                "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
+            )
+        else()
+            # linux and windows
+            # Find HDF5 package
+            find_package(HDF5 REQUIRED COMPONENTS C CXX)
+            # Find ZLIB package
+            find_package(ZLIB REQUIRED)
+            # Include directories
+            include_directories(${HDF5_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
+            # Link libraries
+            set(HDF5_LIBRARIES ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES})
+            message(STATUS "HDF5 libraries: ${HDF5_LIBRARIES}")
+        endif()
+    endif()
+endif()
+
+if(NOT HDF5_INCLUDE_DIR OR NOT HDF5_LIBRARY_DIR)
+    # First try to find it as a config.
+    find_package(HDF5 CONFIG)
+    if(HDF5_DIR)
+        message(STATUS "HDF5: found config at '${HDF5_DIR}'.")
+        set(HDF5_LIBRARIES hdf5_cpp-static)
+    else()
+        # If it failed, still try to find as a module.
+        # E.g. on Ubuntu `libhdf5-dev` doesn't provie hdf5-config.cmake.
+        # Will automatically fill HDF5_LIBRARIES and HDF5_INCLUDE_DIR.
+        find_package(HDF5 COMPONENTS CXX)
+        if(NOT HDF5_INCLUDE_DIR)
+            message(
+                FATAL_ERROR
+                "HDF5_INCLUDE_DIR is not provided (current value: '${HDF5_INCLUDE_DIR}'). "
+                "HDF5_LIBRARY_DIR is not provided (current value: '${HDF5_LIBRARY_DIR}'). "
+                "Also could not find HDF5 package (neither module or config)."
+            )
+        endif()
+    endif()
+endif()
+
+# Restore module path.
+list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})

cmake/FindIfcOpenShell.cmake

@@ -1,131 +0,0 @@
-# This file was generated with the assistance of an AI coding tool.
-################################################################################
-#                                                                              #
-# This file is part of IfcOpenShell.                                           #
-#                                                                              #
-# IfcOpenShell is free software: you can redistribute it and/or modify         #
-# it under the terms of the Lesser GNU General Public License as published by  #
-# the Free Software Foundation, either version 3.0 of the License, or          #
-# (at your option) any later version.                                          #
-#                                                                              #
-# IfcOpenShell is distributed in the hope that it will be useful,              #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 #
-# Lesser GNU General Public License for more details.                          #
-#                                                                              #
-# You should have received a copy of the Lesser GNU General Public License     #
-# along with this program. If not, see <http://www.gnu.org/licenses/>.         #
-#                                                                              #
-################################################################################
-
-include("${CMAKE_CURRENT_LIST_DIR}/utilities.cmake" OPTIONAL)
-
-set(_IfcOpenShell_find_args)
-if(IfcOpenShell_FIND_VERSION)
-    list(APPEND _IfcOpenShell_find_args "${IfcOpenShell_FIND_VERSION}")
-    if(IfcOpenShell_FIND_VERSION_EXACT)
-        list(APPEND _IfcOpenShell_find_args EXACT)
-    endif()
-endif()
-list(APPEND _IfcOpenShell_find_args CONFIG QUIET)
-if(IfcOpenShell_FIND_COMPONENTS)
-    list(APPEND _IfcOpenShell_find_args COMPONENTS ${IfcOpenShell_FIND_COMPONENTS})
-endif()
-
-set(_IfcOpenShell_saved_module_path "${CMAKE_MODULE_PATH}")
-list(REMOVE_ITEM CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-find_package(IfcOpenShell ${_IfcOpenShell_find_args})
-set(CMAKE_MODULE_PATH "${_IfcOpenShell_saved_module_path}")
-
-if(NOT IfcOpenShell_FOUND)
-    set(_IfcOpenShell_error "Could not find an IfcOpenShell CMake config package. Set IfcOpenShell_DIR or CMAKE_PREFIX_PATH.")
-    if(IfcOpenShell_FIND_REQUIRED)
-        message(FATAL_ERROR "${_IfcOpenShell_error}")
-    elseif(NOT IfcOpenShell_FIND_QUIETLY)
-        message(STATUS "${_IfcOpenShell_error}")
-    endif()
-    return()
-endif()
-
-set(_IfcOpenShell_required_targets IfcOpenShell::IfcParse IfcOpenShell::IfcGeom)
-set(_IfcOpenShell_missing_targets "")
-foreach(_IfcOpenShell_target IN LISTS _IfcOpenShell_required_targets)
-    if(NOT TARGET ${_IfcOpenShell_target})
-        list(APPEND _IfcOpenShell_missing_targets ${_IfcOpenShell_target})
-    endif()
-endforeach()
-
-if(_IfcOpenShell_missing_targets)
-    set(IfcOpenShell_FOUND FALSE)
-    string(REPLACE ";" ", " _IfcOpenShell_missing_targets_text "${_IfcOpenShell_missing_targets}")
-    set(_IfcOpenShell_error "IfcOpenShell config was found, but required targets are missing: ${_IfcOpenShell_missing_targets_text}.")
-    if(IfcOpenShell_FIND_REQUIRED)
-        message(FATAL_ERROR "${_IfcOpenShell_error}")
-    elseif(NOT IfcOpenShell_FIND_QUIETLY)
-        message(STATUS "${_IfcOpenShell_error}")
-    endif()
-    return()
-endif()
-
-if(NOT DEFINED IFCOPENSHELL_WITH_OPENCASCADE)
-    set(IFCOPENSHELL_WITH_OPENCASCADE OFF)
-    if(TARGET IfcOpenShell::geometry_kernel_opencascade)
-        set(IFCOPENSHELL_WITH_OPENCASCADE ON)
-    endif()
-endif()
-
-if(NOT DEFINED IFCOPENSHELL_WITH_CGAL)
-    set(IFCOPENSHELL_WITH_CGAL OFF)
-    if(TARGET IfcOpenShell::IFCOPENSHELL_CGAL)
-        set(IFCOPENSHELL_WITH_CGAL ON)
-    endif()
-endif()
-
-if(NOT DEFINED IFCOPENSHELL_IFCXML)
-    set(IFCOPENSHELL_IFCXML OFF)
-endif()
-
-if(NOT DEFINED IFCOPENSHELL_WITH_ROCKSDB)
-    set(IFCOPENSHELL_WITH_ROCKSDB OFF)
-endif()
-
-set(IFCOPENSHELL_LIBRARIES IfcOpenShell::IfcParse)
-foreach(_IfcOpenShell_target IN ITEMS IfcOpenShell::geometry_serializer IfcOpenShell::Serializers)
-    if(TARGET ${_IfcOpenShell_target})
-        list(APPEND IFCOPENSHELL_LIBRARIES ${_IfcOpenShell_target})
-    endif()
-endforeach()
-
-set(IFCOPENSHELL_KERNEL_LIBRARIES "")
-foreach(_IfcOpenShell_target IN ITEMS
-    IfcOpenShell::geometry_kernel_opencascade
-    IfcOpenShell::geometry_kernel_cgal
-    IfcOpenShell::geometry_kernel_cgal_simple
-)
-    if(TARGET ${_IfcOpenShell_target})
-        list(APPEND IFCOPENSHELL_KERNEL_LIBRARIES ${_IfcOpenShell_target})
-    endif()
-endforeach()
-
-set(IFCOPENSHELL_GEOMETRY_LIBRARIES IfcOpenShell::IfcGeom ${IFCOPENSHELL_KERNEL_LIBRARIES})
-
-if(TARGET IfcOpenShell::OpenCASCADE_INTERFACE)
-    set(OpenCASCADE_LIBRARIES IfcOpenShell::OpenCASCADE_INTERFACE)
-endif()
-
-if(TARGET IfcOpenShell::IFCOPENSHELL_CGAL)
-    set(CGAL_LIBRARIES IfcOpenShell::IFCOPENSHELL_CGAL)
-endif()
-
-if(TARGET IfcOpenShell::svgfill)
-    set(IFCOPENSHELL_SVGFILL_LIBRARY IfcOpenShell::svgfill)
-endif()
-
-mark_as_advanced(IfcOpenShell_DIR)
-
-unset(_IfcOpenShell_error)
-unset(_IfcOpenShell_find_args)
-unset(_IfcOpenShell_missing_targets)
-unset(_IfcOpenShell_missing_targets_text)
-unset(_IfcOpenShell_required_targets)
-unset(_IfcOpenShell_target)

cmake/FindLibXml2.cmake

@@ -5,8 +5,9 @@
 # If input variables are not specified, try to find LibXml2 config.
 # Input variables could also be provided as environment variables.
 #
-# Output targets:
-# - `LibXml2::LibXml2`
+# Output variables:
+# - `LIBXML2_INCLUDE_DIR`
+# - `LIBXML2_LIBRARIES`
 #
 
 # To avoid cyclic calls to this file
@@ -26,21 +27,22 @@ if((NOT LIBXML2_INCLUDE_DIR AND NOT LIBXML2_LIBRARIES))
     else()
         message(STATUS "Found LibXml2 config: ${LibXml2_DIR}")
     endif()
+
+    if(TARGET LibXml2::LibXml2)
+        # Config mode already gives us the target
+        set(LIBXML2_LIBRARIES LibXml2::LibXml2)
+        get_target_property(LIBXML2_INCLUDE_DIR LibXml2::LibXml2 INTERFACE_INCLUDE_DIRECTORIES)
+    else()
+        # Module mode (Ubuntu)
+        set(LIBXML2_LIBRARIES ${LibXml2_LIBRARIES})
+        set(LIBXML2_INCLUDE_DIR ${LibXml2_INCLUDE_DIRS})
+    endif()
 else()
     find_package(LibXml2 REQUIRED)
-    if(MSVC)
-        # Unset `IMPORTED_LOCATION` and set it manually.
-        set_property(TARGET LibXml2::LibXml2 PROPERTY IMPORTED_LOCATION)
-        get_release_variant(LIBXML2_RELEASE_LIB "${LIBXML2_LIBRARIES}" "d")
-        get_debug_variant(LIBXML2_DEBUG_LIB "${LIBXML2_LIBRARIES}" "d")
-        set_target_properties(
-            LibXml2::LibXml2
-            PROPERTIES
-                IMPORTED_CONFIGURATIONS "Release;Debug"
-                IMPORTED_LOCATION_RELEASE "${LIBXML2_RELEASE_LIB}"
-                IMPORTED_LOCATION_DEBUG "${LIBXML2_DEBUG_LIB}"
-        )
-    endif()
+endif()
+
+if(MSVC AND NOT LibXml2_DIR)
+    add_debug_variants(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES}" d)
 endif()
 
 # Restore module path.

cmake/FindOpenCASCADE.cmake

@@ -22,6 +22,7 @@ if(OCC_LIBRARY_DIR)
     message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
 endif()
 
+
 if(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
     # OCE is not supported for find_package, because it's using a different name (`oce`)
     # and also has an odd directory structure (install/lib/oce-0.18/*.cmake).
@@ -32,33 +33,8 @@ if(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
     # OpenCASCADE may be built with VTK support. Try to find VTK first to avoid
     # CMake errors when OpenCASCADE's config references VTK targets.
     find_package(VTK QUIET)
-    mark_as_advanced(VTK_DIR)
 
     find_package(OpenCASCADE CONFIG REQUIRED)
-    mark_as_advanced(OpenCASCADE_DIR)
-    message(STATUS "Found OpenCASCADE config: ${OpenCASCADE_DIR}")
-
-    if(OpenCASCADE_VERSION VERSION_LESS "7.7.0")
-        # cmake configs < 7.7.0 were not adding include directories to targets automatically.
-        set_target_properties(TKernel PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OpenCASCADE_INCLUDE_DIR}")
-    endif()
-
-    if(
-        OpenCASCADE_VERSION VERSION_LESS "7.9.0"
-        AND CMAKE_VERSION GREATER_EQUAL "3.24"
-        AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-    )
-        # Before 7.9.0 targets in OCCT cmake configs are not linked to each other
-        # leading to missing symbols on Unix. Link them as a single group as a workaround.
-        # Only needed for gcc, because other compilers (e.g. Apple Clang, MSVC) do rescan automatically.
-        set(OpenCASCADE_LIBRARIES "$<LINK_GROUP:RESCAN,${OpenCASCADE_LIBRARIES}>")
-    endif()
-
-    if(OpenCASCADE_VERSION VERSION_LESS "7.9.0" AND WIN32)
-        # Bug in OCCT cmake configs < 7.9.0 - missing linked library.
-        list(APPEND OpenCASCADE_LIBRARIES WSOCK32.lib)
-    endif()
-
     return()
 endif()
 
@@ -70,11 +46,17 @@ if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR)
         "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
     )
     # Parse OCC_VERSION_STRING.
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR REGEX "#define OCC_VERSION_MAJOR.*")
+    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR
+        REGEX "#define OCC_VERSION_MAJOR.*"
+    )
     string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR REGEX "#define OCC_VERSION_MINOR.*")
+    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR
+        REGEX "#define OCC_VERSION_MINOR.*"
+    )
     string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
-    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT REGEX "#define OCC_VERSION_MAINTENANCE.*")
+    file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
+        REGEX "#define OCC_VERSION_MAINTENANCE.*"
+    )
     string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
     set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
 else()
@@ -88,37 +70,17 @@ else()
     )
 endif()
 
-set(OpenCASCADE_LIBRARIES
-    TKernel
-    TKMath
-    TKBRep
-    TKGeomBase
-    TKGeomAlgo
-    TKG3d
-    TKG2d
-    TKShHealing
-    TKTopAlgo
-    TKMesh
-    TKPrim
-    TKBool
-    TKBO
-    TKFillet
-    TKXSBase
-    TKOffset
-    TKHLR
+set(
+    OpenCASCADE_LIBRARIES
+    TKernel TKMath TKBRep TKGeomBase TKGeomAlgo TKG3d TKG2d TKShHealing TKTopAlgo TKMesh TKPrim TKBool TKBO
+    TKFillet TKXSBase TKOffset TKHLR
+
     # @todo investigate the exact conditions when this is necessary
     TKBin
 )
 
 if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
-    list(
-        APPEND OpenCASCADE_LIBRARIES
-        TKIGES
-        TKSTEPBase
-        TKSTEPAttr
-        TKSTEP209
-        TKSTEP
-    )
+    list(APPEND OpenCASCADE_LIBRARIES  TKIGES TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
 else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
     list(APPEND OpenCASCADE_LIBRARIES TKDESTEP TKDEIGES)
 endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)
@@ -128,7 +90,10 @@ find_library(libTKernel NAMES TKernel TKerneld PATHS ${OCC_LIBRARY_DIR} NO_DEFAU
 if(libTKernel)
     message(STATUS "Required Open Cascade Library files found")
 else()
-    message(FATAL_ERROR "Unable to find Open Cascade library files in OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}'), aborting")
+    message(
+        FATAL_ERROR
+        "Unable to find Open Cascade library files in OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}'), aborting"
+    )
 endif()
 
 if(MSVC)
@@ -157,21 +122,9 @@ if(OCCT_STATIC)
         # OpenCASCADE_LIBRARIES repeated N times below in order to fix cyclic dependencies
         # tfk: --start-group ... --end-group didn't work on the apple linker when last tested
         if(APPLE)
-            set(OpenCASCADE_LIBRARIES
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${OpenCASCADE_LIBRARIES}
-                ${CMAKE_THREAD_LIBS_INIT}
-            )
+            set(OpenCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES} ${OpenCASCADE_LIBRARIES} ${OpenCASCADE_LIBRARIES} ${OpenCASCADE_LIBRARIES} ${OpenCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
         else()
-            set(OpenCASCADE_LIBRARIES
-                -Wl,--start-group
-                ${OpenCASCADE_LIBRARIES}
-                -Wl,--end-group
-                ${CMAKE_THREAD_LIBS_INIT}
-            )
+            set(OpenCASCADE_LIBRARIES -Wl,--start-group ${OpenCASCADE_LIBRARIES} -Wl,--end-group ${CMAKE_THREAD_LIBS_INIT})
         endif()
     endif()
 
@@ -183,9 +136,8 @@ if(OCCT_STATIC)
     endif()
 endif()
 
-add_library(OpenCASCADE_INTERFACE INTERFACE)
+add_library(OpenCASCADE_INTERFACE INTERFACE IMPORTED)
 target_include_directories(OpenCASCADE_INTERFACE INTERFACE "${OCC_INCLUDE_DIR}")
 target_link_libraries(OpenCASCADE_INTERFACE INTERFACE ${OpenCASCADE_LIBRARIES})
 target_link_directories(OpenCASCADE_INTERFACE INTERFACE "${OCC_LIBRARY_DIR}")
 set(OpenCASCADE_LIBRARIES OpenCASCADE_INTERFACE)
-install(TARGETS OpenCASCADE_INTERFACE EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})

cmake/FindOpenCOLLADA.cmake

@@ -1,3 +1,4 @@
+
 #
 # Input variables:
 # - `OPENCOLLADA_INCLUDE_DIR`
@@ -20,7 +21,6 @@ if(NOT OPENCOLLADA_INCLUDE_DIR AND NOT OPENCOLLADA_LIBRARY_DIR)
     # If package is found, automatically sets
     # OPENCOLLADA_INCLUDE_DIRS and OPENCOLLADA_LIBRARIES (list of targets, not paths).
     find_package(OpenCOLLADA CONFIG)
-    mark_as_advanced(OpenCOLLADA_DIR)
     if(OpenCOLLADA_DIR)
         message(STATUS "Found OpenCOLLADA: '${OpenCOLLADA_DIR}'.")
         set(OPENCOLLADA_FOUND TRUE)
@@ -40,37 +40,23 @@ if(NOT OpenCOLLADA_DIR)
 
     if("${OPENCOLLADA_LIBRARY_DIR}" STREQUAL "")
         message(STATUS "No OpenCOLLADA library directory specified")
-        find_library(
-            OPENCOLLADA_FRAMEWORK_LIB
-            NAMES OpenCOLLADAFramework
-            PATHS /usr/lib64/opencollada /usr/lib/opencollada /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
-        )
+        find_library(OPENCOLLADA_FRAMEWORK_LIB NAMES OpenCOLLADAFramework
+            PATHS /usr/lib64/opencollada /usr/lib/opencollada /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib)
         get_filename_component(OPENCOLLADA_LIBRARY_DIR ${OPENCOLLADA_FRAMEWORK_LIB} PATH)
     endif()
 
-    find_library(
-        OpenCOLLADAFramework
-        NAMES OpenCOLLADAFramework OpenCOLLADAFrameworkd
-        PATHS ${OPENCOLLADA_LIBRARY_DIR}
-        NO_DEFAULT_PATH
-    )
+    find_library(OpenCOLLADAFramework NAMES OpenCOLLADAFramework OpenCOLLADAFrameworkd PATHS ${OPENCOLLADA_LIBRARY_DIR} NO_DEFAULT_PATH)
 
     if(OpenCOLLADAFramework)
         message(STATUS "OpenCOLLADA library files found")
     else()
-        message(
-            FATAL_ERROR
-            "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA libraries. "
-            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed."
-        )
+        message(FATAL_ERROR "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA libraries. "
+            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed.")
     endif()
 
     set(OPENCOLLADA_LIBRARY_DIR "${OPENCOLLADA_LIBRARY_DIR}" CACHE FILEPATH "OpenCOLLADA library files")
 
-    set(OPENCOLLADA_INCLUDE_DIRS
-        "${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils"
-        "${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter"
-    )
+    set(OPENCOLLADA_INCLUDE_DIRS "${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils" "${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter")
 
     find_file(COLLADASWStreamWriter_h "COLLADASWStreamWriter.h" ${OPENCOLLADA_INCLUDE_DIRS})
 
@@ -79,15 +65,8 @@ if(NOT OpenCOLLADA_DIR)
         set(OPENCOLLADA_FOUND TRUE)
 
         set(OPENCOLLADA_LIBRARY_NAMES
-            GeneratedSaxParser
-            MathMLSolver
-            OpenCOLLADABaseUtils
-            OpenCOLLADAFramework
-            OpenCOLLADASaxFrameworkLoader
-            OpenCOLLADAStreamWriter
-            UTF
-            buffer
-            ftoa
+            GeneratedSaxParser MathMLSolver OpenCOLLADABaseUtils OpenCOLLADAFramework OpenCOLLADASaxFrameworkLoader
+            OpenCOLLADAStreamWriter UTF buffer ftoa
         )
 
         # Use the found OpenCOLLADAFramework as a template for all other OpenCOLLADA libraries
@@ -120,27 +99,20 @@ if(NOT OpenCOLLADA_DIR)
                 list(APPEND OPENCOLLADA_LIBRARIES "${pcre_library}")
             endif()
         else()
-            message(
-                FATAL_ERROR
-                "COLLADA_SUPPORT enabled, but unable to find PCRE. "
-                "Disable COLLADA_SUPPORT or fix PCRE_LIBRARY_DIR path to proceed."
-            )
+            message(FATAL_ERROR "COLLADA_SUPPORT enabled, but unable to find PCRE. "
+                "Disable COLLADA_SUPPORT or fix PCRE_LIBRARY_DIR path to proceed.")
         endif()
 
         if(MSVC)
             add_debug_variants(OPENCOLLADA_LIBRARIES "${OPENCOLLADA_LIBRARIES}" d)
         endif()
     else()
-        message(
-            FATAL_ERROR
-            "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA headers. "
-            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed."
-        )
+        message(FATAL_ERROR "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA headers. "
+            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed.")
     endif()
 endif(NOT OpenCOLLADA_DIR)
 
-if(OPENCOLLADA_FOUND AND NOT TARGET OpenCOLLADA::OpenCOLLADA)
-    add_library(OpenCOLLADA::OpenCOLLADA INTERFACE IMPORTED)
-    target_include_directories(OpenCOLLADA::OpenCOLLADA INTERFACE ${OPENCOLLADA_INCLUDE_DIRS})
-    target_link_libraries(OpenCOLLADA::OpenCOLLADA INTERFACE ${OPENCOLLADA_LIBRARIES})
+if(OPENCOLLADA_FOUND)
+    add_definitions(-DWITH_OPENCOLLADA)
+    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)
 endif()

cmake/FindPROJ.cmake

@@ -1,62 +0,0 @@
-#
-# Input variables:
-# - `PROJ_INCLUDE_DIR`
-# - `PROJ_LIBRARIES`
-# If input variables are not specified, try to find PROJ config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `proj::proj`
-#
-
-# To avoid cyclic calls to this file
-list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
-
-UNIFY_ENVVARS_AND_CACHE(PROJ_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(PROJ_LIBRARIES)
-
-if((NOT PROJ_INCLUDE_DIR AND NOT PROJ_LIBRARIES))
-    find_package(PROJ QUIET CONFIG)
-
-    if(NOT PROJ_FOUND)
-        find_path(PROJ_INCLUDE_DIR proj.h PATHS /usr/include/proj REQUIRED)
-        if(PROJ_INCLUDE_DIR)
-            message(STATUS "Found PROJ include files in: ${PROJ_INCLUDE_DIR}")
-        else()
-            message(FATAL_ERROR "Unable to find PROJ include directory, specify PROJ_INCLUDE_DIR manually.")
-        endif()
-
-        find_library(PROJ_LIBRARY NAMES proj PATHS /usr/lib/x86_64-linux-gnu)
-        if(PROJ_LIBRARY)
-            message(STATUS "PROJ libraries ${PROJ_LIBRARY} found in: ${PROJ_LIBRARY_DIR}")
-            set(PROJ_LIBRARIES ${PROJ_LIBRARY})
-        else()
-            message(FATAL_ERROR "Unable to find PROJ libraries in: ${PROJ_LIBRARY_DIR}")
-        endif()
-
-        if(NOT TARGET proj::proj)
-            add_library(proj::proj INTERFACE IMPORTED)
-            target_include_directories(proj::proj INTERFACE "${PROJ_INCLUDE_DIR}")
-            target_link_libraries(proj::proj INTERFACE ${PROJ_LIBRARIES})
-            target_link_directories(proj::proj INTERFACE "${PROJ_LIBRARY}")
-        endif()
-    endif()
-else()
-    find_library(PROJ_LIBRARY NAMES proj PATHS ${PROJ_LIBRARY_DIR})
-    if(PROJ_LIBRARY)
-        message(STATUS "PROJ libraries ${PROJ_LIBRARY} found in: ${PROJ_LIBRARY_DIR}")
-        set(PROJ_LIBRARIES ${PROJ_LIBRARY})
-    else()
-        message(FATAL_ERROR "Unable to find PROJ libraries in: ${PROJ_LIBRARY_DIR}")
-    endif()
-
-    set(PROJ_INCLUDE_DIR ${PROJ_INCLUDE_DIR} CACHE FILEPATH "PROJ header files")
-    message(STATUS "Looking for PROJ include files in: ${PROJ_INCLUDE_DIR}")
-    if(NOT TARGET proj::proj)
-        add_library(proj::proj INTERFACE IMPORTED)
-        target_include_directories(proj::proj INTERFACE "${PROJ_INCLUDE_DIR}")
-        target_link_libraries(proj::proj INTERFACE ${PROJ_LIBRARIES})
-    endif()
-endif()
-
-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})

cmake/FindUSD.cmake

@@ -2,33 +2,23 @@
 # Input variables:
 # - `USD_INCLUDE_DIR`
 # - `USD_LIBRARY_DIR`
-# - `TBB_INCLUDE_DIR`
-# - `TBB_LIBRARY_DIR`
 # Input variables could also be provided as environment variables.
-# If `USD_INCLUDE_DIR` and `USD_LIBRARY_DIR` are not provided,
-# try to find USD by locating its config file.
+# TODO: Try to find USD config if varibales are not provided.
+# TODO: does usd have a config file?
 #
-# Output targets:
-# - `pxr::USD`
+# Output variables:
+# - `USD_LIBRARIES`
 
 UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR)
-UNIFY_ENVVARS_AND_CACHE(TBB_INCLUDE_DIR)
-UNIFY_ENVVARS_AND_CACHE(TBB_LIBRARY_DIR)
 
-if(NOT USD_LIBRARY_DIR AND NOT USD_INCLUDE_DIR)
-    find_package(pxr CONFIG)
-    if(pxr_FOUND)
-        add_library(pxr::USD INTERFACE IMPORTED)
-        target_link_libraries(pxr::USD INTERFACE ${PXR_LIBRARIES})
-        include(FindPackageHandleStandardArgs)
-        find_package_handle_standard_args(USD REQUIRED_VARS pxr_DIR)
-        return()
-    endif()
-endif()
-
-if(NOT USD_INCLUDE_DIR)
-    find_path(USD_INCLUDE_DIR pxr.h PATHS /usr/include/pxr /usr/local/include/pxr REQUIRED)
+if("${USD_INCLUDE_DIR}" STREQUAL "")
+    find_path(USD_INCLUDE_DIR pxr.h
+        PATHS
+            /usr/include/pxr
+            /usr/local/include/pxr
+        REQUIRED
+    )
     if(USD_INCLUDE_DIR)
         message(STATUS "Found USD include files in: ${USD_INCLUDE_DIR}")
     else()
@@ -40,44 +30,25 @@ else()
 endif()
 
 set(USD_LIBRARIES
-    usd_usd
-    usd_usdGeom
-    usd_usdShade
-    usd_usdLux
-    usd_vt
-    usd_sdf
-    usd_tf
-    usd_gf
-    usd_kind
-    usd_pcp
-    usd_arch
-    usd_ar
-    usd_plug
-    usd_js
-    usd_sdr
-    usd_work
-    usd_trace
-    usd_ndr
-    usd_ts
-)
+        usd_usd
+        usd_usdGeom
+        usd_usdShade
+        usd_usdLux
+        usd_vt
+        usd_sdf
+        usd_tf
+        usd_gf
+    )
 
-find_library(USD_LIBRARY NAMES ${USD_LIBRARIES} PATHS ${USD_LIBRARY_DIR})
+find_library(USD_LIBRARY
+    NAMES ${USD_LIBRARIES}
+    PATHS ${USD_LIBRARY_DIR})
 if(USD_LIBRARY)
     message(STATUS "USD libraries ${USD_LIBRARIES} found in: ${USD_LIBRARY_DIR}")
+    link_directories(${USD_LIBRARY_DIR})
 else()
     message(FATAL_ERROR "Unable to find USD libraries in: ${USD_LIBRARY_DIR}")
 endif()
 
-add_library(pxr::USD INTERFACE IMPORTED)
-target_link_directories(pxr::USD INTERFACE ${USD_LIBRARY_DIR} ${TBB_LIBRARY_DIR})
-target_include_directories(pxr::USD INTERFACE ${USD_INCLUDE_DIR} ${TBB_INCLUDE_DIR})
-
-# We don't link TBB libraries - on Windows they're provided using `pragma(lib)`.
-# On Unix there's no `pragma(lib)`, so in theory it will break.
-target_link_libraries(pxr::USD INTERFACE ${USD_LIBRARIES})
-
-if(MSVC)
-    target_link_libraries(pxr::USD INTERFACE debug DbgHelp.lib)
-endif()
-
-target_compile_definitions(pxr::USD INTERFACE PXR_STATIC WITH_USD)
+add_definitions(-DWITH_USD)
+set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)

cmake/Findnlohmann_json.cmake

@@ -1,30 +0,0 @@
-#
-# Input variables:
-# - `JSON_INCLUDE_DIR`
-# If input variables are not specified, try to find nlohmann_json config.
-# Input variables could also be provided as environment variables.
-#
-# Output targets:
-# - `nlohmann_json::nlohmann_json`
-
-UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-
-if(NOT JSON_INCLUDE_DIR)
-    find_package(nlohmann_json CONFIG)
-    mark_as_advanced(nlohmann_json)
-    if(nlohmann_json_DIR)
-        return()
-    endif()
-endif()
-
-find_path(json_header_path "nlohmann/json.hpp" HINTS "${JSON_INCLUDE_DIR}")
-mark_as_advanced(json_header_path)
-
-if(json_header_path)
-    message(STATUS "JSON for Modern C++ header file found in '${json_header_path}'.")
-    add_library(nlohmann_json::nlohmann_json INTERFACE IMPORTED)
-    target_include_directories(nlohmann_json::nlohmann_json INTERFACE ${json_header_path})
-    return()
-endif()
-
-message(FATAL_ERROR "Unable to find JSON for Modern C++ header file / package, aborting")

cmake/IfcOpenShellConfig.cmake.in

@@ -1,99 +0,0 @@
-@PACKAGE_INIT@
-
-set_and_check(IFCOPENSHELL_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
-
-# Variable to inspect installed schema versions.
-set(IFCOPENSHELL_SCHEMA_VERSIONS @SCHEMA_VERSIONS@)
-
-set(IFCOPENSHELL_WITH_OPENCASCADE @WITH_OPENCASCADE@)
-set(IFCOPENSHELL_WITH_CGAL @WITH_CGAL@)
-set(IFCOPENSHELL_IFCXML @IFCXML_SUPPORT@)
-set(IFCOPENSHELL_WITH_ROCKSDB @WITH_ROCKSDB@)
-set(IFCOPENSHELL_COLLADA_SUPPORT @COLLADA_SUPPORT@)
-set(IFCOPENSHELL_GLTF_SUPPORT @GLTF_SUPPORT@)
-set(IFCOPENSHELL_HDF5_SUPPORT @HDF5_SUPPORT@)
-set(IFCOPENSHELL_WITH_PROJ @WITH_PROJ@)
-set(IFCOPENSHELL_USD_SUPPORT @USD_SUPPORT@)
-
-include(CMakeFindDependencyMacro)
-
-set(IFCOPENSHELL_BOOST_USE_STATIC_LIBS "@Boost_USE_STATIC_LIBS@")
-set(IFCOPENSHELL_BOOST_USE_STATIC_RUNTIME "@Boost_USE_STATIC_RUNTIME@")
-set(IFCOPENSHELL_BOOST_USE_MULTITHREADED "@Boost_USE_MULTITHREADED@")
-if(NOT "${IFCOPENSHELL_BOOST_USE_STATIC_LIBS}" STREQUAL "")
-    set(Boost_USE_STATIC_LIBS ${IFCOPENSHELL_BOOST_USE_STATIC_LIBS})
-endif()
-if(NOT "${IFCOPENSHELL_BOOST_USE_STATIC_RUNTIME}" STREQUAL "")
-    set(Boost_USE_STATIC_RUNTIME ${IFCOPENSHELL_BOOST_USE_STATIC_RUNTIME})
-endif()
-if(NOT "${IFCOPENSHELL_BOOST_USE_MULTITHREADED}" STREQUAL "")
-    set(Boost_USE_MULTITHREADED ${IFCOPENSHELL_BOOST_USE_MULTITHREADED})
-endif()
-set(Boost_COMPONENTS
-    system
-    program_options
-    regex
-    thread
-    date_time
-    iostreams
-)
-find_dependency(Boost CONFIG COMPONENTS ${Boost_COMPONENTS})
-find_dependency(Eigen3 CONFIG)
-
-if(IFCOPENSHELL_WITH_ROCKSDB)
-    find_dependency(zstd CONFIG)
-
-    # Temporaily mess with CMAKE_FIND_PACKAGE_PREFER_CONFIG to help RocksDB
-    # find it's zstd dependency on Windows.
-    # Only do it on Windows, otherwise it might create problems as
-    # findzstd and zstd-config target names do not match.
-    # https://github.com/facebook/rocksdb/pull/13975
-    if(WIN32)
-        set(TEMP CMAKE_FIND_PACKAGE_PREFER_CONFIG)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
-    endif()
-    find_dependency(RocksDB CONFIG)
-    if(WIN32)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${TEMP})
-    endif()
-endif()
-
-if(IFCOPENSHELL_IFCXML)
-    find_dependency(LibXml2)
-endif()
-
-if(IFCOPENSHELL_WITH_CGAL)
-    find_dependency(CGAL CONFIG)
-endif()
-
-if(IFCOPENSHELL_COLLADA_SUPPORT)
-    find_dependency(OpenCOLLADA)
-endif()
-
-if(IFCOPENSHELL_GLTF_SUPPORT)
-    find_dependency(nlohmann_json CONFIG)
-endif()
-
-if(IFCOPENSHELL_HDF5_SUPPORT)
-    find_dependency(HDF5 COMPONENTS C CXX)
-endif()
-
-if(IFCOPENSHELL_WITH_PROJ)
-    find_dependency(PROJ)
-endif()
-
-if(IFCOPENSHELL_USD_SUPPORT)
-    find_dependency(USD)
-endif()
-
-if(IFCOPENSHELL_WITH_OPENCASCADE)
-    find_dependency(OpenCASCADE CONFIG)
-    if(OpenCASCADE_VERSION VERSION_LESS "7.7.0")
-        # cmake configs < 7.7.0 were not adding include directories to targets automatically.
-        set_target_properties(TKernel PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OpenCASCADE_INCLUDE_DIR}")
-    endif()
-endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/@CONFIG_TARGETS_FILENAME@")
-
-check_required_components("@PROJECT_NAME@")

cmake/cmake_uninstall.cmake.in

@@ -25,12 +25,19 @@ file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
 string(REGEX REPLACE "\n" ";" files "${files}")
 
 foreach(file ${files})
-    set(filepath "$ENV{DESTDIR}${file}")
-    message(STATUS "Uninstalling ${filepath}")
+    message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
 
-    if(IS_SYMLINK "${filepath}" OR EXISTS "${filepath}")
-        file(REMOVE "${filepath}")
-    else(NOT EXISTS "${filepath}")
-        message(STATUS "File ${filepath} does not exist.")
+    if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+        exec_program(
+            "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+            OUTPUT_VARIABLE rm_out
+            RETURN_VALUE rm_retval
+        )
+
+        if(NOT "${rm_retval}" STREQUAL 0)
+            message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+        endif()
+    else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+        message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
     endif()
 endforeach()

cmake/package_export.cmake

@@ -1,23 +0,0 @@
-set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-set(CONFIG_NAMESPACE "${PROJECT_NAME}")
-set(CONFIG_TARGETS_FILENAME ${PROJECT_NAME}Targets.cmake)
-set(CONFIG_VERSION_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
-set(CONFIG_PACKAGE_INPUT "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in")
-set(CONFIG_PACKAGE_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake")
-
-# Allow linking against build directory.
-export(EXPORT ${IFCOPENSHELL_EXPORT_TARGETS} FILE ${CONFIG_TARGETS_FILENAME} NAMESPACE ${CONFIG_NAMESPACE}::)
-
-install(EXPORT ${IFCOPENSHELL_EXPORT_TARGETS} NAMESPACE ${CONFIG_NAMESPACE}:: DESTINATION "${CONFIG_PACKAGE_LOCATION}")
-
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(${CONFIG_VERSION_OUTPUT} COMPATIBILITY ExactVersion)
-
-configure_package_config_file(
-    ${CONFIG_PACKAGE_INPUT}
-    ${CONFIG_PACKAGE_OUTPUT}
-    INSTALL_DESTINATION ${CONFIG_PACKAGE_LOCATION}
-    PATH_VARS CMAKE_INSTALL_LIBDIR
-)
-
-install(FILES "${CONFIG_PACKAGE_OUTPUT}" "${CONFIG_VERSION_OUTPUT}" DESTINATION ${CONFIG_PACKAGE_LOCATION})

cmake/utilities.cmake

@@ -19,9 +19,8 @@
 
 # Create a cache entry if absent for environment variables
 macro(UNIFY_ENVVARS_AND_CACHE VAR)
-    if(NOT DEFINED ${VAR} AND DEFINED ENV{${VAR}} AND NOT ENV{${VAR}} STREQUAL "")
+    if((NOT DEFINED ${VAR}) AND(NOT "$ENV{${VAR}}" STREQUAL ""))
         set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
-        mark_as_advanced(${VAR})
     endif()
 endmacro()
 
@@ -41,122 +40,6 @@ macro(SET_INSTALL_RPATHS _target _paths)
     set_target_properties(${_target} PROPERTIES INSTALL_RPATH "${${_target}_rpaths}")
 endmacro()
 
-macro(SET_INSTALL_SELF_RPATH _target)
-    if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
-        SET_INSTALL_RPATHS(${_target} "${CMAKE_INSTALL_LIBDIR}")
-    elseif(APPLE)
-        SET_INSTALL_RPATHS(${_target} "@loader_path")
-    else()
-        SET_INSTALL_RPATHS(${_target} "$ORIGIN")
-    endif()
-endmacro()
-
-function(ifcopenshell_plugin_target TARGET)
-    # Plug-ins are loaded by exact filename and should not receive a platform library prefix.
-    set_target_properties(${TARGET} PROPERTIES PREFIX "")
-    if((NOT WIN32) AND BUILD_SHARED_LIBS AND NOT WASM_BUILD AND NOT CREATE_BUNDLE AND NOT CMAKE_INSTALL_RPATH AND COMMAND SET_INSTALL_SELF_RPATH)
-        SET_INSTALL_SELF_RPATH(${TARGET})
-    endif()
-endfunction()
-
-function(ifcopenshell_wasm_plugin_link_options TARGET REGISTRATION_SYMBOL)
-    ifcopenshell_plugin_target(${TARGET})
-
-    if(NOT WASM_BUILD)
-        return()
-    endif()
-
-    cmake_parse_arguments(PLUGIN "" "OPTIMIZATION" "" ${ARGN})
-    if(NOT PLUGIN_OPTIMIZATION)
-        set(PLUGIN_OPTIMIZATION -O1)
-    endif()
-
-    set(plugin_symbols
-        ifcopenshell_plugin_abi_v1
-        ifcopenshell_plugin_metadata_v1
-        ${REGISTRATION_SYMBOL}
-    )
-
-    target_link_options(${TARGET} PRIVATE "SHELL:-s SIDE_MODULE=2" ${PLUGIN_OPTIMIZATION})
-    foreach(symbol IN LISTS plugin_symbols)
-        target_link_options(${TARGET} PRIVATE "LINKER:--export=${symbol}")
-    endforeach()
-endfunction()
-
-function(ifcopenshell_deploy_qt_runtime TARGET)
-    if(NOT IFCOPENSHELL_DEPLOY_QT_RUNTIME)
-        return()
-    endif()
-
-    if(NOT TARGET ${TARGET})
-        message(FATAL_ERROR "Cannot deploy Qt runtime for unknown target '${TARGET}'.")
-    endif()
-
-    get_target_property(target_type ${TARGET} TYPE)
-    if(NOT target_type STREQUAL "EXECUTABLE")
-        message(FATAL_ERROR "Qt runtime deployment target '${TARGET}' is not an executable.")
-    endif()
-
-    if(NOT DEFINED QT_DEFAULT_MAJOR_VERSION)
-        if(DEFINED QT_VERSION)
-            set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION})
-        else()
-            set(QT_DEFAULT_MAJOR_VERSION 6)
-        endif()
-    endif()
-
-    if(NOT TARGET Qt${QT_DEFAULT_MAJOR_VERSION}::Core)
-        set(qt_find_args Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED)
-        if(DEFINED QT_DIR AND NOT QT_DIR STREQUAL "")
-            list(APPEND qt_find_args PATHS ${QT_DIR})
-        endif()
-        find_package(${qt_find_args})
-    endif()
-
-    if(COMMAND _qt_internal_setup_deploy_support)
-        if(NOT DEFINED QT_CMAKE_EXPORT_NAMESPACE AND TARGET Qt${QT_DEFAULT_MAJOR_VERSION}::Core)
-            set(QT_CMAKE_EXPORT_NAMESPACE Qt${QT_DEFAULT_MAJOR_VERSION})
-        endif()
-
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 6 AND TARGET Qt6::Core)
-            get_target_property(qt_core_type Qt6::Core TYPE)
-            if(qt_core_type STREQUAL "SHARED_LIBRARY")
-                set(QT6_IS_SHARED_LIBS_BUILD ON)
-            else()
-                set(QT6_IS_SHARED_LIBS_BUILD OFF)
-            endif()
-        endif()
-
-        _qt_internal_setup_deploy_support()
-    endif()
-
-    set(deploy_args
-        TARGET ${TARGET}
-        OUTPUT_SCRIPT deploy_script
-        NO_UNSUPPORTED_PLATFORM_ERROR
-    )
-
-    if(NOT IFCOPENSHELL_DEPLOY_QT_TRANSLATIONS)
-        list(APPEND deploy_args NO_TRANSLATIONS)
-    endif()
-
-    list(APPEND deploy_args ${ARGN})
-
-    if(COMMAND qt_generate_deploy_app_script)
-        qt_generate_deploy_app_script(${deploy_args})
-    elseif(COMMAND qt6_generate_deploy_app_script)
-        qt6_generate_deploy_app_script(${deploy_args})
-    else()
-        message(WARNING
-            "Qt runtime deployment requested for '${TARGET}', but this Qt version "
-            "does not provide qt_generate_deploy_app_script()."
-        )
-        return()
-    endif()
-
-    install(SCRIPT ${deploy_script})
-endfunction()
-
 # Get a list of all OPTION flags from the CMakeLists.txt and store in an output LIST
 function(get_all_option_flags output_list)
     # Read the contents of the CMakeLists.txt
@@ -230,30 +113,6 @@ function(add_debug_variants NAME LIBRARIES POSTFIX)
     set(${NAME} ${LIBRARIES} PARENT_SCOPE)
 endfunction()
 
-# E.g.
-# - `get_release_variant(MYLIB "mylibd.lib" "d")` -> `MYLIB = "mylib.lib"`
-# - `get_release_variant(MYLIB "mylib.lib" "d")`  -> `MYLIB = "mylib.lib"`
-function(get_release_variant NAME LIBRARY POSTFIX)
-    set(RELEASE_SUFFIX ".lib")
-    set(DEBUG_SUFFIX "${POSTFIX}${RELEASE_SUFFIX}")
-    if("${LIBRARY}" MATCHES "${DEBUG_SUFFIX}$")
-        string(REPLACE "${DEBUG_SUFFIX}" "${RELEASE_SUFFIX}" LIBRARY ${LIBRARY})
-    endif()
-    set(${NAME} "${LIBRARY}" PARENT_SCOPE)
-endfunction()
-
-# E.g.
-# - `get_debug_variant(MYLIB "mylib.lib" "d")`  -> `MYLIB = "mylibd.lib"`
-# - `get_debug_variant(MYLIB "mylibd.lib" "d")` -> `MYLIB = "mylibd.lib"`
-function(get_debug_variant NAME LIBRARY POSTFIX)
-    set(RELEASE_SUFFIX ".lib")
-    set(DEBUG_SUFFIX "${POSTFIX}${RELEASE_SUFFIX}")
-    if(NOT "${LIBRARY}" MATCHES "${DEBUG_SUFFIX}$" AND "${LIBRARY}" MATCHES "${RELEASE_SUFFIX}$")
-        string(REPLACE "${RELEASE_SUFFIX}" "${DEBUG_SUFFIX}" LIBRARY ${LIBRARY})
-    endif()
-    set(${NAME} "${LIBRARY}" PARENT_SCOPE)
-endfunction()
-
 function(files_for_ifc_version IFC_VERSION RESULT_NAME)
     set(IFC_PARSE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcparse)
     set(${RESULT_NAME}

conda/build.bat

@@ -9,6 +9,7 @@ set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
 cmake -G "Ninja" ^
  -D SCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" ^
  -D CMAKE_BUILD_TYPE:STRING=Release ^
+ -D CMAKE_CXX_STANDARD=17 ^
  -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_SYSTEM_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -22,6 +23,9 @@ cmake -G "Ninja" ^
  -D GMP_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
  -D MPFR_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
  -D COLLADA_SUPPORT=OFF ^
+ -D HDF5_SUPPORT=ON ^
+ -D HDF5_INCLUDE_DIR="%LIBRARY_PREFIX%\include" ^
+ -D HDF5_LIBRARY_DIR="%LIBRARY_PREFIX%\lib" ^
  -D JSON_INCLUDE_DIR="%LIBRARY_PREFIX%\include" ^
  -D PYTHON_INCLUDE_DIR=%PREFIX%\include ^
  -D PYTHON_EXECUTABLE:FILEPATH=%PREFIX%\python.exe ^
@@ -34,11 +38,12 @@ cmake -G "Ninja" ^
  -D GLTF_SUPPORT:BOOL=ON ^
  -D BUILD_CONVERT:BOOL=ON ^
  -D BUILD_IFCMAX:BOOL=OFF ^
+ -D IFCXML_SUPPORT:BOOL=ON ^
  -D Boost_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
  -D Boost_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
  -D Boost_USE_STATIC_LIBS:BOOL=OFF ^
  ../cmake
-
+ 
 if errorlevel 1 exit 1
 
 ninja install -j 1
@@ -47,4 +52,4 @@ if errorlevel 1 exit 1
 
 python %RECIPE_DIR%/update_version_init.py %PKG_VERSION% %SP_DIR%/ifcopenshell/__init__.py
 
-if errorlevel 1 exit 1
+if errorlevel 1 exit 1

conda/build.sh

@@ -16,6 +16,7 @@ cmake ${CMAKE_ARGS} -G Ninja \
  -DSCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=$PREFIX \
+ -DCMAKE_CXX_STANDARD=17 \
   ${CMAKE_PLATFORM_FLAGS[@]} \
  -DCMAKE_PREFIX_PATH=$PREFIX \
  -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
@@ -24,6 +25,9 @@ cmake ${CMAKE_ARGS} -G Ninja \
  -DMPFR_LIBRARY_DIR=$PREFIX/lib \
  -DOCC_INCLUDE_DIR=$PREFIX/include/opencascade \
  -DOCC_LIBRARY_DIR=$PREFIX/lib \
+ -DHDF5_SUPPORT:BOOL=ON \
+ -DHDF5_INCLUDE_DIR=$PREFIX/include \
+ -DHDF5_LIBRARY_DIR=$PREFIX/lib \
  -DJSON_INCLUDE_DIR=$PREFIX/include \
  -DCGAL_INCLUDE_DIR=$PREFIX/include \
  -DLIBXML2_INCLUDE_DIR=$PREFIX/include/libxml2 \
@@ -31,6 +35,7 @@ cmake ${CMAKE_ARGS} -G Ninja \
  -DEIGEN_DIR:FILEPATH=$PREFIX/include/eigen3 \
  -DCOLLADA_SUPPORT:BOOL=OFF \
  -DBUILD_EXAMPLES:BOOL=OFF \
+ -DIFCXML_SUPPORT:BOOL=ON \
  -DGLTF_SUPPORT:BOOL=ON \
  -DBUILD_CONVERT:BOOL=ON \
  -DBUILD_IFCPYTHON:BOOL=ON \
@@ -43,4 +48,4 @@ ninja
 
 ninja install -j 1
 
-python "${RECIPE_DIR}/update_version_init.py" "${PKG_VERSION}" "${SP_DIR}/ifcopenshell/__init__.py"
+python "${RECIPE_DIR}/update_version_init.py" "${PKG_VERSION}" "${SP_DIR}/ifcopenshell/__init__.py"

conda/conda_build_config.yaml

@@ -26,6 +26,8 @@ c_stdlib_version:
   - 2.17    # [linux]
   - 10.13   # [osx and x86_64]
   - 11.0    # [osx and arm64]
+hdf5:
+- 1.14.6
 libboost_devel:
 - '1.86'
 libxml2:

conda/recipe.yaml

@@ -33,6 +33,7 @@ requirements:
     - occt
     - libxml2
     - cgal-cpp
+    - hdf5
     - eigen
     - mpfr
     - nlohmann_json
@@ -284,6 +285,11 @@ about:
       <td>Internal library for IfcOpenShell</td>
       <td>LGPL-3.0-or-later*</td>
     </tr>
+    <tr>
+      <td>qtviewer</td>
+      <td>Internal library for IfcOpenShell</td>
+      <td>LGPL-3.0-or-later*</td>
+    </tr>
     <tr>
       <td>serializers</td>
       <td>Internal library for IfcOpenShell</td>

conda/update_version_init.py

@@ -1,8 +1,7 @@
-import argparse
 import re
+import argparse
 from pathlib import Path
 
-
 def update_version(file_path: str, version: str) -> None:
     """Update the version string in the given __init__.py file."""
     file_path = Path(file_path)

docker/.dockerignore

@@ -1,3 +0,0 @@
-.env
-*.pyc
-__pycache__

docker/.gitignore

@@ -1,3 +0,0 @@
-.env
-*.pyc
-__pycache__

docker/.ifcos_env

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# .ifcos_env
-# register autocompletes. just source the file in your shell, i.e. 
-# source .ifcos_env
-
-.ifcos_env() {
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    opts="create update up down restart build attach logs ps config remove help"
-
-    # Basic static completion
-    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-
-    return 0
-}
-
-# Register the completion for the command "ifcos_env"
-complete -F .ifcos_env ./ifcos_env

docker/Dockerfile

@@ -1,67 +0,0 @@
-FROM rockylinux:9
-
-# Update system, enable CRB (needed by some EPEL packages) and install EPEL,
-# then install required packages + some common tools for a bit of command
-# line comfort. Combined into one layer so a later `create` always installs
-# against packages from the same dnf update, rather than layering fresh
-# installs on top of a stale cached "update" layer.
-RUN dnf update -y && \
-    dnf install -y epel-release && \
-    dnf config-manager --set-enabled crb && \
-    dnf install -y --allowerasing --setopt=install_weak_deps=False --setopt=tsflags=nodocs \
-                   bash-completion vim git curl wget which tree htop sudo   \
-                   gcc gcc-c++ autoconf automake bison make zip cmake      \
-                   python3 python3-pip                                    \
-                   bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel \
-                   sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel \
-                   readline-devel ncurses-devel libuuid-devel git-lfs      \
-                   findutils xz byacc ccache && \
-    git lfs install --system && \
-    dnf clean all && \
-    rm -rf /var/cache/dnf
-
-# Trust bind-mounted repos regardless of which user (root or builder) or host
-# UID owns them, rather than a per-user config that only one of them sees.
-RUN git config --system --add safe.directory '*'
-
-# Configure ccache. CCACHE_MAXSIZE (not `ccache -M`) because /ccache is a
-# volume mount point at runtime - anything `ccache -M` writes to a config
-# file under it during this build gets shadowed once the real volume is
-# mounted, so the size cap only actually takes effect via the env var.
-# 2G is generous: a full build (IfcParse+IfcGeom+IfcConvert+wrapper, one
-# Python version) measures ~300MB, and the volume is now shared across all
-# checkouts (see compose.yaml), so this covers several diverging branches.
-ENV CCACHE_DIR=/ccache
-ENV CCACHE_MAXSIZE=2G
-ENV PATH="/usr/lib/ccache:$PATH"
-
-# Non-root user matching the host UID/GID that bind-mounts the repo (default
-# 1000:1000, the common single-user-Linux-box case), so files the build
-# creates under the mount keep sane, non-root ownership on the host side.
-# Override with --build-arg USER_UID=$(id -u) --build-arg USER_GID=$(id -g)
-# if your host user has a different UID/GID.
-ARG USER_UID=1000
-ARG USER_GID=1000
-# groupadd fails outright if USER_GID is already taken by an existing
-# system group - which happens whenever a host's primary GID collides with
-# one baked into the rockylinux9 base image. The main real-world case is
-# macOS, where the default user's primary group is "staff" at GID 20, and
-# GID 20 is "games" on RHEL-family images. Only create the "builder" group
-# when that GID is actually free; otherwise useradd just attaches to
-# whichever group already owns it. Either way the builder user ends up
-# with the right GID for bind-mount ownership, which is all that matters.
-RUN (getent group "${USER_GID}" >/dev/null || groupadd -g "${USER_GID}" builder) \
-    && useradd -m -u "${USER_UID}" -g "${USER_GID}" -s /bin/bash builder \
-    && echo "builder ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/builder
-
-# Copied while still root: /bin is not writable by the builder user.
-COPY --from=ghcr.io/astral-sh/uv:0.11.27 /uv /uvx /bin/
-
-USER builder
-WORKDIR /__w/IfcOpenShell/IfcOpenShell
-
-# Installed as builder so managed Python interpreters land under builder's
-# $HOME, matching the user that actually runs the build.
-RUN uv python install
-
-CMD ["sleep", "infinity"]

docker/README.md

@@ -1,78 +0,0 @@
-Docker build environment
-========================
-
-This is a small utility to make it easy to compile a perfect `_ifcopenshell_wrapper.cpython-*-x86_64-linux-gnu.so`
-files.
-
-The reason for this tool is that I was trying to follow the web page directions, and my build was behaving differently
-to the release builds. Eventually I concluded that the differences between toolchains on the RHEL based rocky9 image
-and Ubuntu were just too great. Getting the build setup was already a lot of trial and error, so I thought I'd spend
-more time trying to reuse the github actions that perform the build, using a utility called `act`. I learnt a lot, in
-particular how much time, energy, and bandwidth Github waste. I also realised I was most of the way to a regular docker
-setup anyway, so I might as well just do that. So I've deconstructed all the github action steps, and turned it into
-a local docker build environment that uses the exact same base, tools, libraries, and build command/flags etc.
-
-Right now a Github action will:
-- launch the rocky9 base
-- upgrade all the packages
-- install a bunch of extra tools
-- do a recursive checkout of your repo
-- checkout the build repository
-- unpack dependencies
-- run the build script, making all python versions (5? right now I think)
-- create the .zip release files
-
-And it does _all_ of that _every_ time. This is not a fault of the action writers - it's just how Github seems to work.
-
-These dockers tools do the following differently, and it's actually a bit more powerful too:
-- build the base image once.
-- update the packages once.
-- install the extra tools once.
-- the repository is the one on your host, that gets bind mounted in the container as the working directory.
-- by adding an environment variable to .env, restricts to compiling for just a single python version.
-- when the build is finished the created files are right there under your local repositry (but not added to git) for
-  ease of access
-- each repository can have it's own build environment container.
-- the image is shared between those environments.
-- the containers share the ccache, so additional envs should get a helping hand.
-- it has a simple set of user friendly commands to drive it all.
-
-For example:
-``` bash
-# To see the commands (a superset of docker compose commands)
-./ifcos_env
-
-# Enable autocomplete of commands
-source .ifcos_env
-
-# First time commands
-./ifcos_env create
-./ifcos_env up
-./ifcos_env build
-
-# install and test library
-# find an issue
-# edit code
-./ifcos_env build
-
-# and so on. When done stop and optionally delete the container
-./ifcos_env stop
-./ifcos_env remove
-```
-
-To limit the build to one python version just add
-``` bash
-PY_TGT=py-311
-```
-or whichever version your Blender requires.
-
-You might see UNIQUE_ID in the .env file too. This keeps containers for separate folders, separate.
-
-System requirements
-1. Linux-x64 only at this time.
-2. Docker and docker-compose need to be installed.
-3. Have a good amount of disk space. (image is in /var (typically the root partition) and will be about 1.7 GB)
-4. The build action will create about 10GB in your repository folder. Make sure this partition is spacious
-   particularly if you intent on having multiple clones building.
-5. ... I think that covers most of it.
-

docker/SKILL.md

@@ -1,186 +0,0 @@
----
-name: ifcopenshell-docker-build
-description: >-
-  Build a real ifcopenshell_wrapper (.so + .py) and IfcConvert locally via
-  the docker/ifcos_env toolchain, then wire them into a checkout for
-  running C++-dependent parts of the test suite (geometry, the SWIG
-  wrapper stub, the C++ parser). Use whenever a task needs to compile
-  IfcOpenShell's C++ core rather than just read/patch source - e.g.
-  reproducing or fixing a bug in src/ifcgeom, src/ifcparse, src/ifcwrap,
-  or validating util/scripts/validate_stub.py against the actual
-  generated wrapper.
----
-
-# Building IfcOpenShell locally with docker/ifcos_env
-
-`docker/` mirrors the project's GitHub Actions build environment locally,
-in a persistent, non-root container with ccache so repeat builds are fast.
-See `docker/README.md` for the design rationale. Pure-Python changes don't
-need any of this - only reach for it when you need a real compiled
-`_ifcopenshell_wrapper*.so` or `IfcConvert` binary.
-
-## Placement
-
-This `docker/` folder must live as a direct child of the repo root you want
-to build (sibling of `src/`, `cmake/`, etc.) - `compose.yaml` and
-`ifcos_env` resolve the repo via `../` relative to wherever `docker/`
-itself sits, and bind-mount it into the container. If you're setting this
-up in a fresh clone, copy the whole `docker/` directory there first.
-
-## Setup
-
-```bash
-cd docker
-./ifcos_env create   # build the image (shared by name across all your clones/checkouts, so usually instant after the first time anywhere)
-./ifcos_env up        # create + start the container, clone/unpack the third-party dependency cache (~10GB, one-time per container)
-./ifcos_env build     # full build: all deps + IfcParse + IfcGeom + IfcConvert + the Python wrapper, for one Python version
-```
-
-`PY_TGT` and `UNIQUE_ID` live in `docker/.env` - `PY_TGT` (e.g. `py-311`)
-restricts the build to one Python version instead of building five;
-`UNIQUE_ID` is a hash of the folder path, recalculated on every `up`, so
-each checkout gets its own container/volumes automatically.
-
-A full first build takes ~1.5 hours (mostly compiling IfcOpenShell's own
-C++, not the cached third-party deps). After that, ccache makes incremental
-rebuilds of a couple of touched `.cpp` files **under a minute**.
-
-## Container lifecycle
-
-The container is long-lived (`sleep infinity`) so exec'd commands and
-ccache state persist between builds. Commands map directly onto Docker
-Compose's own container-vs-image distinction:
-
-```bash
-./ifcos_env up         # create the container if it doesn't exist, then start it (runs ready_repo too)
-./ifcos_env stop       # stop the container, keep it around
-./ifcos_env start      # start it back up (same container, same filesystem layer)
-./ifcos_env restart    # stop, then start
-./ifcos_env down       # remove the container (and its network) entirely
-./ifcos_env recreate   # down, then up - a fresh container
-```
-
-Named volumes (`ccache`) and the bind-mounted repo/`build/` are unaffected
-by `down`/`recreate` - only the container itself goes away, and `up`
-recreates it from the image.
-
-## Fast iteration
-
-Pass a target to `build` to skip the parts you don't need:
-
-```bash
-./ifcos_env build IfcConvert           # only the executables (IfcConvert, IfcGeomServer) - skips the Python wrapper entirely
-./ifcos_env build IfcOpenShell-Python  # only the SWIG Python wrapper - skips executables entirely
-./ifcos_env build                      # no target = everything (needed the first time, or after touching shared headers)
-```
-
-Use this to keep the edit -> rebuild -> test loop fast when debugging: if
-you're only touching `src/ifcgeom/`, build `IfcConvert`; if you're only
-exercising the Python API, build `IfcOpenShell-Python`.
-
-## Where the artifacts land
-
-Build output goes to `<repo_root>/build/Linux/x86_64/install/` on the host
-(bind-mounted, not just inside the container), owned by you (see
-"Container user" below):
-
-- `ifcopenshell/bin/IfcConvert` - the CLI binary
-- `python-<version>/lib/python<X.Y>/site-packages/ifcopenshell/_ifcopenshell_wrapper*.so`
-  and `ifcopenshell_wrapper.py` - the compiled wrapper + its generated
-  Python glue
-
-## Testing against a checkout (automated / AI-driven)
-
-`_ifcopenshell_wrapper*.so` and `ifcopenshell_wrapper.py` are already
-gitignored under `src/ifcopenshell-python/ifcopenshell/`, which is exactly
-where a normal in-tree build would put them - copy the two files there:
-
-```bash
-SRC=build/Linux/x86_64/install/python-3.11.8/lib/python3.11/site-packages/ifcopenshell
-cp "$SRC/_ifcopenshell_wrapper.cpython-311-x86_64-linux-gnu.so" src/ifcopenshell-python/ifcopenshell/
-cp "$SRC/ifcopenshell_wrapper.py" src/ifcopenshell-python/ifcopenshell/
-```
-
-Then, to run the test suite against it:
-
-```bash
-export PATH="$PWD/build/Linux/x86_64/install/ifcopenshell/bin:$PATH"   # for IfcConvert-dependent tests
-cd src/ifcopenshell-python/test
-PYTHONPATH="$PWD/.." python3.11 -m pytest -p no:pytest-blender .
-```
-
-(`-p no:pytest-blender` avoids the pytest-blender plugin trying to find a
-`blender` executable and failing collection entirely, even for non-Blender
-tests.) You'll need the matching Python version's `pip install`s too
-(numpy, shapely, isodate, lark, tabulate, pytest, ... - whatever the
-modules under test import) since this is a bare interpreter, not the
-project's pixi env.
-
-**This is the pattern to use for automated or AI-driven verification.**
-Don't use `try` (below) for that - it overwrites files in a real, live
-Blender installation, which isn't something an automated/AI workflow
-should ever do without the human explicitly asking for it in the moment.
-
-## Testing in Blender itself (human only)
-
-`try` copies the built wrapper straight into your actual Blender/Bonsai
-extension install, for manual in-Blender testing:
-
-```bash
-./ifcos_env try
-```
-
-It reads `BLENDER_USER_RESOURCE` from `.env` - set this to wherever
-Blender's user resource folder for the Bonsai extension actually lives on
-your system, which depends on your own Blender setup:
-
-```bash
-# in docker/.env
-BLENDER_USER_RESOURCE=~/.config/blender/bonsai/
-```
-
-`try` figures out the built Python version from `build/.../install/`
-(disambiguating with `PY_TGT` if more than one version was built) and
-copies the wrapper to
-`$BLENDER_USER_RESOURCE/extensions/.local/lib/python<X.Y>/site-packages/ifcopenshell/`.
-
-## Container user
-
-The image runs as a non-root `builder` user, UID/GID matching your host
-account (passed as `--build-arg` by `create` from `id -u`/`id -g`, so it
-adjusts automatically - no manual flag needed even if you're not 1000:1000).
-Files the build creates under the bind mount come out owned by you, not
-root. Passwordless `sudo` is available inside the container (e.g. via
-`attach`) for the rare case you need root for something ad hoc.
-
-If you're picking up an existing checkout that was previously built with
-an older, root-based image, you may hit `Permission denied` the first time
-you run `up`/`build` under the new image - `build/`, `.git/modules/`, the
-`ccache` volume, `output/`, and `build.log` can all be left root-owned from
-before. Fix it once via the container's own root (no host `sudo` needed):
-
-```bash
-docker exec -u root -w /__w/IfcOpenShell/IfcOpenShell <container-name> \
-    chown -R "$(id -u)":"$(id -g)" .git/modules build output build.log /ccache
-```
-
-(`<container-name>` is `ifcopenshell-<UNIQUE_ID>` - see `docker ps -a`.)
-
-## Other things worth knowing
-
-- **Linux x64 only.** `compose.yaml` pins `platform: linux/amd64`; on an
-  ARM host (e.g. Apple Silicon) this build isn't available.
-- **The final "Package .zip archives" step of `build()` has a pre-existing
-  bash syntax error**, unrelated to compilation - the actual build already
-  succeeded by that point (look for `Built IfcOpenShell...` in the output),
-  so this is safe to ignore if you only need the raw artifacts under
-  `build/.../install/`, not packaged release zips.
-- **`test_mmaped_stream` and similar `USE_MMAP`-dependent tests will fail**
-  against this build - `nix/build-all.py` is invoked with `USE_MMAP=OFF`
-  here. Not a bug in your code if you see it fail.
-- Only the bind-mounted `<repo>/build` lives on the host filesystem your
-  repo is checked out on. Anything the container writes *outside* that
-  mount lives in the container's own writable layer under Docker's data
-  root (commonly `/var/lib/docker`, i.e. usually your root partition) -
-  keep an eye on `df -h /` if you're running several of these containers
-  at once.

docker/compose.yaml

@@ -1,15 +0,0 @@
-name: ifcopenshell-${UNIQUE_ID}
-services:
-  ifcopenshell:
-    container_name: ifcopenshell-${UNIQUE_ID}
-    image: ifcopenshell-build-env:updated
-    platform: linux/amd64
-    volumes:
-      - type: bind
-        source: ../
-        target: /__w/IfcOpenShell/IfcOpenShell
-      - ccache:/ccache
-
-volumes:
-  ccache:
-    name: ifcopenshell-ccache-shared

docker/ifcos_env

@@ -1,339 +0,0 @@
-#!/bin/bash
-
-# ================== CONFIG ==================
-SCRIPT_NAME=$(basename "$0")
-ENV_FILE=".env"
-WORKDIR="/__w/IfcOpenShell/IfcOpenShell"
-NAMEPREFIX=ifcopenshell
-
-function set_env() {
-    # Load .env file if it exists
-    if [[ -f "$ENV_FILE" ]]; then
-        set -a
-        source "$ENV_FILE"
-        set +a
-        echo "✅ Loaded environment variables from $ENV_FILE"
-    else
-        echo "⚠️  No $ENV_FILE found, proceeding without it."
-    fi
-}
-
-set_env
-
-# ================ FUNCTIONS =================
-
-function create() {
-    echo "⭐ Creating image: ifcopenshell-build-env"
-    docker build -f Dockerfile \
-        --build-arg USER_UID="$(id -u)" --build-arg USER_GID="$(id -g)" \
-        -t ifcopenshell-build-env:updated .
-}
-
-function update() {
-    # The Dockerfile always builds FROM a clean rockylinux:9 and does
-    # `dnf update -y` as its first step, so re-running create() is enough
-    # to get fresh packages.
-    echo "⚡ Updating image: ifcopenshell-build-env"
-    create
-}
-
-function up() {
-    # Creates the container if it doesn't exist yet (and starts it either
-    # way) - this is the one that needs ready_repo, since a freshly created
-    # container has no submodules/dependency cache in place yet.
-    echo "🚀 Creating/starting stack: ifcopenshell-${UNIQUE_ID}"
-    unique          # Update UNIQUE_ID first
-    docker compose up -d "$@"   # Container must exist before ready_repo can exec into it.
-    ready_repo      # Ensure repo is recursive, and the build repo is in place.
-}
-
-function down() {
-    # Removes the container (and its network) entirely. Named volumes
-    # (ccache) and the bind-mounted repo/build/ survive; up() will recreate
-    # the container from scratch next time.
-    echo "🔥 Removing stack: ifcopenshell-${UNIQUE_ID}"
-    docker compose down "$@"
-}
-
-function stop() {
-    # Stops the existing container without removing it - the container,
-    # its filesystem layer, and its exec history all remain intact.
-    echo "🛑 Stopping stack: ifcopenshell-${UNIQUE_ID}"
-    docker compose stop "$@"
-}
-
-function start() {
-    # Starts a previously-stopped container back up. Does nothing (and
-    # won't create anything) if the container doesn't exist - use up() for
-    # that.
-    echo "▶️  Starting stack: ifcopenshell-${UNIQUE_ID}"
-    docker compose start "$@"
-}
-
-function restart() {
-    echo "🔄 Restarting stack (stop, then start)..."
-    stop
-    start
-}
-
-function recreate() {
-    echo "♻️  Recreating stack (down, then up)..."
-    down
-    up
-}
-
-function logs() {
-    echo "📜 Showing logs..."
-    docker compose logs -f "$@"
-}
-
-function ps() {
-    docker compose ps
-}
-
-function config() {
-    echo "🔍 Validated compose configuration:"
-    docker compose config
-}
-
-function remove() {
-    # Lower-level than down(): removes already-stopped containers without
-    # touching the compose network. Mostly useful after a plain stop().
-    echo "🗑️  Removing stopped containers: ifcopenshell-${UNIQUE_ID}"
-    docker compose rm "$@"
-}
-
-function unique() {
-    echo "🔧 Making stack name folder specific..."
-
-    REGEX="^UNIQUE_ID="
-
-    if [[ ! -f "$ENV_FILE" ]] || ! grep -qE "$REGEX" "$ENV_FILE"; then
-        echo -e "\nUNIQUE_ID=dummy\n" >> "$ENV_FILE"
-    fi
-
-    export UNIQUE_ID="$(pwd | sha256sum | cut -c -8)"
-
-    # `sed -i` takes incompatible syntax between GNU sed (Linux) and BSD sed
-    # (macOS) - `-si` is GNU-only and errors as "illegal option -- s" under
-    # BSD/macOS sed. Avoid -i altogether and do the in-place edit via a temp
-    # file + mv instead, which behaves identically with either sed.
-    local tmp_file
-    tmp_file="$(mktemp "${ENV_FILE}.XXXXXX")"
-    sed "s/^UNIQUE_ID=.*$/UNIQUE_ID=${UNIQUE_ID}/" "$ENV_FILE" > "$tmp_file"
-    mv "$tmp_file" "$ENV_FILE"
-
-    set_env
-}
-
-function ready_repo() {
-    echo "👍 Getting the repo ready to build..."
-    docker exec -i -w "${WORKDIR}" "${NAMEPREFIX}-${UNIQUE_ID}" bash -c '
-        set -euo pipefail   # Recommended for robustness
-
-        git submodule update --init --recursive
-
-        if [[ ! -d "build" ]]; then
-            git clone -b rockylinux9-x64 https://github.com/IfcOpenShell/build-outputs.git build
-        else
-            cd build
-            git pull
-            cd ..
-        fi
-
-        if [[ ! -d "build/Linux/x86_64/install/boost-1.86.0/" ]]; then
-            cd build
-            uv run ../nix/cache_dependencies.py unpack
-            cd ..
-        fi
-    '
-}
-
-function build() {
-    echo "☕ Execute the build, go make yourself a cuppa... I'll be a while"
-    local BUILD_TARGET="$1"
-    
-    docker exec -i -w "${WORKDIR}" -e PY_TGT="${PY_TGT}" -e BUILD_TARGET="${BUILD_TARGET}" "${NAMEPREFIX}-${UNIQUE_ID}" bash -c '
-        set -o pipefail
-        CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release uv run ./nix/build-all.py -v ${PY_TGT:+-$PY_TGT} --diskcleanup ${BUILD_TARGET} 2>&1 | tee build.log
-    '
-    echo "🎒 Pack Dependencies"
-    docker exec -i -w "${WORKDIR}" "${NAMEPREFIX}-${UNIQUE_ID}" bash -c '
-        cd build
-        uv run ../nix/cache_dependencies.py pack
-    '
-
-    echo "🎁 Package .zip archives"
-    docker exec -i -w "${WORKDIR}" -e GITHUB_SHA="$(git rev-parse HEAD)" "${NAMEPREFIX}-${UNIQUE_ID}" bash -c '
-        OUTPUT_DIR=${PWD}/output
-        VERSION=v`cat VERSION`
-        mkdir -p ${OUTPUT_DIR}
-        cd ./build/`uname`/*/install/ifcopenshell
-
-        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_DIR}/
-            popd > /dev/null
-        done
-
-        cd bin
-        if compgen -G "./*.zip" > /dev/null; then
-            rm *.zip 2>&1 >/dev/null || true
-        ls | while read exe; do
-            zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip $exe
-        done
-        mv *.zip ${OUTPUT_DIR}/
-        cd ..
-      '
-}
-
-function attach() {
-    echo "🔦 Connect to interactive shell"
-    docker exec -it  -w "${WORKDIR}" "${NAMEPREFIX}-${UNIQUE_ID}" /bin/bash
-}
-
-function try() {
-    # Copies the freshly built wrapper into your actual Blender/Bonsai
-    # installation for manual, in-Blender testing. This is a human-only
-    # convenience: it overwrites files in your live Blender setup, so it's
-    # not something that should run unattended as part of an automated or
-    # AI-driven build/test loop (which should instead copy the wrapper into
-    # the repo's own src/ifcopenshell-python/ifcopenshell/ - see SKILL.md).
-    echo "🚴 Copying build artifacts into your Blender resource folder for testing"
-
-    if [[ -z "${BLENDER_USER_RESOURCE:-}" ]]; then
-        echo "❌ BLENDER_USER_RESOURCE is not set in .env."
-        echo "   Add a line pointing at wherever Blender's user resource folder for"
-        echo "   the Bonsai extension actually is on your system, e.g.:"
-        echo "     BLENDER_USER_RESOURCE=~/.config/blender/bonsai/"
-        return 1
-    fi
-
-    # Normalise: expand a leading ~ (in case it was quoted in .env and so
-    # never went through shell tilde-expansion when set_env sourced it),
-    # then resolve to an absolute, symlink-free path.
-    local resource="${BLENDER_USER_RESOURCE/#\~/$HOME}"
-    resource="$(realpath -m "$resource")"
-
-    local install_dir="../build/Linux/x86_64/install"
-    local py_dirs=("$install_dir"/python-*)
-    if [[ ${#py_dirs[@]} -gt 1 && -n "${PY_TGT:-}" ]]; then
-        # PY_TGT is compact (py-311); the install dirs are dotted
-        # (python-3.11.8) - reinsert the dot (assumes a single-digit major
-        # version, true for the Python 3.x line) before matching.
-        local py_tgt_digits="${PY_TGT#py-}"
-        local py_tgt_dotted="${py_tgt_digits:0:1}.${py_tgt_digits:1}"
-        local filtered=() d
-        for d in "${py_dirs[@]}"; do
-            [[ "$(basename "$d")" == "python-${py_tgt_dotted}."* ]] && filtered+=("$d")
-        done
-        [[ ${#filtered[@]} -gt 0 ]] && py_dirs=("${filtered[@]}")
-    fi
-    if [[ ${#py_dirs[@]} -ne 1 || ! -d "${py_dirs[0]}" ]]; then
-        echo "❌ Expected exactly one built python-* dir under $install_dir, found ${#py_dirs[@]}."
-        echo "   Run 'build' first, or set PY_TGT in .env to disambiguate a multi-version build."
-        return 1
-    fi
-
-    local py_minor
-    py_minor="$(basename "${py_dirs[0]}" | grep -oE '[0-9]+\.[0-9]+')"
-    local wrapper_dir="${py_dirs[0]}/lib/python${py_minor}/site-packages/ifcopenshell"
-    if [[ ! -f "$wrapper_dir/ifcopenshell_wrapper.py" ]]; then
-        echo "❌ Built wrapper not found at $wrapper_dir - run 'build' first."
-        return 1
-    fi
-
-    local target="$resource/extensions/.local/lib/python${py_minor}/site-packages/ifcopenshell"
-    mkdir -p "$target"
-    cp "$wrapper_dir"/_ifcopenshell_wrapper*.so "$target/"
-    cp "$wrapper_dir"/ifcopenshell_wrapper.py "$target/"
-    echo "✅ Copied wrapper into $target"
-}
-
-function clean() {
-    # Host-side only - doesn't touch the container, image, or ccache volume.
-    echo "💎 Clean the build and output folder up"
-    if [[ -d "../build" ]]; then
-        rm -rf ../build
-    fi
-    if [[ -d "../output" ]]; then
-        rm -rf ../output
-    fi
-}
-
-
-function help() {
-    cat <<EOF
-Usage: ./$SCRIPT_NAME <command>
-
-Available commands:
-  create      Build the rocky9-based image
-  update      Rebuild the image fresh, picking up OS package updates
-  up          Create the container if it doesn't exist yet, and start it
-  down        Remove the container entirely (docker compose down)
-  stop        Stop the container without removing it
-  start       Start a previously-stopped container
-  restart     stop, then start (same container, no recreation)
-  recreate    down, then up (fresh container)
-  build       Execute the IfcOpenShell build
-  attach      Connect to an interactive shell in the container
-  try         Copy the built wrapper into your Blender resource folder
-              (human-only - see BLENDER_USER_RESOURCE below, and SKILL.md
-              for the AI/automated-testing equivalent)
-  clean       Remove the build and output folders
-  logs        Follow container logs
-  ps          Show running containers
-  config      Validate and show compose config
-  remove      Remove stopped containers (docker compose rm)
-  help        Show this help
-
-Environment variables from .env are automatically loaded, including:
-  PY_TGT                  Restrict the build to one Python version, e.g. py-311
-  UNIQUE_ID               Recalculated automatically on every 'up', don't set by hand
-  BLENDER_USER_RESOURCE   Where 'try' copies the wrapper for manual testing, e.g.
-                          ~/.config/blender/bonsai/
-EOF
-}
-
-# ================= MAIN =================
-
-case "$1" in
-    create)         create ;;
-    update)         update ;;
-    up)             up "${@:2}" ;;
-    down)           down "${@:2}" ;;
-    stop)           stop "${@:2}" ;;
-    start)          start "${@:2}" ;;
-    restart)        restart ;;
-    recreate)       recreate ;;
-    build)          build "${@:2}" ;;
-    attach)         attach ;;
-    try)            try ;;
-    clean)          clean ;;
-    logs)           logs "${@:2}" ;;
-    ps)             ps ;;
-    config)         config ;;
-    remove)         remove ;;
-    help|-h|--help) help ;;
-    "")
-        echo "❌ No command provided."
-        help
-        ;;
-    *)
-        echo "❌ Unknown command: $1"
-        echo "Type './$SCRIPT_NAME help' for available commands."
-        exit 1
-        ;;
-esac

docs/conf.py

@@ -1,5 +1,4 @@
 import textwrap
-
 # The `extensions` list should already be in here from `sphinx-quickstart`
 extensions = [
     # there may be others here already, e.g. 'sphinx.ext.mathjax'

docs/cpp-api/CMakeLists.txt

@@ -1,15 +1,40 @@
-find_package(Doxygen REQUIRED)
-find_program(
-    SPHINX_EXECUTABLE
-    NAMES sphinx-build
-    REQUIRED
-    DOC "Path to the sphinx-build executable"
-)
+#Look for an executable called sphinx-build
+find_program(SPHINX_EXECUTABLE
+             NAMES sphinx-build
+             DOC "Path to sphinx-build executable")
 
-add_custom_target(
-    cpp_api_docs
-    COMMAND ${SPHINX_EXECUTABLE} -M html . output -W --keep-going
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMENT "Generating the IfcOpenShell C++ API documentation"
-    VERBATIM
-)
+include(FindPackageHandleStandardArgs)
+
+#Handle standard arguments to find_package like REQUIRED and QUIET
+find_package_handle_standard_args(Sphinx
+                                  "Failed to find sphinx-build executable"
+                                  SPHINX_EXECUTABLE)
+
+find_package(Doxygen REQUIRED)
+#find_package(Sphinx REQUIRED)
+
+set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR})
+set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/docs/sphinx)
+
+MESSAGE(STATUS "SPHINX BUILD ${CMAKE_CURRENT_BINARY_DIR}")
+
+file(MAKE_DIRECTORY ./output/doxygen)
+
+if (DOXYGEN_FOUND)
+
+add_custom_target(Sphinx ALL
+                  COMMAND
+                  ${SPHINX_EXECUTABLE} -v -T -b html
+				  ${SPHINX_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/output
+				  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output
+                  COMMENT "Generating documentation with Sphinx")
+					  
+# add_custom_target(ifcopenshell_python_docs ALL
+                  # COMMAND make html
+                  # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
+				  # OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcblenderexport/docs
+                  # COMMENT "Generating documentation with Sphinx")
+	
+else (DOXYGEN_FOUND)
+  message("Doxygen need to be installed to generate the doxygen documentation")
+endif (DOXYGEN_FOUND)

docs/cpp-api/Doxyfile

@@ -68,7 +68,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ./output/doxygen
+OUTPUT_DIRECTORY       = ./output
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
 # sub-directories (in 2 levels) under the output directory of each output format
@@ -852,7 +852,7 @@ WARNINGS               = YES
 # will automatically be disabled.
 # The default value is: YES.
 
-WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as documenting some parameters in
@@ -901,7 +901,7 @@ WARN_IF_UNDOC_ENUM_VAL = NO
 # Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
 # The default value is: NO.
 
-WARN_AS_ERROR          = FAIL_ON_WARNINGS
+WARN_AS_ERROR          = NO
 
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
@@ -944,6 +944,7 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ../../src/ifcgeom \
+                         ../../src/ifcgeom_schema_agnostic \
                          ../../src/ifcparse \
                          ../../src/serializers \
 
@@ -1000,7 +1001,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ../../src/ifcparse/schemas
+EXCLUDE                =
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1024,33 +1025,7 @@ EXCLUDE_PATTERNS       =
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # ANamespace::AClass, ANamespace::*Test
 
-EXCLUDE_SYMBOLS        = "ifcopenshell::geom::opaque_number::*" \
-                         ifcopenshell::entity::attribute_by_name_cmp \
-                         ifcopenshell::impl::rocks_db_file_storage::rocksdb_types_iterator \
-                         ifcopenshell::impl::in_memory_file_storage::type_iterator \
-                         "util::string_buffer::*_item" \
-                         util::string_buffer::item \
-                         ifcopenshell::geom::layer_filter::wildcards_match \
-                         ifcopenshell::paged_file_impl::entry \
-                         ifcopenshell::token \
-                         attribute_value::pointer_type \
-                         INCLUDE_PARENT_PARENT_DIR \
-                         POSTFIX_SCHEMA_ \
-                         POSTFIX_SCHEMA__ \
-                         STRINGIFY_ \
-                         MAKE_INIT_FN_ \
-                         MAKE_INIT_FN__ \
-                         key_from_string \
-                         add_ \
-                         subtract_ \
-                         multiply_ \
-                         divide_ \
-                         equals_ \
-                         less_than_ \
-                         negate_ \
-                         ifcopenshell::geom::utils::create_cube \
-                         ifcopenshell::geom::utils::create_polyhedron \
-                         ifcopenshell::geom::utils::create_nef_polyhedron
+EXCLUDE_SYMBOLS        =
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
@@ -1261,7 +1236,7 @@ IGNORE_PREFIX          =
 # If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
 # The default value is: YES.
 
-GENERATE_HTML          = NO
+GENERATE_HTML          = YES
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1336,7 +1311,7 @@ HTML_STYLESHEET        =
 # documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_STYLESHEET  = assets/doxygen-awesome-css/doxygen-awesome.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -2191,7 +2166,7 @@ MAN_LINKS              = NO
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
-GENERATE_XML           = YES
+GENERATE_XML           = NO
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2328,7 +2303,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = YES
+MACRO_EXPANSION        = NO
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -2336,7 +2311,7 @@ MACRO_EXPANSION        = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_ONLY_PREDEF     = YES
+EXPAND_ONLY_PREDEF     = NO
 
 # If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
@@ -2369,17 +2344,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = IFC_PARSE_API= \
-                         IFC_SCHEMA_API= \
-                         IFC_GEOM_API= \
-                         IFC_GEOMLIBRARY_API= \
-                         IFC_GEOMSERIALIZATION_API= \
-                         SERIALIZERS_API= \
-                         "POSTFIX_SCHEMA(name)=name##_Schema" \
-                         "Handle(name):=opencascade::handle<name>" \
-                         kernel_=kernel \
-                         Simplekernel_=Simplekernel \
-                         inline=
+PREDEFINED             =
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
@@ -2388,22 +2353,7 @@ PREDEFINED             = IFC_PARSE_API= \
 # definition found in the source code.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = kernel_ \
-                         cgal_shape \
-                         cgal_kernel \
-                         cgal_placement \
-                         cgal_point \
-                         cgal_direction \
-                         cgal_vector \
-                         cgal_plane \
-                         cgal_curve \
-                         cgal_wire \
-                         cgal_face \
-                         cgal_polyhedron \
-                         cgal_vertex_descriptor \
-                         cgal_face_descriptor \
-                         create_cube \
-                         create_polyhedron
+EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
@@ -2781,6 +2731,15 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
 # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.

docs/cpp-api/README.md

@@ -1,56 +1,33 @@
 # IfcOpenShell C++ API documentation
 
-This directory contains the Sphinx, Doxygen, Breathe, and Exhale configuration
-for the IfcOpenShell C++ API reference. During a Sphinx build, Exhale runs
-Doxygen, Breathe consumes the generated XML, and Exhale creates the API pages.
-
-## Prerequisites
-
-- Python 3.10 or newer
-- [Doxygen](https://www.doxygen.nl/)
-- [Graphviz](https://graphviz.org/)
-
-Install the Python dependencies from this directory:
-
-```shell
-python -m pip install -r requirements.txt
-```
-
-Both `doxygen` and `dot` must be available on `PATH`. For the standard Windows
-install locations, this can be done for the current PowerShell session with:
-
-```powershell
-$env:Path = "C:\Program Files\doxygen\bin;C:\Program Files\Graphviz\bin;$env:Path"
-```
+This folder contains the setup to build the IfcOpenShell C++ API documentation from the source code.
 
 ## Generating the documentation
 
-From this directory, run:
+> Prerequisites:
+> 
+> Make sure to have [Doxygen](https://www.doxygen.nl) and [Graphviz](https://graphviz.org) installed into your `$PATH` variable.
+> 
+> The documentation also use the [doxygen-awesome](https://jothepro.github.io/doxygen-awesome-css) theme as a git submodule.
+
+Build with the command (from within the `/docs/cpp-api` folder):
 
 ```shell
-python -m sphinx -M html . output -W --keep-going
+$ doxygen
 ```
 
-To include the current Git commit in Doxygen's project metadata, set
-`PROJECT_NUMBER` before building. For example, in PowerShell:
-
-```powershell
-$env:PROJECT_NUMBER = git rev-parse --short HEAD
-python -m sphinx -M html . output -W --keep-going
-```
-
-Or in a POSIX shell:
+To include the current git commit hash into the build documentation, use the following command:
 
 ```shell
-PROJECT_NUMBER=$(git rev-parse --short HEAD) python -m sphinx -M html . output -W --keep-going
+$ PROJECT_NUMBER=$(git rev-parse --short HEAD) doxygen
 ```
 
-Alternatively, configure the main CMake project with
-`-DBUILD_DOCUMENTATION=ON` and build the `cpp_api_docs` target.
+This will extract the current commit hash in short version and sets the propper ENV variable used by doxygen.
 
-The generated documentation is written to `output/html/index.html`. The
-generated Doxygen XML and Exhale sources are kept under `output/` as build
-artifacts.
+The generation of the documentation might take a while depending on your systems hardware, as it is configured to generate the Class graphs using .
 
-The generated headers under `src/ifcparse/schemas` are intentionally excluded
-from this documentation build.
+The resulting documentation is located unter `/cpp-api/output/html` and can be directly accessed with your browser:
+
+```shell
+$ open ./output/html/index.html
+```

docs/cpp-api/conf.py

@@ -1,59 +0,0 @@
-# This file was generated with the assistance of an AI coding tool.
-
-import warnings
-from pathlib import Path
-from shutil import rmtree
-
-from sphinx.deprecation import RemovedInSphinx90Warning
-
-warnings.filterwarnings("ignore", category=RemovedInSphinx90Warning, module=r"exhale\.configs")
-
-generated_directories = (
-    Path(__file__).parent / "output" / "api",
-    Path(__file__).parent / "output" / "doxygen",
-)
-for generated_directory in generated_directories:
-    if generated_directory.is_dir():
-        rmtree(generated_directory)
-
-project = "IfcOpenShell"
-copyright = "2020, IfcOpenShell"
-
-extensions = [
-    "breathe",
-    "exhale",
-]
-
-primary_domain = "cpp"
-highlight_language = "cpp"
-html_theme = "alabaster"
-
-breathe_projects = {
-    "IfcOpenShell": "./output/doxygen/xml",
-}
-breathe_default_project = "IfcOpenShell"
-
-exhale_args = {
-    "containmentFolder": "./output/api",
-    "rootFileName": "library_root.rst",
-    "rootFileTitle": "IfcOpenShell C++ API",
-    "doxygenStripFromPath": "../..",
-    "createTreeView": False,
-    "exhaleExecutesDoxygen": True,
-    "exhaleUseDoxyfile": True,
-}
-
-cpp_id_attributes = [
-    "IFC_PARSE_API",
-    "IFC_SCHEMA_API",
-    "IFC_GEOM_API",
-    "IFC_GEOMLIBRARY_API",
-    "IFC_GEOMSERIALIZATION_API",
-    "SERIALIZERS_API",
-]
-
-exclude_patterns = [
-    "output/doctrees",
-    "output/doxygen",
-    "output/html",
-]

docs/cpp-api/index.rst

@@ -1,9 +0,0 @@
-.. This file was generated with the assistance of an AI coding tool.
-
-IfcOpenShell C++ API
-====================
-
-.. toctree::
-   :maxdepth: 2
-
-   output/api/library_root

docs/cpp-api/requirements.txt

@@ -1,5 +0,0 @@
-# This file was generated with the assistance of an AI coding tool.
-
-Sphinx==8.1.3
-breathe==4.36.0
-exhale==0.3.7

docs/generate_docs.py

@@ -1,10 +1,10 @@
 # This program requires doxygen, sphinx, breathe and exhale.
 
-import multiprocessing
 import os
+import sys
 import shutil
 import subprocess
-import sys
+import multiprocessing
 
 # some extra check to see if we can find sphinx in pypy bin dir
 sphinx_build = os.path.join(os.path.dirname(sys.executable), 'sphinx-build')