From 173c718f77f3c78882c85cce1393a3553930ca35 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 11 Dec 2024 14:18:44 +0100 Subject: [PATCH] Remove unused curator configurations from Conan profiles This commit removes references to unused curator dependencies and options in the `cura_wasm` and `cura_build` profiles. Additionally, it adds specific curator printer settings to `cura_wasm` and replaces options with corresponding `tools.build` configuration in `cura_build` for cleaner and updated profile management. Contribute to NP-637 --- profiles/cura_build.jinja | 5 ++--- profiles/cura_wasm.jinja | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/profiles/cura_build.jinja b/profiles/cura_build.jinja index d5afb9a..031c77d 100644 --- a/profiles/cura_build.jinja +++ b/profiles/cura_build.jinja @@ -4,6 +4,5 @@ include(default) compiler.cppstd=17 curator/*:compiler.cppstd=20 -[options] -curator/*:with_cura_resources=True -curator/*:with_cura_ted_resources=True +[conf] +tools.build:skip_test=True diff --git a/profiles/cura_wasm.jinja b/profiles/cura_wasm.jinja index cebe419..43b179a 100644 --- a/profiles/cura_wasm.jinja +++ b/profiles/cura_wasm.jinja @@ -3,7 +3,6 @@ include(cura.jinja) [tool_requires] emsdk/3.1.65@ultimaker/stable nodejs/20.16.0@ultimaker/stable -curator/[>=0.5.0-beta.1]@ultimaker/np_637 [settings] os=Emscripten @@ -12,10 +11,7 @@ arch=wasm [conf] tools.build:skip_test=True tools.cmake.cmake_layout:build_folder_vars=['settings.os'] -{#{% if os.getenv('CI') == 'true' %}#} -{#user.curator:resource_path="{% os.getenv('GITHUB_WORKSPACE') %}/resources"#} -{#user.curator:fdm_materials_path="{% os.getenv('GITHUB_WORKSPACE') %}/resources"#} -{#{% endif %}#} +user.curator:printers=['ultimaker_sketch','ultimaker_sketch_large','ultimaker_sketch_sprint','ultimaker_method'] [options] curaengine/*:enable_plugins=False