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

waf: only generate canard dsdl code at build time

This commit is contained in:
bugobliterator 2021-10-12 16:25:58 +05:30 committed by Andrew Tridgell
parent 8f11c3b3a5
commit 56e3d71b06
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wscript
View File

@ -495,9 +495,6 @@ def configure(cfg):
'SKETCHBOOK="' + cfg.srcnode.abspath() + '"', 'SKETCHBOOK="' + cfg.srcnode.abspath() + '"',
]) ])
if cfg.env.AP_PERIPH:
generate_canard_dsdlc(cfg)
# Always use system extensions # Always use system extensions
cfg.define('_GNU_SOURCE', 1) cfg.define('_GNU_SOURCE', 1)
@ -508,31 +505,21 @@ def configure(cfg):
_collect_autoconfig_files(cfg) _collect_autoconfig_files(cfg)
def generate_canard_dsdlc(cfg, in_configure=True): def generate_canard_dsdlc(cfg):
if in_configure: dsdlc_gen_path = cfg.bldnode.make_node('modules/libcanard/dsdlc_generated').abspath()
dsdlc_gen_path = cfg.bldnode.make_node(os.path.join(cfg.variant, 'modules/libcanard/dsdlc_generated')).abspath()
else:
dsdlc_gen_path = cfg.bldnode.make_node('modules/libcanard/dsdlc_generated').abspath()
src = cfg.srcnode.ant_glob('modules/pyuavcan/uavcan/dsdl_files/* libraries/AP_UAVCAN/dsdl/*', dir=True, src=False) src = cfg.srcnode.ant_glob('modules/pyuavcan/uavcan/dsdl_files/* libraries/AP_UAVCAN/dsdl/*', dir=True, src=False)
src = ' '.join([s.abspath() for s in src]) src = ' '.join([s.abspath() for s in src])
cmd = '{} {} -O {} {}'.format(cfg.env.get_flat('PYTHON'), cmd = '{} {} -O {} {}'.format(cfg.env.get_flat('PYTHON'),
cfg.srcnode.make_node('Tools/canard_dsdlc/canard_dsdlc.py').abspath(), cfg.srcnode.make_node('modules/canard_dsdlc/canard_dsdlc.py').abspath(),
dsdlc_gen_path, dsdlc_gen_path,
src) src)
if in_configure: print("Generating DSDLC for CANARD: " + cmd)
cfg.start_msg('Generating DSDL C bindings')
else:
print("Generating DSDLC for CANARD: " + cmd)
ret = subprocess.run(cmd, shell=True, capture_output=True) ret = subprocess.run(cmd, shell=True, capture_output=True)
if ret.returncode != 0: if ret.returncode != 0:
if in_configure:
cfg.end_msg('failed', color='RED')
print('Failed to run: ', cmd) print('Failed to run: ', cmd)
print(ret.stdout.decode('utf-8')) print(ret.stdout.decode('utf-8'))
print(ret.stderr.decode('utf-8')) print(ret.stderr.decode('utf-8'))
raise RuntimeError('Failed to generate DSDL C bindings') raise RuntimeError('Failed to generate DSDL C bindings')
elif in_configure:
cfg.end_msg('OK')
def collect_dirs_to_recurse(bld, globs, **kw): def collect_dirs_to_recurse(bld, globs, **kw):
dirs = [] dirs = []
@ -743,7 +730,7 @@ def _load_pre_build(bld):
#check if canard dsdlc directory empty #check if canard dsdlc directory empty
# check if directory exists # check if directory exists
if not os.path.exists(dsdlc_gen_path) or not os.listdir(dsdlc_gen_path): if not os.path.exists(dsdlc_gen_path) or not os.listdir(dsdlc_gen_path):
generate_canard_dsdlc(bld, False) generate_canard_dsdlc(bld)
if getattr(brd, 'pre_build', None): if getattr(brd, 'pre_build', None):
brd.pre_build(bld) brd.pre_build(bld)