From 68a41ddb5c27078bdc2be40030fc61fee8dd8386 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 2 Oct 2024 04:31:43 +0200 Subject: [PATCH 1/4] Update emsdk dependency and add version constraint Changed the emsdk version to a more specific range to ensure compatibility. Included reference for future adjustments post-merge of the related pull request. Contribute to NP-346 --- profiles/cura_wasm.jinja | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/profiles/cura_wasm.jinja b/profiles/cura_wasm.jinja index fe4c0ad..f5bbbd7 100644 --- a/profiles/cura_wasm.jinja +++ b/profiles/cura_wasm.jinja @@ -1,7 +1,8 @@ include(cura.jinja) [tool_requires] -emsdk/3.1.50 +# change to main once merged https://github.com/Ultimaker/conan-ultimaker-index/pull/14 +emsdk/[>=3.1.65]@ultimaker/np_346 [settings] os=Emscripten @@ -12,4 +13,4 @@ tools.build:skip_test=True [options] curaengine:enable_plugins=False -curaengine:enable_arcus=False \ No newline at end of file +curaengine:enable_arcus=False From 4c07cf2a3cd108451951a8c1c2691f76b74e2102 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 2 Oct 2024 05:07:04 +0200 Subject: [PATCH 2/4] Specify nodejes This will override the nodejs used by emsdk with our `fixed` version Contribute to NP-346 --- profiles/cura_wasm.jinja | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/cura_wasm.jinja b/profiles/cura_wasm.jinja index f5bbbd7..8ce8df8 100644 --- a/profiles/cura_wasm.jinja +++ b/profiles/cura_wasm.jinja @@ -3,6 +3,7 @@ include(cura.jinja) [tool_requires] # change to main once merged https://github.com/Ultimaker/conan-ultimaker-index/pull/14 emsdk/[>=3.1.65]@ultimaker/np_346 +nodejs/[>=20.16.0]@ultimaker/np_346 [settings] os=Emscripten From 53d71fd9169acaba381e6f951d8ced5aae6d1e8e Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 10 Oct 2024 11:24:51 +0200 Subject: [PATCH 3/4] rename cura_settings to curator Contribute to NP-419 --- profiles/cura.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/cura.jinja b/profiles/cura.jinja index 073d99d..a6407da 100644 --- a/profiles/cura.jinja +++ b/profiles/cura.jinja @@ -12,7 +12,7 @@ curaengine_grpc_definitions:compiler.cppstd=20 scripta:compiler.cppstd=20 umspatial*:compiler.cppstd=20 dulcificum:compiler.cppstd=20 -cura_settings:compiler.cppstd=20 +curator:compiler.cppstd=20 {% if compiler == 'gcc' %}compiler.libcxx=libstdc++11 {% elif compiler == 'apple-clang' %}compiler.libcxx=libc++ From 929a2ad3b18967811c95c95dc9d6afeb9cb48c21 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 18 Nov 2024 09:29:15 +0100 Subject: [PATCH 4/4] Update tool requirements to use stable versions Changed the emsdk and nodejs dependencies from NP-419 to stable. This ensures that the configuration pulls from the stable version repository for more reliable builds. Contribute to NP-419 --- profiles/cura_wasm.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/cura_wasm.jinja b/profiles/cura_wasm.jinja index 8ce8df8..2e4a05b 100644 --- a/profiles/cura_wasm.jinja +++ b/profiles/cura_wasm.jinja @@ -2,8 +2,8 @@ include(cura.jinja) [tool_requires] # change to main once merged https://github.com/Ultimaker/conan-ultimaker-index/pull/14 -emsdk/[>=3.1.65]@ultimaker/np_346 -nodejs/[>=20.16.0]@ultimaker/np_346 +emsdk/[>=3.1.65]@ultimaker/stable +nodejs/[>=20.16.0]@ultimaker/stable [settings] os=Emscripten