diff options
| author | Bernard Xiong <[email protected]> | 2015-04-24 11:43:38 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-04-24 11:48:38 +0800 |
| commit | 1e38f39beab1a38bd9ca923514ac4fe11991759f (patch) | |
| tree | d165891b87f0c6b8206758666649a5abf7721e5b /tools | |
| parent | b6951f64b899b9e66dbc213472f6991dd353d4b6 (diff) | |
[tools] Using object name to decide whether use alias name in Keil MDK.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/keil.py | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/tools/keil.py b/tools/keil.py index 214b3928d4..16fc0d1fc5 100644 --- a/tools/keil.py +++ b/tools/keil.py @@ -221,9 +221,19 @@ def MDK5AddGroupForFN(ProjectFiles, parent, name, filename, project_path): file = SubElement(files, 'File') file_name = SubElement(file, 'FileName') name = os.path.basename(path) - if ProjectFiles.count(name): + + if name.find('.cpp') != -1: + obj_name = name.replace('.cpp', '.o') + elif name.find('.c') != -1: + obj_name = name.replace('.c', '.o') + elif name.find('.s') != -1: + obj_name = name.replace('.s', '.o') + elif name.find('.S') != -1: + obj_name = name.replace('.s', '.o') + + if ProjectFiles.count(obj_name): name = basename + '_' + name - ProjectFiles.append(name) + ProjectFiles.append(obj_name) file_name.text = name.decode(fs_encoding) file_type = SubElement(file, 'FileType') file_type.text = '%d' % _get_filetype(name) @@ -253,9 +263,19 @@ def MDK5AddGroup(ProjectFiles, parent, name, files, project_path): file = SubElement(files, 'File') file_name = SubElement(file, 'FileName') name = os.path.basename(path) - if ProjectFiles.count(name): + + if name.find('.cpp') != -1: + obj_name = name.replace('.cpp', '.o') + elif name.find('.c') != -1: + obj_name = name.replace('.c', '.o') + elif name.find('.s') != -1: + obj_name = name.replace('.s', '.o') + elif name.find('.S') != -1: + obj_name = name.replace('.s', '.o') + + if ProjectFiles.count(obj_name): name = basename + '_' + name - ProjectFiles.append(name) + ProjectFiles.append(obj_name) file_name.text = name.decode(fs_encoding) file_type = SubElement(file, 'FileType') file_type.text = '%d' % _get_filetype(name) |