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

Fix handling custom includeDir and srcDir for library.json // Resolve #2518

Browse Source
This commit is contained in:
Ivan Kravets
2019-05-24 01:15:47 +03:00
parent 70a5d32925
commit 9a95b0df56
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ class LibBuilderBase(object):
def get_include_dirs(self): def get_include_dirs(self):
items = [] items = []
include_dir = self.include_dir include_dir = self.include_dir
if include_dir and include_dir not in items: if include_dir:
items.append(include_dir) items.append(include_dir)
items.append(self.src_dir) items.append(self.src_dir)
return items return items
@ -723,13 +723,15 @@ class PlatformIOLibBuilder(LibBuilderBase):
@property @property
def include_dir(self): def include_dir(self):
if "includeDir" in self._manifest.get("build", {}): if "includeDir" in self._manifest.get("build", {}):
return self._manifest.get("build").get("includeDir") with util.cd(self.path):
return realpath(self._manifest.get("build").get("includeDir"))
return LibBuilderBase.include_dir.fget(self) return LibBuilderBase.include_dir.fget(self)
@property @property
def src_dir(self): def src_dir(self):
if "srcDir" in self._manifest.get("build", {}): if "srcDir" in self._manifest.get("build", {}):
return self._manifest.get("build").get("srcDir") with util.cd(self.path):
return realpath(self._manifest.get("build").get("srcDir"))
return LibBuilderBase.src_dir.fget(self) return LibBuilderBase.src_dir.fget(self)
@property @property
@ -804,6 +806,7 @@ class PlatformIOLibBuilder(LibBuilderBase):
for path in self.env.get("CPPPATH", []): for path in self.env.get("CPPPATH", []):
if path not in self.envorigin.get("CPPPATH", []): if path not in self.envorigin.get("CPPPATH", []):
include_dirs.append(self.env.subst(path)) include_dirs.append(self.env.subst(path))
return include_dirs return include_dirs