platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Parse source files by header name in default LDF mode // Issue #1175

Browse Source
This commit is contained in:
Ivan Kravets
2017-11-26 20:17:38 +02:00
parent 200cbae177
commit 46acad952e
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platformio/builder/tools/piolib.py
View File

@ -88,7 +88,9 @@ class LibBuilderBase(object):
CLASSIC_SCANNER = SCons.Scanner.C.CScanner() CLASSIC_SCANNER = SCons.Scanner.C.CScanner()
ADVANCED_SCANNER = SCons.Scanner.C.CScanner(advanced=True) ADVANCED_SCANNER = SCons.Scanner.C.CScanner(advanced=True)
INC_DIRS_CACHE = None PARSE_SRC_BY_H_NAME = True
_INC_DIRS_CACHE = None
def __init__(self, env, path, manifest=None, verbose=False): def __init__(self, env, path, manifest=None, verbose=False):
self.env = env.Clone() self.env = env.Clone()
@ -313,15 +315,15 @@ class LibBuilderBase(object):
def _get_found_includes(self, search_paths=None): def _get_found_includes(self, search_paths=None):
# all include directories # all include directories
if not LibBuilderBase.INC_DIRS_CACHE: if not LibBuilderBase._INC_DIRS_CACHE:
LibBuilderBase.INC_DIRS_CACHE = [] LibBuilderBase._INC_DIRS_CACHE = []
for lb in self.env.GetLibBuilders(): for lb in self.env.GetLibBuilders():
LibBuilderBase.INC_DIRS_CACHE.extend( LibBuilderBase._INC_DIRS_CACHE.extend(
[self.env.Dir(d) for d in lb.get_inc_dirs()]) [self.env.Dir(d) for d in lb.get_inc_dirs()])
# append self include directories # append self include directories
inc_dirs = [self.env.Dir(d) for d in self.get_inc_dirs()] inc_dirs = [self.env.Dir(d) for d in self.get_inc_dirs()]
inc_dirs.extend(LibBuilderBase.INC_DIRS_CACHE) inc_dirs.extend(LibBuilderBase._INC_DIRS_CACHE)
result = [] result = []
for path in self._validate_search_paths(search_paths): for path in self._validate_search_paths(search_paths):
@ -339,6 +341,8 @@ class LibBuilderBase(object):
incs = [] incs = []
for inc in _incs: for inc in _incs:
incs.append(inc) incs.append(inc)
if not self.PARSE_SRC_BY_H_NAME:
continue
_h_path = inc.get_abspath() _h_path = inc.get_abspath()
if not self.env.IsFileWithExt(_h_path, if not self.env.IsFileWithExt(_h_path,
piotool.SRC_HEADER_EXT): piotool.SRC_HEADER_EXT):
@ -374,7 +378,7 @@ class LibBuilderBase(object):
self._circular_deps.append(lb) self._circular_deps.append(lb)
elif lb not in self._depbuilders: elif lb not in self._depbuilders:
self._depbuilders.append(lb) self._depbuilders.append(lb)
LibBuilderBase.INC_DIRS_CACHE = None LibBuilderBase._INC_DIRS_CACHE = None
lb.search_deps_recursive(search_paths) lb.search_deps_recursive(search_paths)
def search_deps_recursive(self, search_paths=None): def search_deps_recursive(self, search_paths=None):