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 an issue when "srcFilter" field in "library.json" breaks a library build // Resolve #1735

Browse Source
This commit is contained in:
Ivan Kravets
2018-07-27 01:27:05 +03:00
parent fedf3162f1
commit 9191ea97fe
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY.rst
View File

@ -13,6 +13,10 @@ PlatformIO 3.0
- Force building of project source code using `test_build_project_src <http://docs.platformio.org/page/projectconf/section_env_test.html#test_build_project_src>`__ option - Force building of project source code using `test_build_project_src <http://docs.platformio.org/page/projectconf/section_env_test.html#test_build_project_src>`__ option
- Fixed missed ``UNIT_TEST`` macro for unit test components/libraries - Fixed missed ``UNIT_TEST`` macro for unit test components/libraries
* Fixed an issue when ``srcFilter`` field in `library.json <http://docs.platformio.org/page/librarymanager/config.html>`__
breaks a library build
(`issue #1735 <https://github.com/platformio/platformio-core/issues/1735>`_)
3.5.4 (2018-07-03) 3.5.4 (2018-07-03)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

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

@ -586,15 +586,6 @@ class PlatformIOLibBuilder(LibBuilderBase):
def _is_arduino_manifest(self): def _is_arduino_manifest(self):
return isfile(join(self.path, "library.properties")) return isfile(join(self.path, "library.properties"))
@property
def src_dir(self):
if all([
"srcFilter" in self._manifest.get("build", {})
or self.env['SRC_FILTER'], not self._is_arduino_manifest()
]):
return self.path
return LibBuilderBase.src_dir.fget(self)
@property @property
def src_filter(self): def src_filter(self):
if "srcFilter" in self._manifest.get("build", {}): if "srcFilter" in self._manifest.get("build", {}):