Build: Make pseudo-code into something that should work for all OS's.

part of CURA-12229
This commit is contained in:
Remco Burema 2024-10-29 13:18:04 +01:00
parent 5dd6700031
commit 52824c4872
2 changed files with 18 additions and 7 deletions

View File

@ -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

View File

@ -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(