From 19f43a5268932a8c36e765159079885050350e73 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Mon, 21 Mar 2016 08:56:51 +0100 Subject: [PATCH] uvision exporter - fix - asm does not like string defined macros --- workspace_tools/export/uvision4.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/workspace_tools/export/uvision4.py b/workspace_tools/export/uvision4.py index b3001dda596..619edfbece4 100644 --- a/workspace_tools/export/uvision4.py +++ b/workspace_tools/export/uvision4.py @@ -62,13 +62,15 @@ def generate(self): project_data['tool_specific'] = {} project_data['tool_specific'].update(tool_specific) - # armasm does not like floating numbers in macros, timestamp to int i = 0 for macro in project_data['common']['macros']: + # armasm does not like floating numbers in macros, timestamp to int if macro.startswith('MBED_BUILD_TIMESTAMP'): timestamp = macro[len('MBED_BUILD_TIMESTAMP='):] project_data['common']['macros'][i] = 'MBED_BUILD_TIMESTAMP=' + str(int(float(timestamp))) - break + # armasm does not even accept MACRO=string + if macro.startswith('MBED_USERNAME'): + project_data['common']['macros'].pop(i) i += 1 project_data['common']['macros'].append('__ASSERT_MSG') self.progen_gen_file('uvision', project_data)