Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 09:43:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: fix Build_Summary when more than one targert

Browse Source
This commit is contained in:
Josh Henderson 2021-12-25 00:56:18 -05:00 committed by Andrew Tridgell
parent d8d73eb44c
commit d410533424
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/ardupilotwaf/build_summary.py
View File

@ -218,14 +218,15 @@ def size_summary(bld, nodes):
path = n.path_from(bld.bldnode) path = n.path_from(bld.bldnode)
l.append(dict(binary_path=path)) l.append(dict(binary_path=path))
for d in l:
if bld.env.SIZE: if bld.env.SIZE:
if bld.env.get_flat('SIZE').endswith("xtensa-esp32-elf-size"): if bld.env.get_flat('SIZE').endswith("xtensa-esp32-elf-size"):
cmd = [bld.env.get_flat('SIZE')] + ["-t"] + [d['binary_path'] for d in l] cmd = [bld.env.get_flat('SIZE')] + ["-t"] + [d['binary_path']]
else: else:
cmd = [bld.env.get_flat('SIZE')] + [d['binary_path'] for d in l] cmd = [bld.env.get_flat('SIZE')] + [d['binary_path']]
if bld.env.get_flat('SIZE').endswith("arm-none-eabi-size"): if bld.env.get_flat('SIZE').endswith("arm-none-eabi-size"):
cmd2 = [bld.env.get_flat('SIZE')] + ["-A"] + [d['binary_path'] for d in l] cmd2 = [bld.env.get_flat('SIZE')] + ["-A"] + [d['binary_path']]
out2 = bld.cmd_and_log(cmd2, out2 = bld.cmd_and_log(cmd2,
cwd=bld.bldnode.abspath(), cwd=bld.bldnode.abspath(),
quiet=Context.BOTH, quiet=Context.BOTH,
@ -244,7 +245,7 @@ def size_summary(bld, nodes):
parsed = _parse_size_output(out, out2, False) parsed = _parse_size_output(out, out2, False)
for i, data in enumerate(parsed): for i, data in enumerate(parsed):
try: try:
l[i].update(data) d.update(data)
except: except:
print("build summary debug: "+str(i)+"->"+str(data)) print("build summary debug: "+str(i)+"->"+str(data))