Browse Source

install bundled gradual plugin next to curaengine exec

Contributes CURA-11038
Jelle Spijker 1 year ago
parent
commit
5a89a436d6
2 changed files with 4 additions and 1 deletions
  1. 2 0
      .gitignore
  2. 2 1
      conanfile.py

+ 2 - 0
.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

+ 2 - 1
conanfile.py

@@ -311,7 +311,7 @@ class CuraConan(ConanFile):
         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 @@ class CuraConan(ConanFile):
             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