fuchsia-china/third_party.pigweed.src
1
0
Fork 0
mirror of https://fuchsia.googlesource.com/third_party/pigweed.googlesource.com/pigweed/pigweed synced 2024-09-20 22:00:58 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

python: Move targets into pw_env_setup

Browse Source 
Bug: 325
Change-Id: Ib9eaf2b594e21f12515a8a260fd7eb289b77b53a
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/33822
Commit-Queue: Rob Mohr <mohrr@google.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Armando Montanez <amontanez@google.com>
This commit is contained in:
Rob Mohr 2021-02-24 16:15:51 -08:00
parent db0c6d9ed5
commit 0d644f6a53
4 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
BUILD.gn
View File

@ -44,12 +44,12 @@ group("default") {
":docs",
":fuzzers",
":host",
":python.install",
":python.lint",
":python.tests",
":stm32f429i",
":target_support_packages.lint",
":target_support_packages.tests",
"$dir_pw_env_setup:python.install",
"$dir_pw_env_setup:python.lint",
"$dir_pw_env_setup:python.tests",
"$dir_pw_env_setup:target_support_packages.lint",
"$dir_pw_env_setup:target_support_packages.tests",
]
}
@ -133,44 +133,14 @@ group("fuzzers") {
}
}
# TODO(pwbug/325) Delete this target.
pw_python_group("python") {
python_deps = [
# Python packages
"$dir_pw_allocator/py",
"$dir_pw_arduino_build/py",
"$dir_pw_bloat/py",
"$dir_pw_build/py",
"$dir_pw_cli/py",
"$dir_pw_cpu_exception_cortex_m/py",
"$dir_pw_docgen/py",
"$dir_pw_doctor/py",
"$dir_pw_env_setup/py",
"$dir_pw_hdlc/py",
"$dir_pw_module/py",
"$dir_pw_package/py",
"$dir_pw_presubmit/py",
"$dir_pw_protobuf/py",
"$dir_pw_protobuf_compiler/py",
"$dir_pw_rpc/py",
"$dir_pw_status/py",
"$dir_pw_tokenizer/py",
"$dir_pw_toolchain/py",
"$dir_pw_trace/py",
"$dir_pw_trace_tokenized/py",
"$dir_pw_unit_test/py",
"$dir_pw_watch/py",
# Standalone scripts
"$dir_pw_hdlc/rpc_example:example_script",
]
python_deps = [ "$dir_pw_env_setup:python" ]
}
# Python packages for supporting specific targets.
# TODO(pwbug/325) Delete this target.
pw_python_group("target_support_packages") {
python_deps = [
"$dir_pigweed/targets/lm3s6965evb-qemu/py",
"$dir_pigweed/targets/stm32f429i-disc1/py",
]
python_deps = [ "$dir_pw_env_setup:target_support_packages" ]
}
# By default, Pigweed will build this target when invoking ninja.

2
bootstrap.sh
View File

@ -89,7 +89,7 @@ SETUP_SH="$_PW_ACTUAL_ENVIRONMENT_ROOT/activate.sh"
if [ "$(basename "$_BOOTSTRAP_PATH")" = "bootstrap.sh" ] || \
[ ! -f "$SETUP_SH" ] || \
[ ! -s "$SETUP_SH" ]; then
pw_bootstrap --shell-file "$SETUP_SH" --install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" --use-pigweed-defaults --json-file "$_PW_ACTUAL_ENVIRONMENT_ROOT/actions.json" --virtualenv-gn-out-dir "$PW_ROOT/out" --virtualenv-gn-target "$PW_ROOT#:target_support_packages.install"
pw_bootstrap --shell-file "$SETUP_SH" --install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" --use-pigweed-defaults --json-file "$_PW_ACTUAL_ENVIRONMENT_ROOT/actions.json" --virtualenv-gn-out-dir "$PW_ROOT/out" --virtualenv-gn-target "$PW_ROOT#pw_env_setup:target_support_packages.install"
pw_finalize bootstrap "$SETUP_SH"
else
pw_activate

41
pw_env_setup/BUILD.gn
View File

@ -14,9 +14,50 @@
import("//build_overrides/pigweed.gni")
import("$dir_pw_build/python.gni")
import("$dir_pw_docgen/docs.gni")
pw_doc_group("docs") {
inputs = [ "doc_resources/pw_env_setup_output.png" ]
sources = [ "docs.rst" ]
}
pw_python_group("python") {
python_deps = [
# Python packages
"$dir_pw_allocator/py",
"$dir_pw_arduino_build/py",
"$dir_pw_bloat/py",
"$dir_pw_build/py",
"$dir_pw_cli/py",
"$dir_pw_cpu_exception_cortex_m/py",
"$dir_pw_docgen/py",
"$dir_pw_doctor/py",
"$dir_pw_env_setup/py",
"$dir_pw_hdlc/py",
"$dir_pw_module/py",
"$dir_pw_package/py",
"$dir_pw_presubmit/py",
"$dir_pw_protobuf/py",
"$dir_pw_protobuf_compiler/py",
"$dir_pw_rpc/py",
"$dir_pw_status/py",
"$dir_pw_tokenizer/py",
"$dir_pw_toolchain/py",
"$dir_pw_trace/py",
"$dir_pw_trace_tokenized/py",
"$dir_pw_unit_test/py",
"$dir_pw_watch/py",
# Standalone scripts
"$dir_pw_hdlc/rpc_example:example_script",
]
}
# Python packages for supporting specific targets.
pw_python_group("target_support_packages") {
python_deps = [
"$dir_pigweed/targets/lm3s6965evb-qemu/py",
"$dir_pigweed/targets/stm32f429i-disc1/py",
]
}

2
pw_env_setup/py/pw_env_setup/env_setup.py
View File

@ -220,7 +220,7 @@ class EnvSetup(object):
os.path.join(setup_root, 'cipd_setup', 'luci.json'))
self._virtualenv_gn_targets.append(
virtualenv_setup.GnTarget(
'{}#:python.install'.format(pw_root)))
'{}#pw_env_setup:python.install'.format(pw_root)))
self._cargo_package_file.append(
os.path.join(setup_root, 'cargo_setup', 'packages.txt'))