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

Disallow building of mbed OS 2 + rtos

pull/4415/head
Jimmy Brisson 2017-05-31 13:08:15 -05:00
parent 07a6c07408
commit d8caee9077
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/build_api.py
View File

@ -478,12 +478,10 @@ def build_project(src_paths, build_path, target, toolchain_name,
src_paths.extend(libraries_paths) src_paths.extend(libraries_paths)
inc_dirs.extend(map(dirname, libraries_paths)) inc_dirs.extend(map(dirname, libraries_paths))
# Build Directory
if clean and exists(build_path): if clean and exists(build_path):
rmtree(build_path) rmtree(build_path)
mkdir(build_path) mkdir(build_path)
# Pass all params to the unified prepare_toolchain()
toolchain = prepare_toolchain( toolchain = prepare_toolchain(
src_paths, build_path, target, toolchain_name, macros=macros, src_paths, build_path, target, toolchain_name, macros=macros,
clean=clean, jobs=jobs, notify=notify, silent=silent, verbose=verbose, clean=clean, jobs=jobs, notify=notify, silent=silent, verbose=verbose,
@ -513,6 +511,10 @@ def build_project(src_paths, build_path, target, toolchain_name,
try: try:
# Call unified scan_resources # Call unified scan_resources
resources = scan_resources(src_paths, toolchain, inc_dirs=inc_dirs) resources = scan_resources(src_paths, toolchain, inc_dirs=inc_dirs)
if (hasattr(toolchain.target, "release_versions") and
"5" not in toolchain.target.release_versions and
"rtos" in toolchain.config.lib_config_data):
raise NotSupportedException("Target does not support mbed OS 5")
# Change linker script if specified # Change linker script if specified
if linker_script is not None: if linker_script is not None:

4
tools/make.py
View File

@ -313,8 +313,8 @@ if __name__ == '__main__':
except KeyboardInterrupt, e: except KeyboardInterrupt, e:
print "\n[CTRL+c] exit" print "\n[CTRL+c] exit"
except NotSupportedException, e: except NotSupportedException as e:
print "\nNot supported for selected target" print "\nCould not compile for %s: %s" % (mcu, str(e))
except Exception,e: except Exception,e:
if options.verbose: if options.verbose:
import traceback import traceback

4
tools/test/build_api/build_api_test.py
View File

@ -131,7 +131,7 @@ class BuildApiTests(unittest.TestCase):
mock_exists.return_value = False mock_exists.return_value = False
mock_prepare_toolchain().link_program.return_value = 1, 2 mock_prepare_toolchain().link_program.return_value = 1, 2
mock_prepare_toolchain().config = namedtuple( mock_prepare_toolchain().config = namedtuple(
"Config", "has_regions name")(None, None) "Config", "has_regions name lib_config_data")(None, None, {})
build_project(self.src_paths, self.build_path, self.target, build_project(self.src_paths, self.build_path, self.target,
self.toolchain_name, app_config=app_config) self.toolchain_name, app_config=app_config)
@ -160,7 +160,7 @@ class BuildApiTests(unittest.TestCase):
# Needed for the unpacking of the returned value # Needed for the unpacking of the returned value
mock_prepare_toolchain().link_program.return_value = 1, 2 mock_prepare_toolchain().link_program.return_value = 1, 2
mock_prepare_toolchain().config = namedtuple( mock_prepare_toolchain().config = namedtuple(
"Config", "has_regions name")(None, None) "Config", "has_regions name lib_config_data")(None, None, {})
build_project(self.src_paths, self.build_path, self.target, build_project(self.src_paths, self.build_path, self.target,
self.toolchain_name) self.toolchain_name)