Skip to content

Commit

Permalink
Do not include enterprise resources if not needed
Browse files Browse the repository at this point in the history
  • Loading branch information
wawanbreton committed Nov 14, 2024
1 parent 85cd142 commit 3910ab0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@ pyinstaller:
package: "native_cad_plugin"
src: "res/plugins/NativeCADplugin"
dst: "share/cura/plugins/NativeCADplugin"
enterprise_only: true
native_cad_plugin_bundled:
package: "native_cad_plugin"
src: "res/bundled_packages"
dst: "share/cura/resources/bundled_packages"
enterprise_only: true
cura_resources:
package: "cura"
src: "resources"
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, e
pyinstaller_metadata = self.conan_data["pyinstaller"]
datas = []
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

if "oses" in data and self.settings.os not in data["oses"]:
Expand Down

0 comments on commit 3910ab0

Please sign in to comment.