Skip to content

Commit cfc1aeb

Browse files
XToripuruasirko-soft
authored andcommitted
Add verbose flag to build_examples.py (#37894)
1 parent 9450941 commit cfc1aeb

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

scripts/build/build/__init__.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ class Context:
1919
to generate make/ninja instructions and to compile.
2020
"""
2121

22-
def __init__(self, runner, repository_path: str, output_prefix: str, ninja_jobs: int):
22+
def __init__(self, runner, repository_path: str, output_prefix: str, verbose: bool, ninja_jobs: int):
2323
self.builders = []
2424
self.runner = runner
2525
self.repository_path = repository_path
2626
self.output_prefix = output_prefix
27+
self.verbose = verbose
2728
self.ninja_jobs = ninja_jobs
2829
self.completed_steps = set()
2930

@@ -38,7 +39,8 @@ def SetupBuilders(self, targets: Sequence[str], options: BuilderOptions):
3839
found = False
3940
for choice in BUILD_TARGETS:
4041
builder = choice.Create(target, self.runner, self.repository_path,
41-
self.output_prefix, self.ninja_jobs, options)
42+
self.output_prefix, self.verbose, self.ninja_jobs,
43+
options)
4244
if builder:
4345
self.builders.append(builder)
4446
found = True

scripts/build/build/target.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ def StringIntoTargetParts(self, value: str):
389389
return _StringIntoParts(value, suffix, self.fixed_targets, self.modifiers)
390390

391391
def Create(self, name: str, runner, repository_path: str, output_prefix: str,
392-
ninja_jobs: int, builder_options: BuilderOptions):
392+
verbose: bool, ninja_jobs: int, builder_options: BuilderOptions):
393393

394394
parts = self.StringIntoTargetParts(name)
395395

@@ -406,6 +406,7 @@ def Create(self, name: str, runner, repository_path: str, output_prefix: str,
406406
builder.target = self
407407
builder.identifier = name
408408
builder.output_dir = os.path.join(output_prefix, name)
409+
builder.verbose = verbose
409410
builder.ninja_jobs = ninja_jobs
410411
builder.chip_dir = os.path.abspath(repository_path)
411412
builder.options = builder_options

scripts/build/build_examples.py

+9-2
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ def ValidateTargetNames(context, parameter, values):
7878
default='INFO',
7979
type=click.Choice(__LOG_LEVELS__.keys(), case_sensitive=False),
8080
help='Determines the verbosity of script output.')
81+
@click.option(
82+
'--verbose',
83+
default=False,
84+
is_flag=True,
85+
help='Pass verbose flag to ninja.')
8186
@click.option(
8287
'--target',
8388
default=[],
@@ -142,7 +147,7 @@ def ValidateTargetNames(context, parameter, values):
142147
'Set pigweed command launcher. E.g.: "--pw-command-launcher=ccache" '
143148
'for using ccache when building examples.'))
144149
@click.pass_context
145-
def main(context, log_level, target, enable_link_map_file, repo,
150+
def main(context, log_level, verbose, target, enable_link_map_file, repo,
146151
out_prefix, ninja_jobs, pregen_dir, clean, dry_run, dry_run_output,
147152
enable_flashbundle, no_log_timestamps, pw_command_launcher):
148153
# Ensures somewhat pretty logging of what is going on
@@ -168,7 +173,9 @@ def main(context, log_level, target, enable_link_map_file, repo,
168173
logging.info('Building targets: %s', CommaSeparate(requested_targets))
169174

170175
context.obj = build.Context(
171-
repository_path=repo, output_prefix=out_prefix, ninja_jobs=ninja_jobs, runner=runner)
176+
repository_path=repo, output_prefix=out_prefix, verbose=verbose,
177+
ninja_jobs=ninja_jobs, runner=runner
178+
)
172179
context.obj.SetupBuilders(targets=requested_targets, options=BuilderOptions(
173180
enable_link_map_file=enable_link_map_file,
174181
enable_flashbundle=enable_flashbundle,

scripts/build/builders/gn.py

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ def _build(self):
9595
self.PreBuildCommand()
9696

9797
cmd = ['ninja', '-C', self.output_dir]
98+
if self.verbose:
99+
cmd.append('-v')
98100
if self.ninja_jobs is not None:
99101
cmd.append('-j' + str(self.ninja_jobs))
100102
if self.build_command:

0 commit comments

Comments
 (0)