platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 18:17:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make "MatchSourceFiles' configurable for source extensions

Browse Source
This commit is contained in:
Ivan Kravets
2022-06-24 21:09:44 +03:00
parent 13fc8508b3
commit dd63c8002a
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,12 +262,11 @@ def StringifyMacro(env, value): # pylint: disable=unused-argument
return '\\"%s\\"' % value.replace('"', '\\\\\\"') return '\\"%s\\"' % value.replace('"', '\\\\\\"')
def MatchSourceFiles(env, src_dir, src_filter=None): def MatchSourceFiles(env, src_dir, src_filter=None, src_exts=None):
src_filter = env.subst(src_filter) if src_filter else None src_filter = env.subst(src_filter) if src_filter else None
src_filter = src_filter or SRC_FILTER_DEFAULT src_filter = src_filter or SRC_FILTER_DEFAULT
return fs.match_src_files( src_exts = src_exts or (SRC_BUILD_EXT + SRC_HEADER_EXT)
env.subst(src_dir), src_filter, SRC_BUILD_EXT + SRC_HEADER_EXT return fs.match_src_files(env.subst(src_dir), src_filter, src_exts)
)
def CollectBuildFiles( def CollectBuildFiles(
@ -280,7 +279,7 @@ def CollectBuildFiles(
if src_dir.endswith(os.sep): if src_dir.endswith(os.sep):
src_dir = src_dir[:-1] src_dir = src_dir[:-1]
for item in env.MatchSourceFiles(src_dir, src_filter): for item in env.MatchSourceFiles(src_dir, src_filter, SRC_BUILD_EXT):
_reldir = os.path.dirname(item) _reldir = os.path.dirname(item)
_src_dir = os.path.join(src_dir, _reldir) if _reldir else src_dir _src_dir = os.path.join(src_dir, _reldir) if _reldir else src_dir
_var_dir = os.path.join(variant_dir, _reldir) if _reldir else variant_dir _var_dir = os.path.join(variant_dir, _reldir) if _reldir else variant_dir
@ -289,8 +288,7 @@ def CollectBuildFiles(
variants.append(_var_dir) variants.append(_var_dir)
env.VariantDir(_var_dir, _src_dir, duplicate) env.VariantDir(_var_dir, _src_dir, duplicate)
if fs.path_endswith_ext(item, SRC_BUILD_EXT): sources.append(env.File(os.path.join(_var_dir, os.path.basename(item))))
sources.append(env.File(os.path.join(_var_dir, os.path.basename(item))))
middlewares = env.get("__PIO_BUILD_MIDDLEWARES") middlewares = env.get("__PIO_BUILD_MIDDLEWARES")
if not middlewares: if not middlewares: