Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-07 22:24:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

waf: stricter lua bindings build processing

Browse Source
This commit is contained in:
Andy Piper 2021-10-27 09:06:04 +01:00 committed by Andrew Tridgell
parent 00e4d2ee37
commit 7daa276769
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/ardupilotwaf/ap_library.py
View File

@ -57,6 +57,11 @@ _vehicle_macros = ['SKETCHNAME', 'SKETCH', 'APM_BUILD_DIRECTORY',
'AP_NavEKF3_core.h', 'lua_generated_bindings.h']
_macros_re = re.compile(r'\b(%s)\b' % '|'.join(_vehicle_macros))
# some cpp files are not available at the time we run this check so need to be
# unilaterally added
_vehicle_cpp_need_macros = ['lua_generated_bindings.cpp']
_macros_cpp_re = re.compile(r'\b(%s)\b' % '|'.join(_vehicle_cpp_need_macros))
def _remove_comments(s):
return c_preproc.re_cpp.sub(c_preproc.repl, s)
@ -66,15 +71,10 @@ def _depends_on_vehicle(bld, source_node):
if not bld.env.BUILDROOT:
bld.env.BUILDROOT = bld.bldnode.make_node('').abspath()
if path.startswith(bld.env.BUILDROOT) or path.startswith("build.tmp.binaries/"):
_depends_on_vehicle_cache[path] = False
if path.startswith("build/") or path.startswith(bld.env.BUILDROOT):
# allow vehicle dependend #if in cpp generated in build/
# only scripting bindings currently
if _macros_cpp_re.search(path) is not None:
_depends_on_vehicle_cache[path] = True
if path not in _depends_on_vehicle_cache:
try:
s = _remove_comments(source_node.read())