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

Don't use conandata

Browse Source 
Contribute to NP-186
This commit is contained in:
Jelle Spijker 2024-05-10 11:39:50 +02:00
parent 3d4dd19c33
commit 52cf75ae99
No known key found for this signature in database
GPG Key ID: 0E9129B3096F4E72
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conandata.yml
View File

@ -14,14 +14,6 @@ requirements:
requirements_internal: requirements_internal:
- "fdm_materials/(latest)@internal/testing" - "fdm_materials/(latest)@internal/testing"
- "cura_private_data/(latest)@internal/testing" - "cura_private_data/(latest)@internal/testing"
shared_resources:
- "definitions"
- "extruders"
- "images"
- "intent"
- "meshes"
- "quality"
- "variants"
urls: urls:
default: default:
cloud_api_root: "https://api.ultimaker.com" cloud_api_root: "https://api.ultimaker.com"

11
resources/conanfile.py
View File

@ -18,6 +18,11 @@ class CuraResource(ConanFile):
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
no_copy_source = True no_copy_source = True
@property
def _shared_resources(self):
return ["definitions", "extruders", "images", "intent", "meshes", "quality", "variants"]
def set_version(self): def set_version(self):
if not self.version: if not self.version:
self.version = self.conan_data["version"] self.version = self.conan_data["version"]
@ -30,7 +35,7 @@ class CuraResource(ConanFile):
update_conandata(self, {"version": self.version}) update_conandata(self, {"version": self.version})
def export_sources(self): def export_sources(self):
for shared_resources in self.conan_data["shared_resources"]: for shared_resources in self._shared_resources:
copy(self, pattern="*", src=os.path.join(self.recipe_folder, shared_resources), copy(self, pattern="*", src=os.path.join(self.recipe_folder, shared_resources),
dst=os.path.join(self.export_sources_folder, shared_resources)) dst=os.path.join(self.export_sources_folder, shared_resources))
@ -39,8 +44,8 @@ class CuraResource(ConanFile):
raise ConanInvalidConfiguration("Only versions 5+ are support") raise ConanInvalidConfiguration("Only versions 5+ are support")
def layout(self): def layout(self):
self.cpp.source.resdirs = self.conan_data["shared_resources"] self.cpp.source.resdirs = self._shared_resources
self.cpp.package.resdirs = [f"res/{res}" for res in self.conan_data["shared_resources"]] self.cpp.package.resdirs = [f"res/{res}" for res in self._shared_resources]
def package(self): def package(self):
copy(self, "*", os.path.join(self.export_sources_folder), copy(self, "*", os.path.join(self.export_sources_folder),