From 04c3889a566801d97aa23ae52502d9cceda8a33b Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Tue, 8 Oct 2024 11:27:57 +0200 Subject: [PATCH 1/3] dev_gui: Prefer system yarnpkg over yarn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also align to distro stable version: 1.22.19+~cs24.27.18-2+deb12u1 Currently there is no backport of recent version, so let´s align to debian https://tracker.debian.org/pkg/node-yarnpkg Signed-off-by: Philippe Coval --- applications/dev_ui/dev_gui/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/dev_ui/dev_gui/CMakeLists.txt b/applications/dev_ui/dev_gui/CMakeLists.txt index 34fa5defb0..b6624d4de2 100644 --- a/applications/dev_ui/dev_gui/CMakeLists.txt +++ b/applications/dev_ui/dev_gui/CMakeLists.txt @@ -1,5 +1,5 @@ # Developer GUI install -find_program(YARN_EXECUTABLE "yarn" REQUIRED) +find_program(YARN_EXECUTABLE "yarnpkg" "yarn" REQUIRED) if(APPLE) set(NPM_TARGET macos-x64) @@ -27,7 +27,7 @@ add_custom_command( COMMAND cp -r ${ZAP_CURRENT_OUTPUT_DIR}/. . COMMAND ${YARN_EXECUTABLE} version --no-git-tag-version --new-version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV} - COMMAND ${YARN_EXECUTABLE} install --allow-same-version + COMMAND ${YARN_EXECUTABLE} install COMMAND ${YARN_EXECUTABLE} run build USES_TERMINAL) From 8a3537bb06ed0b7b07e4929eb56dd67eaa3caebd Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 9 Nov 2023 11:14:39 +0100 Subject: [PATCH 2/3] build: Add npm for dev-ui Relate-to: https://github.com/Z-Wave-Alliance/z-wave-stack/wiki/ZPC --- helper.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/helper.mk b/helper.mk index 7eb3d4435c..aa85bc6f06 100755 --- a/helper.mk +++ b/helper.mk @@ -25,6 +25,7 @@ packages+=nlohmann-json3-dev # TODO: remove for offline build packages+=curl wget python3-pip packages+=time +packages+=yarnpkg rust_url?=https://sh.rustup.rs RUST_VERSION?=1.65.0 From a6d7afdeea5dd92006cff5111f2f6d10d8bdf1d7 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 9 Nov 2023 11:25:06 +0100 Subject: [PATCH 3/3] build: Build devui for zpc Signed-off-by: Philippe Coval --- helper.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper.mk b/helper.mk index aa85bc6f06..0d52b54acc 100755 --- a/helper.mk +++ b/helper.mk @@ -37,7 +37,7 @@ exes+=${zpc_exe} zpc_cmake_options?=\ -DBUILD_AOXPC=OFF \ -DBUILD_CPCD=OFF \ - -DBUILD_DEV_GUI=OFF \ + -DBUILD_DEV_GUI=ON \ -DBUILD_EMD=OFF \ -DBUILD_EPC=OFF \ -DBUILD_GMS=OFF \