summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2015-04-24 11:43:38 +0800
committerBernard Xiong <[email protected]>2015-04-24 11:48:26 +0800
commitb6951f64b899b9e66dbc213472f6991dd353d4b6 (patch)
tree475e75cde46f39be6f51d87272222b8c9691e341 /tools
parent6459839f287996424dae870fd00fe499d8693530 (diff)
[tools] Using object name to decide whether use alias name in Keil MDK.
Diffstat (limited to 'tools')
-rw-r--r--tools/keil.py28
1 files changed, 24 insertions, 4 deletions
diff --git a/tools/keil.py b/tools/keil.py
index 9d6b14b81a..214b3928d4 100644
--- a/tools/keil.py
+++ b/tools/keil.py
@@ -66,9 +66,19 @@ def MDK4AddGroupForFN(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)
@@ -98,9 +108,19 @@ def MDK4AddGroup(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)