AP_Bootloader: libcanard moved to modules/DroneCAN

This commit is contained in:
bugobliterator 2021-11-11 17:47:01 +05:30 committed by Andrew Tridgell
parent 5a70208da2
commit c3be9f9eb3

View File

@ -11,14 +11,14 @@ def build(bld):
flashiface_lib = [] flashiface_lib = []
# build external libcanard library # build external libcanard library
bld.stlib(source='../../modules/libcanard/canard.c', bld.stlib(source='../../modules/DroneCAN/libcanard/canard.c',
target='libcanard') target='libcanard')
bld.ap_program( bld.ap_program(
use=['ap','libcanard','AP_Bootloader_libs'], use=['ap','libcanard','AP_Bootloader_libs'],
program_groups='bootloader', program_groups='bootloader',
includes=[bld.env.SRCROOT + '/modules/libcanard', includes=[bld.env.SRCROOT + '/modules/DroneCAN/libcanard',
bld.env.BUILDROOT + '/modules/libcanard/dsdlc_generated'] bld.env.BUILDROOT + '/modules/DroneCAN/libcanard/dsdlc_generated']
) )
bld.ap_stlib( bld.ap_stlib(
@ -31,7 +31,7 @@ def build(bld):
bld( bld(
# build libcanard headers # build libcanard headers
source=bld.path.ant_glob("modules/DroneCAN/DSDL/**/*.uavcan"), source=bld.path.ant_glob("modules/DroneCAN/DSDL/**/*.uavcan"),
rule="python3 ${SRCROOT}/modules/libcanard/dsdl_compiler/libcanard_dsdlc --header_only --outdir ${BUILDROOT}/modules/libcanard/dsdlc_generated ${SRCROOT}/modules/DroneCAN/DSDL/uavcan ${SRCROOT}/modules/DroneCAN/DSDL/ardupilot ${SRCROOT}/modules/DroneCAN/DSDL/com", rule="python3 ${SRCROOT}/modules/DroneCAN/libcanard/dsdl_compiler/libcanard_dsdlc --header_only --outdir ${BUILDROOT}/modules/DroneCAN/libcanard/dsdlc_generated ${SRCROOT}/modules/DroneCAN/DSDL/uavcan ${SRCROOT}/modules/DroneCAN/DSDL/ardupilot ${SRCROOT}/modules/DroneCAN/DSDL/com",
group='dynamic_sources', group='dynamic_sources',
) )