From ad016f43b9ec96fdf463225f714390f5409dc7fa Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Tue, 12 Jun 2018 09:28:43 -0500 Subject: [PATCH] Correct supported check of uvision to include uARM --- tools/export/uvision/__init__.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py index e75a8e07a8..7500edd6e8 100644 --- a/tools/export/uvision/__init__.py +++ b/tools/export/uvision/__init__.py @@ -133,9 +133,16 @@ class Uvision(Exporter): @classmethod def is_target_supported(cls, target_name): target = TARGET_MAP[target_name] - return apply_supported_whitelist( - cls.TOOLCHAIN, cls.POST_BINARY_WHITELIST, target) and\ - DeviceCMSIS.check_supported(target_name) + if not (set(target.supported_toolchains) and set(["ARM", "uARM"])): + return False + if not DeviceCMSIS.check_supported(target_name): + return False + if not hasattr(target, "post_binary_hook"): + return True + if target.post_binary_hook['function'] in cls.POST_BINARY_WHITELIST: + return True + else: + return False #File associations within .uvprojx file file_types = {'.cpp': 8, '.c': 1, '.s': 2,