feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fix missing include paths for check tools

Browse Source 
Includes are now split by scopes and imported as a dictionary
This commit is contained in:
Valerii Koval
2020-04-21 19:26:00 +03:00
parent 24c04057e9
commit fd91819b2c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platformio/commands/check/tools/base.py
View File

@ -58,7 +58,7 @@ class CheckToolBase(object): # pylint: disable=too-many-instance-attributes
return return
self.cc_flags = data.get("cc_flags", "").split(" ") self.cc_flags = data.get("cc_flags", "").split(" ")
self.cxx_flags = data.get("cxx_flags", "").split(" ") self.cxx_flags = data.get("cxx_flags", "").split(" ")
self.cpp_includes = data.get("includes", []) self.cpp_includes = self._dump_includes(data.get("includes", {}))
self.cpp_defines = data.get("defines", []) self.cpp_defines = data.get("defines", [])
self.cc_path = data.get("cc_path") self.cc_path = data.get("cc_path")
self.cxx_path = data.get("cxx_path") self.cxx_path = data.get("cxx_path")
@ -91,6 +91,15 @@ class CheckToolBase(object): # pylint: disable=too-many-instance-attributes
return defines return defines
@staticmethod
def _dump_includes(includes_map):
result = []
for includes in includes_map.values():
for include in includes:
if include not in result:
result.append(include)
return result
@staticmethod @staticmethod
def is_flag_set(flag, flags): def is_flag_set(flag, flags):
return any(flag in f for f in flags) return any(flag in f for f in flags)