ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6914 from 0xc0170/fix_build_notifier 

build: fix notifier typo and passing to builds API
pull/7116/merge
Cruz Monrreal 2018-06-05 10:59:47 -05:00 committed by GitHub
parent 74aec930e6 9fd52e7beb
commit 4fcaa56b77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/build.py
View File

@ -184,7 +184,7 @@ if __name__ == '__main__':
skipped.append(tt_id) skipped.append(tt_id)
else: else:
try: try:
notify = TerminalNotifer(options.verbose, options.silent) notifier = TerminalNotifier(options.verbose, options.silent)
mcu = TARGET_MAP[target] mcu = TARGET_MAP[target]
profile = extract_profile(parser, options, toolchain) profile = extract_profile(parser, options, toolchain)
if options.source_dir: if options.source_dir:
@ -197,6 +197,7 @@ if __name__ == '__main__':
name=options.artifact_name, name=options.artifact_name,
build_profile=profile, build_profile=profile,
ignore=options.ignore, ignore=options.ignore,
notify = notifier,
) )
else: else:
lib_build_res = build_mbed_libs( lib_build_res = build_mbed_libs(
@ -206,6 +207,7 @@ if __name__ == '__main__':
macros=options.macros, macros=options.macros,
build_profile=profile, build_profile=profile,
ignore=options.ignore, ignore=options.ignore,
notify=notifier,
) )
for lib_id in libraries: for lib_id in libraries:

4
tools/test_api.py
View File

@ -383,7 +383,6 @@ class SingleTestRunner(object):
build_mbed_libs_result = build_mbed_libs( build_mbed_libs_result = build_mbed_libs(
T, toolchain, T, toolchain,
clean=clean_mbed_libs_options, clean=clean_mbed_libs_options,
verbose=self.opts_verbose,
jobs=self.opts_jobs, jobs=self.opts_jobs,
report=build_report, report=build_report,
properties=build_properties, properties=build_properties,
@ -463,7 +462,6 @@ class SingleTestRunner(object):
build_lib(lib_id, build_lib(lib_id,
T, T,
toolchain, toolchain,
verbose=self.opts_verbose,
clean=clean_mbed_libs_options, clean=clean_mbed_libs_options,
jobs=self.opts_jobs, jobs=self.opts_jobs,
report=build_report, report=build_report,
@ -509,7 +507,7 @@ class SingleTestRunner(object):
try: try:
path = build_project(test.source_dir, join(build_dir, test_id), T, path = build_project(test.source_dir, join(build_dir, test_id), T,
toolchain, test.dependencies, clean=clean_project_options, toolchain, test.dependencies, clean=clean_project_options,
verbose=self.opts_verbose, name=project_name, macros=MACROS, name=project_name, macros=MACROS,
inc_dirs=INC_DIRS, jobs=self.opts_jobs, report=build_report, inc_dirs=INC_DIRS, jobs=self.opts_jobs, report=build_report,
properties=build_properties, project_id=test_id, properties=build_properties, project_id=test_id,
project_description=test.get_description(), project_description=test.get_description(),

6
tools/toolchains/__init__.py
View File

@ -731,7 +731,7 @@ class mbedToolchain:
elif ext == self.LINKER_EXT: elif ext == self.LINKER_EXT:
if resources.linker_script is not None: if resources.linker_script is not None:
self.info("Warning: Multiple linker scripts detected: %s -> %s" % (resources.linker_script, file_path)) self.notify.info("Warning: Multiple linker scripts detected: %s -> %s" % (resources.linker_script, file_path))
resources.linker_script = file_path resources.linker_script = file_path
elif ext == '.lib': elif ext == '.lib':
@ -1083,7 +1083,7 @@ class mbedToolchain:
lib = self.STD_LIB_NAME % name lib = self.STD_LIB_NAME % name
fout = join(dir, lib) fout = join(dir, lib)
if self.need_update(fout, objects): if self.need_update(fout, objects):
self.info("Library: %s" % lib) self.notify.info("Library: %s" % lib)
self.archive(objects, fout) self.archive(objects, fout)
needed_update = True needed_update = True
@ -1173,7 +1173,7 @@ class mbedToolchain:
# Parse and decode a map file # Parse and decode a map file
if memap.parse(abspath(map), toolchain) is False: if memap.parse(abspath(map), toolchain) is False:
self.info("Unknown toolchain for memory statistics %s" % toolchain) self.notify.info("Unknown toolchain for memory statistics %s" % toolchain)
return None return None
# Store the memap instance for later use # Store the memap instance for later use