From 5a89a436d65bd717fd918fdf94a9b4dd1ea5ebf9 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 20 Sep 2023 17:00:19 +0200 Subject: [PATCH 1/5] install bundled gradual plugin next to curaengine exec Contributes CURA-11038 --- .gitignore | 2 ++ conanfile.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8fe6978fe8f..f1a72d342eb 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,5 @@ Ultimaker-Cura.spec /resources/qml/Dialogs/AboutDialogVersionsList.qml /plugins/CuraEngineGradualFlow /resources/bundled_packages/bundled_*.json +curaengine_plugin_gradual_flow +curaengine_plugin_gradual_flow.exe diff --git a/conanfile.py b/conanfile.py index ccb9e6bbc16..e9d153612d3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -311,7 +311,7 @@ def requirements(self): self.requires("curaengine/(latest)@ultimaker/stable") self.requires("pysavitar/5.3.0") self.requires("pynest2d/5.3.0") - self.requires("curaengine_plugin_gradual_flow/(latest)@ultimaker/testing") + self.requires("curaengine_plugin_gradual_flow/(latest)@ultimaker/cura_11038") # FIXME: use latest after merge self.requires("uranium/(latest)@ultimaker/stable") self.requires("cura_binary_data/(latest)@ultimaker/stable") self.requires("cpython/3.10.4") @@ -358,6 +358,7 @@ def generate(self): rmdir(self,str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow"))) curaengine_plugin_gradual_flow = self.dependencies["curaengine_plugin_gradual_flow"].cpp_info copy(self, "*", curaengine_plugin_gradual_flow.resdirs[0], str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow")), keep_path = True) + copy(self, "*", curaengine_plugin_gradual_flow.bindirs[0], self.source_folder, keep_path = False) copy(self, "bundled_*.json", curaengine_plugin_gradual_flow.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) # Copy resources of cura_binary_data From 471490540d89adcfb8368d3c13219c78b2634df2 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 20 Sep 2023 17:17:43 +0200 Subject: [PATCH 2/5] Copy `curaengine_gradual_flow_plugin` exec to correct deploy path Contributes CURA-11038 --- conandata.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conandata.yml b/conandata.yml index 1bdd4f824a3..c5ca663f911 100644 --- a/conandata.yml +++ b/conandata.yml @@ -78,6 +78,11 @@ pyinstaller: src: "bin" dst: "." binary: "CuraEngine" + curaengine_gradual_flow_plugin_service: + package: "curaengine_plugin_gradual_flow" + src: "bin" + dst: "." + binary: "curaengine_plugin_gradual_flow" hiddenimports: - "pySavitar" - "pyArcus" From cc3eb54c1bf7bcb1815093494c5c6e23d7e2f77c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 20 Sep 2023 17:57:47 +0200 Subject: [PATCH 3/5] Skip Finder-prettifying Contributes CURA-11038 --- packaging/MacOS/build_macos.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index eae9afceff7..253b4d824a3 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -22,6 +22,7 @@ def build_dmg(source_path: str, dist_path: str, filename: str, app_name: str) -> "--eula", f"{source_path}/packaging/cura_license.txt", "--background", f"{source_path}/packaging/MacOs/cura_background_dmg.png", "--hdiutil-quiet", + "--skip-jenkins", f"{dist_path}/{filename}", f"{dist_path}/{app_name}"] From 2ad343dd925f1ee5ff7e518aff5c50fd69964e9f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 20 Sep 2023 18:22:01 +0200 Subject: [PATCH 4/5] Revert "Skip Finder-prettifying" This reverts commit cc3eb54c1bf7bcb1815093494c5c6e23d7e2f77c. --- packaging/MacOS/build_macos.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index 253b4d824a3..eae9afceff7 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -22,7 +22,6 @@ def build_dmg(source_path: str, dist_path: str, filename: str, app_name: str) -> "--eula", f"{source_path}/packaging/cura_license.txt", "--background", f"{source_path}/packaging/MacOs/cura_background_dmg.png", "--hdiutil-quiet", - "--skip-jenkins", f"{dist_path}/{filename}", f"{dist_path}/{app_name}"] From 18be6e3c0bfe80bfc3af0df62b632615b3f36875 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Wed, 20 Sep 2023 18:38:58 +0200 Subject: [PATCH 5/5] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index e9d153612d3..1fae6d3a60c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -311,7 +311,7 @@ def requirements(self): self.requires("curaengine/(latest)@ultimaker/stable") self.requires("pysavitar/5.3.0") self.requires("pynest2d/5.3.0") - self.requires("curaengine_plugin_gradual_flow/(latest)@ultimaker/cura_11038") # FIXME: use latest after merge + self.requires("curaengine_plugin_gradual_flow/(latest)@ultimaker/testing") self.requires("uranium/(latest)@ultimaker/stable") self.requires("cura_binary_data/(latest)@ultimaker/stable") self.requires("cpython/3.10.4")