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

waf: configure compileCommands json based on the configured board

This commit is contained in:
bugobliterator 2021-09-17 20:52:16 +05:30 committed by Andrew Tridgell
parent f33d6c4ec1
commit b8749b776a
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Tools/ardupilotwaf/boards.py
View File

@ -9,7 +9,7 @@ import fnmatch
import waflib import waflib
from waflib import Utils from waflib import Utils
from waflib.Configure import conf from waflib.Configure import conf
import json
_board_classes = {} _board_classes = {}
_board = None _board = None
@ -113,6 +113,15 @@ class Board:
cfg.env.prepend_value('INCLUDES', [ cfg.env.prepend_value('INCLUDES', [
cfg.srcnode.find_dir('libraries/AP_Common/missing').abspath() cfg.srcnode.find_dir('libraries/AP_Common/missing').abspath()
]) ])
if os.path.exists(os.path.join(env.SRCROOT, '.vscode/c_cpp_properties.json')):
# change c_cpp_properties.json configure the VSCode Intellisense env
c_cpp_properties = json.load(open(os.path.join(env.SRCROOT, '.vscode/c_cpp_properties.json')))
for config in c_cpp_properties['configurations']:
config['compileCommands'] = "${workspaceFolder}/build/%s/compile_commands.json" % self.get_name()
json.dump(c_cpp_properties, open(os.path.join(env.SRCROOT, './.vscode/c_cpp_properties.json'), 'w'), indent=4)
cfg.msg("Configured VSCode Intellisense", 'yes')
else:
cfg.msg("Configured VSCode Intellisense:", 'no', color='YELLOW')
def cc_version_gte(self, cfg, want_major, want_minor): def cc_version_gte(self, cfg, want_major, want_minor):
(major, minor, patchlevel) = cfg.env.CC_VERSION (major, minor, patchlevel) = cfg.env.CC_VERSION
@ -596,6 +605,9 @@ class sitl(Board):
'-fno-slp-vectorize' # compiler bug when trying to use SLP '-fno-slp-vectorize' # compiler bug when trying to use SLP
] ]
def get_name(self):
return self.__class__.__name__
class sitl_periph_gps(sitl): class sitl_periph_gps(sitl):
def configure_env(self, cfg, env): def configure_env(self, cfg, env):
cfg.env.AP_PERIPH = 1 cfg.env.AP_PERIPH = 1
@ -824,6 +836,9 @@ class chibios(Board):
fun(bld) fun(bld)
super(chibios, self).pre_build(bld) super(chibios, self).pre_build(bld)
def get_name(self):
return self.name
class linux(Board): class linux(Board):
def configure_env(self, cfg, env): def configure_env(self, cfg, env):
super(linux, self).configure_env(cfg, env) super(linux, self).configure_env(cfg, env)
@ -865,6 +880,11 @@ class linux(Board):
# Avoid infinite recursion # Avoid infinite recursion
bld.options.upload = False bld.options.upload = False
def get_name(self):
# get name of class
return self.__class__.__name__
class navigator(linux): class navigator(linux):
toolchain = 'arm-linux-gnueabihf' toolchain = 'arm-linux-gnueabihf'