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

Override default source and include directories for a library via "library.json" manifest using "includeDir" and "srcDir" fields

Browse Source
This commit is contained in:
Ivan Kravets
2019-05-04 13:36:27 +03:00
parent e4dca37874
commit 94e580bf4e
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.rst
View File

@ -9,8 +9,9 @@ PlatformIO 4.0
* Python 3 support
(`issue #895 <https://github.com/platformio/platformio-core/issues/895>`_)
* Include external configuration files with "extra_configs" option
* Include external configuration files with `extra_configs <http://docs.platformio.org/page/projectconf/section_platformio.html#extra-configs>`__ option
(`issue #1590 <https://github.com/platformio/platformio-core/issues/1590>`_)
* Override default source and include directories for a library via `library.json <http://docs.platformio.org/page/librarymanager/config.html>`__ manifest using ``includeDir`` and ``srcDir`` fields
PlatformIO 3.0
--------------
@ -18,7 +19,7 @@ PlatformIO 3.0
3.6.8 (2019-??-??)
~~~~~~~~~~~~~~~~~~
* Fixed "systemd-udevd" warnings in `99-platformio-udev.rules <http://docs.platformio.org/en/latest/faq.html#platformio-udev-rules>`__
* Fixed "systemd-udevd" warnings in `99-platformio-udev.rules <http://docs.platformio.org/page/faq.html#platformio-udev-rules>`__
(`issue #2442 <https://github.com/platformio/platformio-core/issues/2442>`_)
3.6.7 (2019-04-23)

2
docs

Submodule docs updated: 9a51b84742...570187b4af

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

@ -719,6 +719,18 @@ class PlatformIOLibBuilder(LibBuilderBase):
def _is_arduino_manifest(self):
return isfile(join(self.path, "library.properties"))
@property
def include_dir(self):
if "includeDir" in self._manifest.get("build", {}):
return self._manifest.get("build").get("includeDir")
return LibBuilderBase.include_dir.fget(self)
@property
def src_dir(self):
if "srcDir" in self._manifest.get("build", {}):
return self._manifest.get("build").get("srcDir")
return LibBuilderBase.src_dir.fget(self)
@property
def src_filter(self):
if "srcFilter" in self._manifest.get("build", {}):