From 24c4231013fb050c776ec21386dc8fb01bbd5cb5 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Mon, 31 Aug 2026 19:34:13 +0500 Subject: [PATCH] build-all: do not deploy qt runtime As it installs everything to `lib`, making it hard to filter things that are needed just for Python wrapper (e.g. skipping qt libs). Anyway we deploy everything ourselves manually in `package-zip-archives`. --- nix/build-all.py | 1 + nix/package-zip-archives.py | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/nix/build-all.py b/nix/build-all.py index 2d606b1453..eb560977b7 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -1791,6 +1791,7 @@ ifcos_build_args = [ f"-DBUILD_CONVERT={OFF_ON['IfcConvert' in targets]}", f"-DBUILD_BONSAIVIEWER={OFF_ON['BonsaiViewer' in targets]}", "-DUSE_CCACHE=ON", + "-DIFCOPENSHELL_DEPLOY_QT_RUNTIME=OFF", ] ld_library_paths = [ diff --git a/nix/package-zip-archives.py b/nix/package-zip-archives.py index dc44d8ce72..f55f05a0a9 100644 --- a/nix/package-zip-archives.py +++ b/nix/package-zip-archives.py @@ -198,11 +198,6 @@ def stage_qt_runtime_payload(exe_path: Path, dest: Path, qt_dir: Path | None) -> if is_so_file(lib_file): dest_file = dest / lib_file.name qt_lib_files.append(dest_file) - # Currently we install some qt libs to `install/ifcopenshell/lib` too, - # so there's a bit of overlap beteen stage_runtime and stage_qt_runtime, - # hence the skip. - if dest_file.exists(): - continue shutil.copy(lib_file, dest_file, follow_symlinks=False) ensure_soname_links(qt_lib_files) @@ -331,7 +326,6 @@ def package_python_wrapper( for pyc_file in ifcopenshell_dir.rglob("*.pyc"): pyc_file.unlink() - # TODO: packs qt libs also? stage_runtime_payload(ifcopenshell_install_dir, ifcopenshell_dir) for runtime_dir in runtime_dirs: