From 52824c487272e5f28e9ac0f7b126aca19008b5de Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 29 Oct 2024 13:18:04 +0100 Subject: [PATCH] Build: Make pseudo-code into something that should work for all OS's. part of CURA-12229 --- conandata.yml | 18 ++++++++++++------ conanfile.py | 7 ++++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/conandata.yml b/conandata.yml index b3a71a4b50..735e1ce9e0 100644 --- a/conandata.yml +++ b/conandata.yml @@ -125,12 +125,18 @@ pyinstaller: Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" blacklist: - - "libassimp.so" - - "PyQt6/Qt6/qml/QtQuick3D" # directory - - "libqtquick3deffectplugin.so" - - "libqtquick3dphysicshelpersplugin.so" - - "libqtquick3dparticleeffectsplugin.so" - - "etc......." + - [ "assimp" ] + - [ "qt", "charts" ] + - [ "qt", "coap" ] + - [ "qt", "data", "vis" ] + - [ "qt", "lab", "animat" ] + - [ "qt", "mqtt" ] + - [ "qt", "net", "auth" ] + - [ "qt", "quick3d" ] + - [ "qt", "timeline" ] + - [ "qt", "virt", "key" ] + - [ "qt", "wayland", "compos" ] + - [ "qt", "5", "compat" ] pycharm_targets: - jinja_path: .run_templates/pycharm_cura_run.run.xml.jinja module_name: Cura diff --git a/conanfile.py b/conanfile.py index be515c876d..9461ba6c1d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -283,7 +283,12 @@ class CuraConan(ConanFile): # filter all binary files in binaries on the blacklist blacklist = pyinstaller_metadata["blacklist"] - filtered_binaries = [b for b in binaries if b not in blacklist] + filtered_binaries = [b for b in binaries if any([all([(part in b) for part in parts]) for parts in blacklist])] + + # TEMP: print to make sure -- remove this before merge + print("specifically don't include:") + print(set(binaries) - set(filtered_binaries)) + print("=== === ===") with open(os.path.join(location, "UltiMaker-Cura.spec"), "w") as f: f.write(pyinstaller.render(