From 28e06fe01278e2dc5053cdc2fe72aac5dd84bdfa Mon Sep 17 00:00:00 2001 From: ericQiang Date: Mon, 29 Apr 2019 14:33:31 +0800 Subject: [bug fix]:scons创建mdk工程时，group组中有多个library的情况下，会重复创建同名group.修改Tools/keil.py中的函数MDK45Project，若group已经创建，则直接添加子节点。 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/keil.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/keil.py b/tools/keil.py index 59da254430..b096917a42 100644 --- a/tools/keil.py +++ b/tools/keil.py @@ -56,6 +56,7 @@ def _get_filetype(fn): def MDK4AddGroupForFN(ProjectFiles, parent, name, filename, project_path): group = SubElement(parent, 'Group') + group.text = name group_name = SubElement(group, 'GroupName') group_name.text = name @@ -244,9 +245,13 @@ def MDK45Project(tree, target, script): lib_path = full_path if lib_path != '': - if (group_tree != None): - MDK4AddLibToGroup(ProjectFiles, group_tree, group['name'], lib_path, project_path) - else: + need_create = 1 + for neighbor in groups.iter('Group'): + 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) # write include path, definitions and link flags -- cgit v1.3.1