commit | f4c30404c7f506c5de94b8a2e97f9cfce3a9dc3d | [log] [tgz] |
---|---|---|
author | Alan Rosenthal <alanrosenthal@pigweed.infra.roller.google.com> | Thu Apr 24 18:36:13 2025 -0700 |
committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | Thu Apr 24 18:36:13 2025 -0700 |
tree | 7217a6655fff5c7f29da1d28effc1013a3982944 | |
parent | fa9476fa27d7da0a43b9dc37b53bda802a0d9490 [diff] |
roll: pigweed pw_build: Extend colors across multiple log lines colorized cmake will start with a color code on one line, and send the color code reset many lines later. This CL updates project_builder.py to save any non-reset color codes and apply them to the follow log lines. Original-Bug: 413077856 Test: colorized cmake logs now look correct Original-Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/285892 Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Original-Revision: 517b964d0349d1f14649d3f1a04c08801f11136e Rolled-Repo: https://pigweed.googlesource.com/pigweed/pigweed Rolled-Commits: 4682f8dd044084..517b964d0349d1 Roll-Count: 1 Roller-URL: https://cr-buildbucket.appspot.com/build/8716657380392687729 GitWatcher: ignore CQ-Do-Not-Cancel-Tryjobs: true Change-Id: I138672c59367ae92d2a82dacede9062d496b0568 Reviewed-on: https://pigweed-review.googlesource.com/c/zephyr/zephyr-bazel/+/286553 Bot-Commit: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com> Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com> Commit-Queue: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com>
The way this repository works is by overlaying itself on top of Zephyr. To get started, first make sure you have Bazel‘s skylib version 1.7.1 or greater. If you don’t have it, you can use:
http_archive( name = "bazel_skylib", sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", urls = [ "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", ], ) load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace()
To grab the zephyr-bazel repo, use a git_repository rule in your WORKSPACE, such as:
git_repository( name = "zephyr-bazel", remote = "https://pigweed.googlesource.com/zephyr/zephyr-bazel" branch = "main", )
Once you have @zephyr-bazel
, we can load the patch rule to generate the Zephyr diff that will augment Zephyr to include the BUILD.zephyr rules.
load("@zephyr-bazel//:setup.bzl", "create_zephyr_patch_file") create_zephyr_patch_file( name = "zephyr-patch", filename = "patch.diff", # This is optional, use it to see what's going on under the hood debug = True, )
We now have a diff file at @zephyr-patch//:patch.diff
. We're ready to load Zephyr.
git_repository( name = "zephyr", remote = "https://github.com/zephyrproject-rtos/zephyr.git", branch = "main", patches = [ "@zephyr-patch//:patch.diff", ], )
The final step will be to load Zephyr's python dependencies:
load("@rules_python//python:pip.bzl", "pip_parse") pip_parse( name = "py_deps", python_interpreter_target = interpreter, requirements_lock = "@@zephyr//:scripts/requirements-base.txt", ) load("@py_deps//:requirements.bzl", zephyr_install_deps = "install_deps") zephyr_install_deps()
In your main application, you can now use the Zephyr utilities for building your app.
load("@zephyr//:defs.bzl", "dts_cc_library") dts_cc_library( name = "app_native_sim_dts", dts_lib = "@zephyr//boards/native/native_sim:native_sim", ) cc_binary( ... deps = [ ... "@zephyr//:zephyr", ] + select({ "@platform//cpu:x86_64": [ ":app_native_sim_dts", "@zephyr//include:posix", ], }), copts = select({ "@platform//cpu:x86_64": [ "-DCONFIG_ARCH_POSIX=1", ], }), )
There is currently just 1 example, you can run it via:
$ cd examples/hello_dts $ bazel run :app
Or, you can run the tests via:
$ cd examples/hello_dts $ bazel test //...