Skip to content

Commit

Permalink
Merge branch 'hotfix/v3.5.5' into develop
Browse files Browse the repository at this point in the history
* hotfix/v3.5.5:
  Fix an issue when "srcFilter" field in "library.json" breaks a library build // Resolve #1735
  Fix "test_lib" test
  • Loading branch information
ivankravets committed Jul 26, 2018
2 parents 89fc77d + 9191ea9 commit c777b00
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
4 changes: 4 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,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
- 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)
~~~~~~~~~~~~~~~~~~

Expand Down
9 changes: 0 additions & 9 deletions platformio/builder/tools/piolib.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,15 +586,6 @@ def load_manifest(self):
def _is_arduino_manifest(self):
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
def src_filter(self):
if "srcFilter" in self._manifest.get("build", {}):
Expand Down

0 comments on commit c777b00

Please sign in to comment.