3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Do not include enterprise resources if not needed

Browse source
This commit is contained in:
Erwan MATHIEU 2024-11-14 15:04:39 +01:00
parent 85cd142266
commit 3910ab0b78
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conandata.yml
View file

@ -41,10 +41,12 @@ pyinstaller:
package: "native_cad_plugin" package: "native_cad_plugin"
src: "res/plugins/NativeCADplugin" src: "res/plugins/NativeCADplugin"
dst: "share/cura/plugins/NativeCADplugin" dst: "share/cura/plugins/NativeCADplugin"
enterprise_only: true
native_cad_plugin_bundled: native_cad_plugin_bundled:
package: "native_cad_plugin" package: "native_cad_plugin"
src: "res/bundled_packages" src: "res/bundled_packages"
dst: "share/cura/resources/bundled_packages" dst: "share/cura/resources/bundled_packages"
enterprise_only: true
cura_resources: cura_resources:
package: "cura" package: "cura"
src: "resources" src: "resources"

2
conanfile.py
View file

@ -194,7 +194,7 @@ class CuraConan(ConanFile):
pyinstaller_metadata = self.conan_data["pyinstaller"] pyinstaller_metadata = self.conan_data["pyinstaller"]
datas = [] datas = []
for data in pyinstaller_metadata["datas"].values(): for data in pyinstaller_metadata["datas"].values():
if not self.options.internal and data.get("internal", False): if (not self.options.internal and data.get("internal", False)) or (not self.options.enterprise and data.get("enterprise_only", False)):
continue continue
if "oses" in data and self.settings.os not in data["oses"]: if "oses" in data and self.settings.os not in data["oses"]: