Skip to content

Commit 4fcaa56

Browse files
author
Cruz Monrreal
authored
Merge pull request #6914 from 0xc0170/fix_build_notifier
build: fix notifier typo and passing to builds API
2 parents 74aec93 + 9fd52e7 commit 4fcaa56

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

tools/build.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
skipped.append(tt_id)
185185
else:
186186
try:
187-
notify = TerminalNotifer(options.verbose, options.silent)
187+
notifier = TerminalNotifier(options.verbose, options.silent)
188188
mcu = TARGET_MAP[target]
189189
profile = extract_profile(parser, options, toolchain)
190190
if options.source_dir:
@@ -197,6 +197,7 @@
197197
name=options.artifact_name,
198198
build_profile=profile,
199199
ignore=options.ignore,
200+
notify = notifier,
200201
)
201202
else:
202203
lib_build_res = build_mbed_libs(
@@ -206,6 +207,7 @@
206207
macros=options.macros,
207208
build_profile=profile,
208209
ignore=options.ignore,
210+
notify=notifier,
209211
)
210212

211213
for lib_id in libraries:

tools/test_api.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,6 @@ def execute_thread_slice(self, q, target, toolchains, clean, test_ids, build_rep
383383
build_mbed_libs_result = build_mbed_libs(
384384
T, toolchain,
385385
clean=clean_mbed_libs_options,
386-
verbose=self.opts_verbose,
387386
jobs=self.opts_jobs,
388387
report=build_report,
389388
properties=build_properties,
@@ -463,7 +462,6 @@ def execute_thread_slice(self, q, target, toolchains, clean, test_ids, build_rep
463462
build_lib(lib_id,
464463
T,
465464
toolchain,
466-
verbose=self.opts_verbose,
467465
clean=clean_mbed_libs_options,
468466
jobs=self.opts_jobs,
469467
report=build_report,
@@ -509,7 +507,7 @@ def execute_thread_slice(self, q, target, toolchains, clean, test_ids, build_rep
509507
try:
510508
path = build_project(test.source_dir, join(build_dir, test_id), T,
511509
toolchain, test.dependencies, clean=clean_project_options,
512-
verbose=self.opts_verbose, name=project_name, macros=MACROS,
510+
name=project_name, macros=MACROS,
513511
inc_dirs=INC_DIRS, jobs=self.opts_jobs, report=build_report,
514512
properties=build_properties, project_id=test_id,
515513
project_description=test.get_description(),

tools/toolchains/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ def _add_file(self, file_path, resources, base_path, exclude_paths=None):
731731

732732
elif ext == self.LINKER_EXT:
733733
if resources.linker_script is not None:
734-
self.info("Warning: Multiple linker scripts detected: %s -> %s" % (resources.linker_script, file_path))
734+
self.notify.info("Warning: Multiple linker scripts detected: %s -> %s" % (resources.linker_script, file_path))
735735
resources.linker_script = file_path
736736

737737
elif ext == '.lib':
@@ -1083,7 +1083,7 @@ def build_library(self, objects, dir, name):
10831083
lib = self.STD_LIB_NAME % name
10841084
fout = join(dir, lib)
10851085
if self.need_update(fout, objects):
1086-
self.info("Library: %s" % lib)
1086+
self.notify.info("Library: %s" % lib)
10871087
self.archive(objects, fout)
10881088
needed_update = True
10891089

@@ -1173,7 +1173,7 @@ def mem_stats(self, map):
11731173

11741174
# Parse and decode a map file
11751175
if memap.parse(abspath(map), toolchain) is False:
1176-
self.info("Unknown toolchain for memory statistics %s" % toolchain)
1176+
self.notify.info("Unknown toolchain for memory statistics %s" % toolchain)
11771177
return None
11781178

11791179
# Store the memap instance for later use

0 commit comments

Comments
 (0)