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

[tool][cdk.py] scons的CDK工具宏定义改用分号作分隔符，并支持LIBS (#7610)

This commit is contained in:
shiwa 2023-06-09 08:59:32 +08:00 committed by GitHub
parent 3a7546671a
commit f4294c6abc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/cdk.py
View File

@ -63,6 +63,7 @@ def _CDKProject(tree, target, script):
CPPDEFINES = [] CPPDEFINES = []
LINKFLAGS = '' LINKFLAGS = ''
CCFLAGS = '' CCFLAGS = ''
LIBS = []
ProjectFiles = [] ProjectFiles = []
for child in root: for child in root:
@ -101,6 +102,8 @@ def _CDKProject(tree, target, script):
LINKFLAGS += group['LINKFLAGS'] LINKFLAGS += group['LINKFLAGS']
# todo: cdk add lib # todo: cdk add lib
if 'LIBS' in group and group['LIBS']:
LIBS += group['LIBS']
# write include path, definitions and link flags # write include path, definitions and link flags
text = ';'.join([_make_path_relative(project_path, os.path.normpath(i)) for i in CPPPATH]) text = ';'.join([_make_path_relative(project_path, os.path.normpath(i)) for i in CPPPATH])
@ -110,7 +113,7 @@ def _CDKProject(tree, target, script):
IncludePath.text = text IncludePath.text = text
Define = tree.find('BuildConfigs/BuildConfig/Compiler/Define') Define = tree.find('BuildConfigs/BuildConfig/Compiler/Define')
Define.text = ', '.join(set(CPPDEFINES)) Define.text = '; '.join(set(CPPDEFINES))
CC_Misc = tree.find('BuildConfigs/BuildConfig/Compiler/OtherFlags') CC_Misc = tree.find('BuildConfigs/BuildConfig/Compiler/OtherFlags')
CC_Misc.text = CCFLAGS CC_Misc.text = CCFLAGS
@ -118,6 +121,12 @@ def _CDKProject(tree, target, script):
LK_Misc = tree.find('BuildConfigs/BuildConfig/Linker/OtherFlags') LK_Misc = tree.find('BuildConfigs/BuildConfig/Linker/OtherFlags')
LK_Misc.text = LINKFLAGS LK_Misc.text = LINKFLAGS
LibName = tree.find('BuildConfigs/BuildConfig/Linker/LibName')
if LibName.text:
LibName.text=LibName.text+';'+';'.join(LIBS)
else:
LibName.text=';'.join(LIBS)
xml_indent(root) xml_indent(root)
out.write(etree.tostring(root, encoding='utf-8')) out.write(etree.tostring(root, encoding='utf-8'))
out.close() out.close()