Browse Source

waf: support building headers from uavcan_vendor_specific_types directory

master
Jonathan Challinger 7 years ago committed by Randy Mackay
parent
commit
fea82dc360
  1. 5
      Tools/ardupilotwaf/uavcangen.py
  2. 2
      wscript

5
Tools/ardupilotwaf/uavcangen.py

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

2
wscript

@ -512,7 +512,7 @@ def _build_dynamic_sources(bld): @@ -512,7 +512,7 @@ def _build_dynamic_sources(bld):
if bld.get_board().with_uavcan or bld.env.HAL_WITH_UAVCAN==True:
bld(
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',
name='uavcan',
export_includes=[

Loading…
Cancel
Save