GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:06:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bundle the gradualflow plugin

Browse Source 
Contributes CURA-10466
This commit is contained in:
Jelle Spijker 2023-08-28 15:36:46 +02:00
parent 247025ffc4
commit d7a218b302
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -102,3 +102,4 @@ Ultimaker-Cura.spec
.run/ .run/
/printer-linter/src/printerlinter.egg-info/ /printer-linter/src/printerlinter.egg-info/
/resources/qml/Dialogs/AboutDialogVersionsList.qml /resources/qml/Dialogs/AboutDialogVersionsList.qml
/plugins/CuraEngineGradualFlow

19
conanfile.py
View File

@ -304,6 +304,7 @@ class CuraConan(ConanFile):
self.requires("boost/1.81.0") self.requires("boost/1.81.0")
self.requires("pyarcus/(latest)@ultimaker/cura_10475") self.requires("pyarcus/(latest)@ultimaker/cura_10475")
self.requires("curaengine/(latest)@ultimaker/cura_10446") self.requires("curaengine/(latest)@ultimaker/cura_10446")
self.requires("curaengine_plugin_gradual_flow/(latest)@ultimaker/cura_10951")
self.requires("pysavitar/5.2.2") self.requires("pysavitar/5.2.2")
self.requires("pynest2d/5.2.2") self.requires("pynest2d/5.2.2")
self.requires("uranium/(latest)@ultimaker/cura_10475") self.requires("uranium/(latest)@ultimaker/cura_10475")
@ -395,6 +396,16 @@ class CuraConan(ConanFile):
self.copy("*.pyi", src = "@libdirs", dst = self._site_packages) self.copy("*.pyi", src = "@libdirs", dst = self._site_packages)
self.copy("*.dylib", src = "@libdirs", dst = self._script_dir) self.copy("*.dylib", src = "@libdirs", dst = self._script_dir)
if self.settings.arch == "x86_64" or self.settings.arch == "armv8":
# Copy the external plugins that we want to bundle with Cura
curaengine_plugin_gradual_flow = self.dependencies["curaengine_plugin_gradual_flow"].cpp_info
print(curaengine_plugin_gradual_flow.resdirs)
copy(self, "*.py", curaengine_plugin_gradual_flow.resdirs[0], str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow")), keep_path = True)
copy(self, "*.json", curaengine_plugin_gradual_flow.resdirs[0], str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow")), keep_path = True)
curaengine_plugin_gradual_flow_binary_path = self.source_path.joinpath("plugins", "CuraEngineGradualFlow", {"armv8": "arm64"}.get(str(self.settings.arch), str(self.settings.arch)), {"Macos": "Darwin"}.get(str(self.settings.os), str(self.settings.os)))
copy(self, "curaengine_plugin_gradual_flow.exe", curaengine_plugin_gradual_flow.bindirs[0], curaengine_plugin_gradual_flow_binary_path, keep_path = False)
copy(self, "curaengine_plugin_gradual_flow", curaengine_plugin_gradual_flow.bindirs[0], curaengine_plugin_gradual_flow_binary_path, keep_path = False)
def deploy(self): def deploy(self):
# Copy CuraEngine.exe to bindirs of Virtual Python Environment # Copy CuraEngine.exe to bindirs of Virtual Python Environment
curaengine = self.dependencies["curaengine"].cpp_info curaengine = self.dependencies["curaengine"].cpp_info
@ -476,6 +487,14 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV
icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
if self.settings.arch == "x86_64" or self.settings.arch == "armv8":
# Copy the external plugins that we want to bundle with Cura
curaengine_plugin_gradual_flow = self.dependencies["curaengine_plugin_gradual_flow"].cpp_info
copy(self, "*.py", curaengine_plugin_gradual_flow.resdirs[0], str(self._share_dir.joinpath("cura", "plugins")), keep_path = True)
copy(self, "*.json", curaengine_plugin_gradual_flow.resdirs[0], str(self._share_dir.joinpath("cura", "plugins")), keep_path = True)
curaengine_plugin_gradual_flow_binary_path = self._share_dir.joinpath("cura", "plugins", "CuraEngineGradualFlow", {"armv8": "arm64"}.get(str(self.settings.arch), str(self.settings.arch)), {"Macos": "Darwin"}.get(str(self.settings.os), str(self.settings.os)))
copy(self, "curaengine_plugin_gradual_flow.exe", curaengine_plugin_gradual_flow.bindirs[0], curaengine_plugin_gradual_flow_binary_path, keep_path = False)
copy(self, "curaengine_plugin_gradual_flow", curaengine_plugin_gradual_flow.bindirs[0], curaengine_plugin_gradual_flow_binary_path, keep_path = False)
def package(self): def package(self):
copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0])) copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0]))