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 #2166 from theotherjimmy/prevent-traceback-during-export 

Preventing a traceback when a library is not built during export
pull/2196/merge
Sam Grove 2016-07-21 22:09:52 -05:00 committed by GitHub
parent e6d4b84197 684644b1b1
commit 702707dee7
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/project.py
View File

@ -134,14 +134,19 @@ if __name__ == '__main__':
for mcu in options.mcu: for mcu in options.mcu:
# Program Number or name # Program Number or name
p, src, ide = options.program, options.source_dir, options.ide p, src, ide = options.program, options.source_dir, options.ide
project_dir, project_name, project_temp = setup_project(mcu, ide, p, src, options.build) try:
project_dir, project_name, project_temp = setup_project(mcu, ide, p, src, options.build)
zip = not bool(src) # create zip when no src_dir provided
clean = not bool(src) # don't clean when source is provided, use acrual source tree for IDE files
zip = not bool(src) # create zip when no src_dir provided # Export to selected toolchain
clean = not bool(src) # don't clean when source is provided, use acrual source tree for IDE files lib_symbols = get_lib_symbols(options.macros, src, p)
tmp_path, report = export(project_dir, project_name, ide, mcu, project_dir[0], project_temp, clean=clean, make_zip=zip, extra_symbols=lib_symbols, sources_relative=sources_relative)
# Export to selected toolchain except OSError as e:
lib_symbols = get_lib_symbols(options.macros, src, p) if e.errno == 2:
tmp_path, report = export(project_dir, project_name, ide, mcu, project_dir[0], project_temp, clean=clean, make_zip=zip, extra_symbols=lib_symbols, sources_relative=sources_relative) report = dict(success=False, errormsg="Library path '%s' does not exist. Ensure that the library is built." % (e.filename))
else:
report = dict(success=False, errormsg="An OS error occured: errno #{}".format(e.errno))
if report['success']: if report['success']:
if not zip: if not zip:
zip_path = join(project_temp, project_name) zip_path = join(project_temp, project_name)