Skip to content

Protocol/z wave/feature/user credential cc #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: GH-43/UIC-3222
Choose a base branch
from
Open

Protocol/z wave/feature/user credential cc #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59d5c00
dev_gui: Prefer system yarnpkg over yarn
rzr Oct 8, 2024
1db1f65
build: Add npm for dev-ui
rzr Nov 9, 2023
ec1b9cb
build: Build devui for zpc
rzr Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions applications/dev_ui/dev_gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion helper.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,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 \
Expand Down