Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

waf: support building headers from uavcan_vendor_specific_types directory

Browse Source
This commit is contained in:
Jonathan Challinger 2018-07-10 14:14:12 -07:00 committed by Randy Mackay
parent 67fcd773a6
commit fea82dc360
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tools/ardupilotwaf/uavcangen.py
View File

@ -21,11 +21,10 @@ class uavcangen(Task.Task):
out = self.env.get_flat('OUTPUT_DIR') out = self.env.get_flat('OUTPUT_DIR')
src = self.env.get_flat('SRC') src = self.env.get_flat('SRC')
dsdlc = self.env.get_flat("DSDL_COMPILER") dsdlc = self.env.get_flat("DSDL_COMPILER")
input_dir = os.path.dirname(self.inputs[0].abspath())
ret = self.exec_command(['{}'.format(python), ret = self.exec_command(['{}'.format(python),
'{}'.format(dsdlc), '{}'.format(dsdlc),
'{}'.format(input_dir), '-O{}'.format(out)] + [x.abspath() for x in self.inputs])
'-O{}'.format(out)])
if ret != 0: if ret != 0:
# ignore if there was a signal to the interpreter rather # ignore if there was a signal to the interpreter rather

2
wscript
View File

@ -512,7 +512,7 @@ def _build_dynamic_sources(bld):
if bld.get_board().with_uavcan or bld.env.HAL_WITH_UAVCAN==True: if bld.get_board().with_uavcan or bld.env.HAL_WITH_UAVCAN==True:
bld( bld(
features='uavcangen', features='uavcangen',
source=bld.srcnode.ant_glob('modules/uavcan/dsdl/uavcan/**/*.uavcan'), source=bld.srcnode.ant_glob('modules/uavcan/dsdl/* uavcan_vendor_specific_types/*', dir=True, src=False),
output_dir='modules/uavcan/libuavcan/include/dsdlc_generated', output_dir='modules/uavcan/libuavcan/include/dsdlc_generated',
name='uavcan', name='uavcan',
export_includes=[ export_includes=[