Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: ardupilotwaf: chibios: hand apj tool an absolute path to parameters 

Any waf build specifying an --out which is not at the same level as the default "build" will fail without this
This commit is contained in:
Peter Barker 2018-03-20 20:25:12 +11:00
parent e02f753b01
commit edd0f74ec0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/ardupilotwaf/chibios.py
View File

@ -65,10 +65,16 @@ class upload_fw(Task.Task):
class set_default_parameters(Task.Task): class set_default_parameters(Task.Task):
color='CYAN' color='CYAN'
run_str='python ${APJ_TOOL} --set-file ${DEFAULT_PARAMETERS} ${SRC}'
always_run = True always_run = True
def keyword(self): def keyword(self):
return "apj_tool" return "apj_tool"
def run(self):
rel_default_parameters = self.env.get_flat('DEFAULT_PARAMETERS')
abs_default_parameters = os.path.join(self.env.STANDARD_BUILDDIR,
rel_default_parameters)
run_str = ("python ${APJ_TOOL} --set-file %s ${SRC}" %
(abs_default_parameters,))
class generate_fw(Task.Task): class generate_fw(Task.Task):
color='CYAN' color='CYAN'
@ -188,6 +194,7 @@ def configure(cfg):
env.TOOLS_SCRIPTS = srcpath('Tools/scripts') env.TOOLS_SCRIPTS = srcpath('Tools/scripts')
env.APJ_TOOL = srcpath('Tools/scripts/apj_tool.py') env.APJ_TOOL = srcpath('Tools/scripts/apj_tool.py')
env.SERIAL_PORT = srcpath('/dev/serial/by-id/*_STLink*') env.SERIAL_PORT = srcpath('/dev/serial/by-id/*_STLink*')
env.STANDARD_BUILDDIR = srcpath("build/some-board")
# relative paths to pass to make, relative to directory that make is run from # relative paths to pass to make, relative to directory that make is run from
env.CH_ROOT_REL = os.path.relpath(env.CH_ROOT, env.BUILDROOT) env.CH_ROOT_REL = os.path.relpath(env.CH_ROOT, env.BUILDROOT)