aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waf: fixed dependency of hwdef.h on hwdef.dat

Browse Source
This commit is contained in:
Andrew Tridgell 2018-06-27 11:02:14 +10:00
parent 7cce23671a
commit 8ae6b2e026
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/ardupilotwaf/chibios.py
View File

@ -296,14 +296,16 @@ def build(bld):
source=bld.path.ant_glob(bld.env.HWDEF), source=bld.path.ant_glob(bld.env.HWDEF),
rule="python '${AP_HAL_ROOT}/hwdef/scripts/chibios_hwdef.py' -D '${BUILDROOT}' %s %s" % (bld.env.HWDEF, bld.env.BOOTLOADER_OPTION), rule="python '${AP_HAL_ROOT}/hwdef/scripts/chibios_hwdef.py' -D '${BUILDROOT}' %s %s" % (bld.env.HWDEF, bld.env.BOOTLOADER_OPTION),
group='dynamic_sources', group='dynamic_sources',
target=['hwdef.h', 'apj.prototype', 'ldscript.ld'] target=[bld.bldnode.find_or_declare('hwdef.h'),
bld.bldnode.find_or_declare('apj.prototype'),
bld.bldnode.find_or_declare('ldscript.ld')]
) )
bld( bld(
# create the file modules/ChibiOS/include_dirs # create the file modules/ChibiOS/include_dirs
rule="touch Makefile && BUILDDIR=${BUILDDIR_REL} CHIBIOS=${CH_ROOT_REL} AP_HAL=${AP_HAL_REL} ${CHIBIOS_BUILD_FLAGS} ${CHIBIOS_BOARD_NAME} ${MAKE} pass -f '${BOARD_MK}'", rule="touch Makefile && BUILDDIR=${BUILDDIR_REL} CHIBIOS=${CH_ROOT_REL} AP_HAL=${AP_HAL_REL} ${CHIBIOS_BUILD_FLAGS} ${CHIBIOS_BOARD_NAME} ${MAKE} pass -f '${BOARD_MK}'",
group='dynamic_sources', group='dynamic_sources',
target='modules/ChibiOS/include_dirs' target=bld.bldnode.find_or_declare('modules/ChibiOS/include_dirs')
) )
common_src = [bld.bldnode.find_or_declare('hwdef.h'), common_src = [bld.bldnode.find_or_declare('hwdef.h'),
@ -318,7 +320,7 @@ def build(bld):
rule="BUILDDIR='${BUILDDIR_REL}' CHIBIOS='${CH_ROOT_REL}' AP_HAL=${AP_HAL_REL} ${CHIBIOS_BUILD_FLAGS} ${CHIBIOS_BOARD_NAME} '${MAKE}' lib -f '${BOARD_MK}'", rule="BUILDDIR='${BUILDDIR_REL}' CHIBIOS='${CH_ROOT_REL}' AP_HAL=${AP_HAL_REL} ${CHIBIOS_BUILD_FLAGS} ${CHIBIOS_BOARD_NAME} '${MAKE}' lib -f '${BOARD_MK}'",
group='dynamic_sources', group='dynamic_sources',
source=common_src, source=common_src,
target='modules/ChibiOS/libch.a' target=bld.bldnode.find_or_declare('modules/ChibiOS/libch.a')
) )
ch_task.name = "ChibiOS_lib" ch_task.name = "ChibiOS_lib"