aboutsummaryrefslogtreecommitdiff
path: root/pw_build
diff options
context:
space:
mode:
authorRob Mohr <mohrr@google.com>2024-02-08 00:15:25 +0000
committerCQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>2024-02-08 00:15:25 +0000
commit36a249c883d7ccb959d637d47ee4249721721719 (patch)
treec0f21fd62f9ba7158442f6c2f334b419a433a9b5 /pw_build
parent9624e0c4a79375372cb2c00a934f6e135447cf43 (diff)
downloadpigweed-36a249c883d7ccb959d637d47ee4249721721719.tar.gz
pw_config_loader: Initial commit
Moved files from pw_cli. Change-Id: If258489cae4f266ea73db40736d283ec2f558512 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/190671 Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com> Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com> Reviewed-by: Anthony DiGirolamo <tonymd@google.com>
Diffstat (limited to 'pw_build')
-rw-r--r--pw_build/generated_pigweed_modules_lists.gni4
-rw-r--r--pw_build/py/BUILD.gn1
-rw-r--r--pw_build/py/pw_build/project_builder_prefs.py2
3 files changed, 6 insertions, 1 deletions
diff --git a/pw_build/generated_pigweed_modules_lists.gni b/pw_build/generated_pigweed_modules_lists.gni
index c5f6a970c..93da311eb 100644
--- a/pw_build/generated_pigweed_modules_lists.gni
+++ b/pw_build/generated_pigweed_modules_lists.gni
@@ -70,6 +70,7 @@ declare_args() {
dir_pw_cli = get_path_info("../pw_cli", "abspath")
dir_pw_compilation_testing =
get_path_info("../pw_compilation_testing", "abspath")
+ dir_pw_config_loader = get_path_info("../pw_config_loader", "abspath")
dir_pw_console = get_path_info("../pw_console", "abspath")
dir_pw_containers = get_path_info("../pw_containers", "abspath")
dir_pw_cpu_exception = get_path_info("../pw_cpu_exception", "abspath")
@@ -244,6 +245,7 @@ declare_args() {
dir_pw_chrono_zephyr,
dir_pw_cli,
dir_pw_compilation_testing,
+ dir_pw_config_loader,
dir_pw_console,
dir_pw_containers,
dir_pw_cpu_exception,
@@ -404,6 +406,7 @@ declare_args() {
"$dir_pw_chrono_zephyr:tests",
"$dir_pw_cli:tests",
"$dir_pw_compilation_testing:tests",
+ "$dir_pw_config_loader:tests",
"$dir_pw_console:tests",
"$dir_pw_containers:tests",
"$dir_pw_cpu_exception:tests",
@@ -564,6 +567,7 @@ declare_args() {
"$dir_pw_chrono_zephyr:docs",
"$dir_pw_cli:docs",
"$dir_pw_compilation_testing:docs",
+ "$dir_pw_config_loader:docs",
"$dir_pw_console:docs",
"$dir_pw_containers:docs",
"$dir_pw_cpu_exception:docs",
diff --git a/pw_build/py/BUILD.gn b/pw_build/py/BUILD.gn
index f9dbe41d0..57babecd9 100644
--- a/pw_build/py/BUILD.gn
+++ b/pw_build/py/BUILD.gn
@@ -80,6 +80,7 @@ pw_python_package("py") {
]
python_deps = [
"$dir_pw_cli/py",
+ "$dir_pw_config_loader/py",
"$dir_pw_env_setup/py",
"$dir_pw_presubmit/py",
]
diff --git a/pw_build/py/pw_build/project_builder_prefs.py b/pw_build/py/pw_build/project_builder_prefs.py
index a13534d9c..12036c687 100644
--- a/pw_build/py/pw_build/project_builder_prefs.py
+++ b/pw_build/py/pw_build/project_builder_prefs.py
@@ -19,7 +19,7 @@ import shlex
from pathlib import Path
from typing import Any, Callable, Dict, List, Tuple, Union
-from pw_cli.toml_config_loader_mixin import YamlConfigLoaderMixin
+from pw_config_loader.toml_config_loader_mixin import YamlConfigLoaderMixin
_DEFAULT_CONFIG: Dict[Any, Any] = {
# Config settings not available as a command line options go here.