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

Handle includes from CPPPATH for PlatformIOLibBuilder

Browse Source
This commit is contained in:
Ivan Kravets
2016-07-28 22:15:03 +03:00
parent 3a7032ec9c
commit 34b1f3b0a1
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/__init__.py
View File

@ -14,7 +14,7 @@
import sys import sys
VERSION = (3, 0, "0.dev12") VERSION = (3, 0, "0.dev13")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

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

@ -72,12 +72,13 @@ class LibBuilderFactory(object):
return [] return []
class LibBuilderBase(object): class LibBuilderBase(object): # pylint: disable=too-many-instance-attributes
INC_SCANNER = SCons.Scanner.C.CScanner() INC_SCANNER = SCons.Scanner.C.CScanner()
def __init__(self, env, path): def __init__(self, env, path):
self.env = env.Clone() self.env = env.Clone()
self.envorigin = env.Clone()
self.path = env.subst(path) self.path = env.subst(path)
self._manifest = self.load_manifest() self._manifest = self.load_manifest()
self._is_dependent = False self._is_dependent = False
@ -156,7 +157,10 @@ class LibBuilderBase(object):
self.env.ProcessUnFlags(self.build_unflags) self.env.ProcessUnFlags(self.build_unflags)
self.env.ProcessFlags(self.build_flags) self.env.ProcessFlags(self.build_flags)
if self.extra_script: if self.extra_script:
self.env.SConscript(realpath(self.extra_script), exports="env") self.env.SConscript(
realpath(self.extra_script),
exports={"env": self.env,
"pio_lib_builder": self})
def get_inc_dirs(self, use_build_dir=False): def get_inc_dirs(self, use_build_dir=False):
return [self.build_dir if use_build_dir else self.src_dir] return [self.build_dir if use_build_dir else self.src_dir]
@ -363,8 +367,8 @@ class PlatformIOLibBuilder(LibBuilderBase):
@property @property
def extra_script(self): def extra_script(self):
if "extra_script" in self._manifest.get("build", {}): if "extraScript" in self._manifest.get("build", {}):
return self._manifest.get("build").get("extra_script") return self._manifest.get("build").get("extraScript")
return LibBuilderBase.extra_script.fget(self) return LibBuilderBase.extra_script.fget(self)
@property @property
@ -392,6 +396,14 @@ class PlatformIOLibBuilder(LibBuilderBase):
ilist = [i.strip() for i in ilist.split(",")] ilist = [i.strip() for i in ilist.split(",")]
return item.lower() in [i.lower() for i in ilist] return item.lower() in [i.lower() for i in ilist]
def get_inc_dirs(self, use_build_dir=False):
inc_dirs = LibBuilderBase.get_inc_dirs(self, use_build_dir)
for path in self.env['CPPPATH']:
if path not in self.envorigin['CPPPATH']:
inc_dirs.append(
path if use_build_dir else self.env.subst(path))
return inc_dirs
def GetLibBuilders(env): def GetLibBuilders(env):
items = tuple() items = tuple()