tools/keil: preserve the order of CPPPATH
The order of CPPPATH is important: some project would use the order of CPPPATH to override the default configuration headers. This commit also refine the this piece of code in a more Pythonic way.
This commit is contained in:
parent
a5119d696c
commit
83f8b52064
|
@ -143,33 +143,20 @@ def MDK4Project(target, script):
|
|||
if lib_path != '':
|
||||
MDK4AddGroupForFN(ProjectFiles, groups, group['name'], lib_path, project_path)
|
||||
|
||||
# remove repeat path
|
||||
paths = set()
|
||||
for path in CPPPATH:
|
||||
inc = _make_path_relative(project_path, os.path.normpath(path))
|
||||
paths.add(inc) #.replace('\\', '/')
|
||||
|
||||
paths = [i for i in paths]
|
||||
paths.sort()
|
||||
CPPPATH = string.join(paths, ';')
|
||||
|
||||
definitions = [i for i in set(CPPDEFINES)]
|
||||
CPPDEFINES = string.join(definitions, ', ')
|
||||
|
||||
# write include path, definitions and link flags
|
||||
IncludePath = tree.find('Targets/Target/TargetOption/TargetArmAds/Cads/VariousControls/IncludePath')
|
||||
IncludePath.text = CPPPATH
|
||||
|
||||
IncludePath.text = ';'.join([_make_path_relative(project_path, os.path.normpath(i)) for i in CPPPATH])
|
||||
|
||||
Define = tree.find('Targets/Target/TargetOption/TargetArmAds/Cads/VariousControls/Define')
|
||||
Define.text = CPPDEFINES
|
||||
Define.text = ', '.join(set(CPPDEFINES))
|
||||
|
||||
Misc = tree.find('Targets/Target/TargetOption/TargetArmAds/LDads/Misc')
|
||||
Misc.text = LINKFLAGS
|
||||
|
||||
|
||||
xml_indent(root)
|
||||
out.write(etree.tostring(root, encoding='utf-8'))
|
||||
out.close()
|
||||
|
||||
|
||||
# copy uvopt file
|
||||
if os.path.exists('template.uvopt'):
|
||||
import shutil
|
||||
|
|
Loading…
Reference in New Issue