From 816516e23cf199be26920d2ca6cded6afa7d657d Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Wed, 15 Jan 2020 04:51:45 -0800 Subject: [PATCH] Refactor the code and incorporated the review comment --- tools/build_api.py | 20 ++++++++++---------- tools/toolchains/arm.py | 11 ++--------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/tools/build_api.py b/tools/build_api.py index 52c0da48b4..da1e142669 100755 --- a/tools/build_api.py +++ b/tools/build_api.py @@ -47,7 +47,7 @@ from .targets import TARGET_NAMES, TARGET_MAP, CORE_ARCH, Target from .libraries import Library from .toolchains import TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS from .toolchains.arm import ARMC5_MIGRATION_WARNING -from .toolchains.arm import UARM_TOOLCHAIN_WARNING, UARM_DEFAULT_TOOLCHAIN_WARNING +from .toolchains.arm import UARM_TOOLCHAIN_WARNING from .config import Config RELEASE_VERSIONS = ['2', '5'] @@ -233,11 +233,7 @@ def find_valid_toolchain(target, toolchain): toolchain_names = get_valid_toolchain_names(target, toolchain) last_error = None for index, toolchain_name in enumerate(toolchain_names): - internal_tc_name = get_toolchain_name(target, toolchain_name) - if toolchain_name == "ARMC5": - end_warnings.append(ARMC5_MIGRATION_WARNING) - if target.default_toolchain == "uARM": - end_warnings.append(UARM_DEFAULT_TOOLCHAIN_WARNING) + internal_tc_name = get_toolchain_name(target, toolchain_name) if not TOOLCHAIN_CLASSES[internal_tc_name].check_executable(): search_path = TOOLCHAIN_PATHS[internal_tc_name] or "No path set" last_error = ( @@ -245,10 +241,14 @@ def find_valid_toolchain(target, toolchain): "Currently set search path: {}" ).format(toolchain_name, search_path) else: - if toolchain_name == "uARM": - end_warnings.append(UARM_TOOLCHAIN_WARNING) - elif toolchain_name == "ARMC6" and target.default_toolchain == "uARM": - end_warnings.append(UARM_DEFAULT_TOOLCHAIN_WARNING) + if toolchain_name in ["uARM", "ARMC5", "ARMC6"]: + if toolchain_name == "ARMC5": + end_warnings.append(ARMC5_MIGRATION_WARNING) + if ( + toolchain_name == "uARM" + or target.default_toolchain == "uARM" + ): + end_warnings.append(UARM_TOOLCHAIN_WARNING) return toolchain_name, internal_tc_name, end_warnings else: if last_error: diff --git a/tools/toolchains/arm.py b/tools/toolchains/arm.py index a6d6df55dd..a4d16f688c 100644 --- a/tools/toolchains/arm.py +++ b/tools/toolchains/arm.py @@ -38,15 +38,8 @@ ARMC5_MIGRATION_WARNING = ( ) UARM_TOOLCHAIN_WARNING = ( - "Warning: We noticed that you are using uARM Toolchain. " - "We are deprecating the use of uARM Toolchain. " - "For more information on how to use the ARM toolchain with small C libraries, " - "please visit https://os.mbed.com/docs/mbed-os/latest/reference/using-small-c-libraries.html" -) - -UARM_DEFAULT_TOOLCHAIN_WARNING = ( - "Warning: We noticed that this target default_toolchain overrides --toolchain option with uARM Toolchain. " - "We are deprecating the use of uARM Toolchain. " + "Warning: We noticed that you are using uARM Toolchain either via --toolchain command line or default_toolchain option. " + "We are deprecating the use of the uARM Toolchain. " "For more information on how to use the ARM toolchain with small C libraries, " "please visit https://os.mbed.com/docs/mbed-os/latest/reference/using-small-c-libraries.html" )