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

waf: fix build issue on cygwin after changes for external flash

Browse Source
This commit is contained in:
bugobliterator 2021-09-06 08:40:59 +05:30 committed by Andrew Tridgell
parent 8a5ade1f46
commit 948a0012c5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Tools/ardupilotwaf/chibios.py
View File

@ -60,7 +60,7 @@ class upload_fw(Task.Task):
if 'AP_OVERRIDE_UPLOAD_CMD' in os.environ: if 'AP_OVERRIDE_UPLOAD_CMD' in os.environ:
cmd = "{} '{}'".format(os.environ['AP_OVERRIDE_UPLOAD_CMD'], src.abspath()) cmd = "{} '{}'".format(os.environ['AP_OVERRIDE_UPLOAD_CMD'], src.abspath())
else: else:
cmd = "{} '{}/uploader.py' '{}'".format(self.env.get_flat('PYTHON'), upload_tools, src) cmd = "{} '{}/uploader.py' '{}'".format(self.env.get_flat('PYTHON'), upload_tools, src.abspath())
if upload_port is not None: if upload_port is not None:
cmd += " '--port' '%s'" % upload_port cmd += " '--port' '%s'" % upload_port
return self.exec_command(cmd) return self.exec_command(cmd)
@ -106,14 +106,14 @@ class generate_bin(Task.Task):
return ret return ret
return ret return ret
else: else:
cmd = "{} -O binary {} {}".format(self.env.get_flat('OBJCOPY'), self.inputs[0], self.outputs[0]) cmd = [self.env.get_flat('OBJCOPY'), '-O', 'binary', self.inputs[0].relpath(), self.outputs[0].relpath()]
self.exec_command(cmd) self.exec_command(cmd)
'''list sections and split into two binaries based on section's location in internal, external or in ram''' '''list sections and split into two binaries based on section's location in internal, external or in ram'''
def split_sections(self): def split_sections(self):
# get a list of sections # get a list of sections
cmd = "{} -A -x {}".format(self.env.get_flat('SIZE'), self.inputs[0]) cmd = "'{}' -A -x {}".format(self.env.get_flat('SIZE'), self.inputs[0].relpath())
out = self.generator.bld.cmd_and_log(cmd, quiet=Context.BOTH) out = self.generator.bld.cmd_and_log(cmd, quiet=Context.BOTH, cwd=self.env.get_flat('BUILDROOT'))
extf_sections = [] extf_sections = []
intf_sections = [] intf_sections = []
is_text_in_extf = False is_text_in_extf = False
@ -153,16 +153,16 @@ class generate_bin(Task.Task):
Logs.error("Couldn't find .text section") Logs.error("Couldn't find .text section")
# create intf binary # create intf binary
if len(intf_sections): if len(intf_sections):
cmd = "{} {} -O binary {} {}".format(self.env.get_flat('OBJCOPY'), cmd = "'{}' {} -O binary {} {}".format(self.env.get_flat('OBJCOPY'),
' '.join(intf_sections), self.inputs[0], self.outputs[0]) ' '.join(intf_sections), self.inputs[0].relpath(), self.outputs[0].relpath())
else: else:
cmd = "cp /dev/null {}".format(self.outputs[0]) cmd = "cp /dev/null {}".format(self.outputs[0].relpath())
ret = self.exec_command(cmd) ret = self.exec_command(cmd)
if (ret < 0): if (ret < 0):
return ret return ret
# create extf binary # create extf binary
cmd = "{} {} -O binary {} {}".format(self.env.get_flat('OBJCOPY'), cmd = "'{}' {} -O binary {} {}".format(self.env.get_flat('OBJCOPY'),
' '.join(extf_sections), self.inputs[0], self.outputs[1]) ' '.join(extf_sections), self.inputs[0].relpath(), self.outputs[1].relpath())
return self.exec_command(cmd) return self.exec_command(cmd)
def __str__(self): def __str__(self):