libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2635 from ericQiang/rtt_dev 

修复scons创建mdk工程时，group组中有多个library的情况下，会重复创建同名group.
This commit is contained in:
Bernard Xiong 2019-04-29 17:43:43 +08:00 committed by GitHub
parent 3ae69adf9e 28e06fe012
commit 8afa24c811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/keil.py
View File

@ -56,6 +56,7 @@ def _get_filetype(fn):
def MDK4AddGroupForFN(ProjectFiles, parent, name, filename, project_path): def MDK4AddGroupForFN(ProjectFiles, parent, name, filename, project_path):
group = SubElement(parent, 'Group') group = SubElement(parent, 'Group')
group.text = name
group_name = SubElement(group, 'GroupName') group_name = SubElement(group, 'GroupName')
group_name.text = name group_name.text = name
@ -244,9 +245,13 @@ def MDK45Project(tree, target, script):
lib_path = full_path lib_path = full_path
if lib_path != '': if lib_path != '':
if (group_tree != None): need_create = 1
MDK4AddLibToGroup(ProjectFiles, group_tree, group['name'], lib_path, project_path) for neighbor in groups.iter('Group'):
else: if neighbor.text == group['name']:
MDK4AddLibToGroup(ProjectFiles, neighbor, group['name'], lib_path, project_path)
need_create = 0
break
if (need_create != 0):
MDK4AddGroupForFN(ProjectFiles, groups, group['name'], lib_path, project_path) MDK4AddGroupForFN(ProjectFiles, groups, group['name'], lib_path, project_path)
# write include path, definitions and link flags # write include path, definitions and link flags