diff --git a/conandata.yml b/conandata.yml index 0640813146..3a2f90bbe1 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,7 +5,6 @@ requirements: - "curaengine/(latest)@ultimaker/testing" - "cura_binary_data/(latest)@ultimaker/testing" - "fdm_materials/(latest)@ultimaker/testing" - - "curaengine_plugin_gradual_flow/0.1.0-beta.4" - "dulcificum/0.2.1" - "pysavitar/5.3.0" - "pynest2d/5.3.0" @@ -34,14 +33,6 @@ pyinstaller: package: "cura" src: "plugins" dst: "share/cura/plugins" - curaengine_gradual_flow_plugin: - package: "curaengine_plugin_gradual_flow" - src: "res/plugins/CuraEngineGradualFlow" - dst: "share/cura/plugins/CuraEngineGradualFlow" - curaengine_gradual_flow_plugin_bundled: - package: "curaengine_plugin_gradual_flow" - src: "res/bundled_packages" - dst: "share/cura/resources/bundled_packages" native_cad_plugin: package: "native_cad_plugin" src: "res/plugins/NativeCADplugin" @@ -105,11 +96,6 @@ 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" diff --git a/conanfile.py b/conanfile.py index 787c26785f..f21f7b40b8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -390,17 +390,11 @@ class CuraConan(ConanFile): copy(self, "CuraEngine", curaengine.bindirs[0], self.source_folder, keep_path = False) # Copy the external plugins that we want to bundle with Cura - 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) - if self._enterprise: rmdir(self, str(self.source_path.joinpath("plugins", "NativeCADplugin"))) - curaengine_plugin_gradual_flow = self.dependencies["native_cad_plugin"].cpp_info - copy(self, "*", curaengine_plugin_gradual_flow.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True) - copy(self, "bundled_*.json", curaengine_plugin_gradual_flow.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) + native_cad_plugin = self.dependencies["native_cad_plugin"].cpp_info + copy(self, "*", native_cad_plugin.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True) + copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) # Copy resources of cura_binary_data cura_binary_data = self.dependencies["cura_binary_data"].cpp_info @@ -517,8 +511,6 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV copy(self, "requirement*.txt", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.resdirs[-1])) copy(self, "*", src = os.path.join(self.source_folder, "packaging"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[2])) - # Remove the CuraEngineGradualFlow plugin from the package - rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[1], "CuraEngineGradualFlow")) rm(self, "bundled_*.json", os.path.join(self.package_folder, self.cpp.package.resdirs[0], "bundled_packages"), recursive = False) # Remove the fdm_materials from the package