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

Generate “SRC_FILTER” on-the-fly for a custom library

Browse Source
This commit is contained in:
Ivan Kravets
2017-04-14 23:16:52 +03:00
parent d16fd73b05
commit c7249aadf3
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs

Submodule docs updated: 9cae82ca3a...310c542680

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

@ -100,6 +100,9 @@ class LibBuilderBase(object):
self._circular_deps = list() self._circular_deps = list()
self._scanned_paths = list() self._scanned_paths = list()
# reset source filter, could be overridden with extra script
self.env['SRC_FILTER'] = ""
# process extra options and append to build environment # process extra options and append to build environment
self.process_extra_options() self.process_extra_options()
@ -225,6 +228,7 @@ class LibBuilderBase(object):
self.env.ProcessUnFlags(self.build_unflags) self.env.ProcessUnFlags(self.build_unflags)
self.env.ProcessFlags(self.build_flags) self.env.ProcessFlags(self.build_flags)
if self.extra_script: if self.extra_script:
self.env.SConscriptChdir(1)
self.env.SConscript( self.env.SConscript(
realpath(self.extra_script), realpath(self.extra_script),
exports={"env": self.env, exports={"env": self.env,
@ -513,6 +517,8 @@ class PlatformIOLibBuilder(LibBuilderBase):
def src_filter(self): def src_filter(self):
if "srcFilter" in self._manifest.get("build", {}): if "srcFilter" in self._manifest.get("build", {}):
return self._manifest.get("build").get("srcFilter") return self._manifest.get("build").get("srcFilter")
elif self.env['SRC_FILTER']:
return self.env['SRC_FILTER']
elif self._is_arduino_manifest(): elif self._is_arduino_manifest():
return ArduinoLibBuilder.src_filter.fget(self) return ArduinoLibBuilder.src_filter.fget(self)
return LibBuilderBase.src_filter.fget(self) return LibBuilderBase.src_filter.fget(self)