From 9824c5703cbcbd751641312b91036d097c9def94 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 6 May 2024 13:11:52 +0200 Subject: [PATCH] Update resource directories in Conanfile Resource directories in the Conanfile have been updated to include full resource paths and also preserve the original directory structure when copying. The 'keep_path' option has been set to true to maintain the original path structure during the copying process. Contribute to NP-186 --- conanfile.py | 4 ++-- resources/conanfile.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index d42e63ac6d..221d4ea288 100644 --- a/conanfile.py +++ b/conanfile.py @@ -472,7 +472,7 @@ class CuraConan(ConanFile): rm(self, "conanfile.py", os.path.join(self.package_folder, self.cpp.package.resdirs[0])) cura_resources = self.dependencies["cura_resources"].cpp_info for res_dir in cura_resources.resdirs: - copy(self, "*", res_dir, str(self._share_dir.joinpath("cura", "resources", res_dir))) + copy(self, "*", res_dir, str(self._share_dir.joinpath("cura", "resources", Path(res_dir).name)), keep_path = True) # Copy resources of Uranium (keep folder structure) uranium = self.dependencies["uranium"].cpp_info @@ -529,7 +529,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV rm(self, "conanfile.py", os.path.join(self.package_folder, self.cpp.package.resdirs[0])) cura_resources = self.dependencies["cura_resources"].cpp_info for res_dir in cura_resources.resdirs: - rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], res_dir)) + rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], Path(res_dir).name)) def package_info(self): self.user_info.pip_requirements = "requirements.txt" diff --git a/resources/conanfile.py b/resources/conanfile.py index c33465045e..718f7ef9f5 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -50,6 +50,7 @@ class CuraResource(ConanFile): def layout(self): self.cpp.source.resdirs = ["definitions", "extruders", "images", "intent", "meshes", "quality", "variants"] + self.cpp.package.resdirs = ["res/definitions", "res/extruders", "res/images", "res/intent", "res/meshes", "res/quality", "res/variants"] def package(self): copy(self, "*", os.path.join(self.export_sources_folder),