3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

install bundled gradual plugin next to curaengine exec

Browse source 
Contributes CURA-11038
This commit is contained in:
Jelle Spijker 2023-09-20 17:00:19 +02:00
parent 4551cb3f5f
commit 5a89a436d6
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -104,3 +104,5 @@ Ultimaker-Cura.spec
/resources/qml/Dialogs/AboutDialogVersionsList.qml /resources/qml/Dialogs/AboutDialogVersionsList.qml
/plugins/CuraEngineGradualFlow /plugins/CuraEngineGradualFlow
/resources/bundled_packages/bundled_*.json /resources/bundled_packages/bundled_*.json
curaengine_plugin_gradual_flow
curaengine_plugin_gradual_flow.exe

3
conanfile.py
View file

@ -311,7 +311,7 @@ class CuraConan(ConanFile):
self.requires("curaengine/(latest)@ultimaker/stable") self.requires("curaengine/(latest)@ultimaker/stable")
self.requires("pysavitar/5.3.0") self.requires("pysavitar/5.3.0")
self.requires("pynest2d/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("uranium/(latest)@ultimaker/stable")
self.requires("cura_binary_data/(latest)@ultimaker/stable") self.requires("cura_binary_data/(latest)@ultimaker/stable")
self.requires("cpython/3.10.4") self.requires("cpython/3.10.4")
@ -358,6 +358,7 @@ class CuraConan(ConanFile):
rmdir(self,str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow"))) rmdir(self,str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow")))
curaengine_plugin_gradual_flow = self.dependencies["curaengine_plugin_gradual_flow"].cpp_info 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.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(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 # Copy resources of cura_binary_data