diff options
| author | 蒙蒙plus <[email protected]> | 2025-07-15 13:33:40 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-07-15 13:33:40 +0800 |
| commit | 53fcd9d08579bd9ac9c2a56f765f50fa9624ca99 (patch) | |
| tree | ff5892466df88363cc3884d541075c01137057c9 | |
| parent | f00b0a4384dfee95d1245800d254f474d034d6b6 (diff) | |
[tools]:修复iar添加宏不完全 (#10507)
[tools]:修复iar添加宏不完全
参考#10456
| -rw-r--r-- | tools/building.py | 4 | ||||
| -rw-r--r-- | tools/targets/iar.py | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tools/building.py b/tools/building.py index 6e26a19e5f..d141797de4 100644 --- a/tools/building.py +++ b/tools/building.py @@ -825,7 +825,7 @@ def GenTargetProject(program = None): if GetOption('target') == 'iar': from targets.iar import IARProject, IARVersion print("IAR Version: " + IARVersion()) - IARProject(GetOption('project-name') + '.ewp', Projects) + IARProject(Env, GetOption('project-name') + '.ewp', Projects) print("IAR project has generated successfully!") if GetOption('target') == 'vs': @@ -934,7 +934,7 @@ def EndBuilding(target, program = None): if not isinstance(project_path, str) or len(project_path) == 0: project_path = os.path.join(BSP_ROOT, 'rt-studio-project') MkDist(program, BSP_ROOT, Rtt_Root, Env, project_name, project_path) - child = subprocess.Popen('scons --target=eclipse --project-name="{}"'.format(project_name), + child = subprocess.Popen('scons --target=eclipse --project-name="{}"'.format(project_name), cwd=project_path, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) stdout, stderr = child.communicate() need_exit = True diff --git a/tools/targets/iar.py b/tools/targets/iar.py index 99223b24ba..39b28728e7 100644 --- a/tools/targets/iar.py +++ b/tools/targets/iar.py @@ -77,7 +77,7 @@ def IARWorkspace(target): out.write(xml) out.close() -def IARProject(target, script): +def IARProject(env, target, script): project_path = os.path.dirname(os.path.abspath(target)) tree = etree.parse('template.ewp') @@ -86,7 +86,7 @@ def IARProject(target, script): out = open(target, 'w') CPPPATH = [] - CPPDEFINES = [] + CPPDEFINES = env.get('CPPDEFINES', []) LOCAL_CPPDEFINES = [] LINKFLAGS = '' CFLAGS = '' @@ -112,9 +112,6 @@ def IARProject(target, script): if 'CPPPATH' in group and group['CPPPATH']: CPPPATH += group['CPPPATH'] - # get each group's definitions - if 'CPPDEFINES' in group and group['CPPDEFINES']: - CPPDEFINES += group['CPPDEFINES'] if 'LOCAL_CPPDEFINES' in group and group['LOCAL_CPPDEFINES']: LOCAL_CPPDEFINES += group['LOCAL_CPPDEFINES'] |