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

Fixed an issue when Library Dependency Finder (LDF) ignores custom "libLDFMode" and "libCompatMode" options in library.json

Browse Source
This commit is contained in:
Ivan Kravets
2020-02-14 22:57:51 +02:00
parent 6556c37e58
commit 5cc9a328ab
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY.rst
View File

@ -13,6 +13,7 @@ PlatformIO Core 4
* Improved support of PIO Home on card-sized PC (Raspberry Pi, etc.) (`issue #3313 <https://github.com/platformio/platformio-core/issues/3313>`_) * Improved support of PIO Home on card-sized PC (Raspberry Pi, etc.) (`issue #3313 <https://github.com/platformio/platformio-core/issues/3313>`_)
* Froze "marshmallow" dependency to 2.X for Python 2 (`issue #3380 <https://github.com/platformio/platformio-core/issues/3380>`_) * Froze "marshmallow" dependency to 2.X for Python 2 (`issue #3380 <https://github.com/platformio/platformio-core/issues/3380>`_)
* Fixed "TypeError: unsupported operand type(s)" when system environment variable is used by project configuration parser (`issue #3377 <https://github.com/platformio/platformio-core/issues/3377>`_) * Fixed "TypeError: unsupported operand type(s)" when system environment variable is used by project configuration parser (`issue #3377 <https://github.com/platformio/platformio-core/issues/3377>`_)
* Fixed an issue when Library Dependency Finder (LDF) ignores custom "libLDFMode" and "libCompatMode" options in `library.json <http://docs.platformio.org/page/librarymanager/config.html>`__
4.2.0 (2020-02-12) 4.2.0 (2020-02-12)

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

@ -727,22 +727,16 @@ class PlatformIOLibBuilder(LibBuilderBase):
@property @property
def lib_ldf_mode(self): def lib_ldf_mode(self):
return self.validate_ldf_mode( return self.validate_ldf_mode(
self.env.GetProjectOption( self._manifest.get("build", {}).get(
"lib_ldf_mode", "libLDFMode", LibBuilderBase.lib_ldf_mode.fget(self)
self._manifest.get("build", {}).get(
"libLDFMode", LibBuilderBase.lib_ldf_mode.fget(self)
),
) )
) )
@property @property
def lib_compat_mode(self): def lib_compat_mode(self):
return self.validate_compat_mode( return self.validate_compat_mode(
self.env.GetProjectOption( self._manifest.get("build", {}).get(
"lib_compat_mode", "libCompatMode", LibBuilderBase.lib_compat_mode.fget(self)
self._manifest.get("build", {}).get(
"libCompatMode", LibBuilderBase.lib_compat_mode.fget(self)
),
) )
) )