Merge pull request #61 from 0xc0170/fix_#59

Fixes #59 - build and make - handle toolchain/target name errors
Bogdan Marinescu 2016-04-20 19:16:50 +03:00
commit 0a14cc45c0
2 changed files with 11 additions and 2 deletions

View File

@ -83,7 +83,11 @@ def build_project(src_path, build_path, target, toolchain_name,
""" This function builds project. Project can be for example one test / UT """ This function builds project. Project can be for example one test / UT
""" """
# Toolchain instance # Toolchain instance
toolchain = TOOLCHAIN_CLASSES[toolchain_name](target, options, notify, macros, silent, extra_verbose=extra_verbose) try:
toolchain = TOOLCHAIN_CLASSES[toolchain_name](target, options, notify, macros, silent, extra_verbose=extra_verbose)
except KeyError as e:
raise KeyError("Toolchain %s not supported" % toolchain_name)
toolchain.VERBOSE = verbose toolchain.VERBOSE = verbose
toolchain.jobs = jobs toolchain.jobs = jobs
toolchain.build_all = clean toolchain.build_all = clean

View File

@ -240,7 +240,12 @@ if __name__ == '__main__':
if options.build_dir is not None: if options.build_dir is not None:
build_dir = options.build_dir build_dir = options.build_dir
target = TARGET_MAP[mcu] try:
target = TARGET_MAP[mcu]
except KeyError:
print "[ERROR] Target %s not supported" % mcu
sys.exit(1)
try: try:
bin_file = build_project(test.source_dir, build_dir, target, toolchain, test.dependencies, options.options, bin_file = build_project(test.source_dir, build_dir, target, toolchain, test.dependencies, options.options,
linker_script=options.linker_script, linker_script=options.linker_script,