From 521917206cec46d77e562c17a768057bf603ff70 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 9 Nov 2023 11:14:39 +0100 Subject: [PATCH 1/5] build: Add npm for dev-ui --- helper.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helper.mk b/helper.mk index 6487374ba0..22a60d27f0 100755 --- a/helper.mk +++ b/helper.mk @@ -25,8 +25,9 @@ packages+=nlohmann-json3-dev # TODO: remove for offline build packages+=curl wget python3-pip packages+=time +packages+=npm -RUST_VERSION?=1.65.0 +RUST_VERSION?=1.64.0 export PATH := ${HOME}/.cargo/bin:${PATH} zpc_exe?=${build_dir}/applications/zpc/zpc From 4255b03f004533c6ce3161bfe602febb00ec83d6 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 9 Nov 2023 11:25:06 +0100 Subject: [PATCH 2/5] 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 22a60d27f0..7e928b4d74 100755 --- a/helper.mk +++ b/helper.mk @@ -36,7 +36,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 \ From 0a406e7646306384264382cc2d93b690d3ffe1b9 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 9 Nov 2023 13:42:43 +0100 Subject: [PATCH 3/5] build: zpc: Enable supported features Signed-off-by: Philippe Coval --- helper.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/helper.mk b/helper.mk index 7e928b4d74..f50b734dd4 100755 --- a/helper.mk +++ b/helper.mk @@ -34,20 +34,20 @@ zpc_exe?=${build_dir}/applications/zpc/zpc exes+=${zpc_exe} zpc_cmake_options?=\ - -DBUILD_AOXPC=OFF \ - -DBUILD_CPCD=OFF \ + -DBUILD_AOXPC=ON \ + -DBUILD_CPCD=ON \ -DBUILD_DEV_GUI=ON \ - -DBUILD_EMD=OFF \ - -DBUILD_EPC=OFF \ - -DBUILD_GMS=OFF \ - -DBUILD_IMAGE_PROVIDER=OFF \ - -DBUILD_NAL=OFF \ + -DBUILD_EMD=ON \ + -DBUILD_EPC=ON \ + -DBUILD_GMS=ON \ + -DBUILD_IMAGE_PROVIDER=ON \ + -DBUILD_NAL=ON \ -DBUILD_OTBR=OFF \ - -DBUILD_POSITIONING=OFF \ + -DBUILD_POSITIONING=OM \ -DBUILD_TESTING=ON \ - -DBUILD_UPTI_CAP=OFF \ - -DBUILD_UPTI_WRITER=OFF \ - -DBUILD_UPVL=OFF \ + -DBUILD_UPTI_CAP=ON\ + -DBUILD_UPTI_WRITER=ON \ + -DBUILD_UPVL=ON \ -DBUILD_ZIGBEED=OFF \ -DBUILD_ZIGPC=OFF From 30793509469ad58f3ef69d6db7b0f801515a08ad Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 9 Nov 2023 11:09:02 +0100 Subject: [PATCH 4/5] GH-14: Enable testing by default More to be tested Bug-SiliconLabs: UIC-3082 Bug-GitHub: https://github.com/rzr/UnifySDK/issues/3 Origin: https://github.com/rzr/UnifySDK/tree/GH-14/UIC-3082/phcoval/main Forwarded: https://github.com/SiliconLabs/UnifySDK/pulls/rzr Signed-off-by: Philippe Coval --- helper.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper.mk b/helper.mk index f50b734dd4..a5e4bb87b6 100755 --- a/helper.mk +++ b/helper.mk @@ -157,7 +157,7 @@ zpc/build: zpc/configure build zpc/test: ${build_dir}/applications/zpc/components/zwave_command_classes/test/ ctest --test-dir ${<} -zpc/default: zpc/configure zpc/build +zpc/default: zpc/configure zpc/build zpc/test @date -u ### @rootfs is faster than docker for env check From b05859df562f8479803f2633bac6018ff75950be Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 9 Nov 2023 02:39:42 +0100 Subject: [PATCH 5/5] GH-14: build: Test all by default This might be enabled only if needed (eg: rebase branch) Bug-SiliconLabs: UIC-3082 Bug-GitHub: https://github.com/rzr/UnifySDK/issues/3 Origin: https://github.com/rzr/UnifySDK/pull/6 Forwarded: https://github.com/SiliconLabs/UnifySDK/pulls/rzr Signed-off-by: Philippe Coval --- helper.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper.mk b/helper.mk index a5e4bb87b6..d585b69d92 100755 --- a/helper.mk +++ b/helper.mk @@ -3,7 +3,7 @@ # ex: set tabstop=4 noexpandtab: # -*- coding: utf-8 -* -default: help zpc/default +default: help all/default @echo "$@: TODO: Support more than $^ by default" @date -u