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

Fix bug with "ignore_pattern" for BuildLibrary when path contains "examples"

Browse Source
This commit is contained in:
Ivan Kravets
2015-01-30 23:24:37 +02:00
parent 63870fd825
commit 8926e27c46
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,8 +56,10 @@ def GlobCXXFiles(env, path):
return files return files
def VariantDirRecursive(env, variant_dir, src_dir, duplicate=True): def VariantDirRecursive(env, variant_dir, src_dir, duplicate=True,
ignore_pattern = (".git", ".svn", "examples") ignore_pattern=None):
if not ignore_pattern:
ignore_pattern = (".git", ".svn")
variants = [] variants = []
src_dir = env.subst(src_dir) src_dir = env.subst(src_dir)
for root, _, _ in walk(src_dir): for root, _, _ in walk(src_dir):
@@ -72,7 +74,8 @@ def VariantDirRecursive(env, variant_dir, src_dir, duplicate=True):
def BuildLibrary(env, variant_dir, library_dir): def BuildLibrary(env, variant_dir, library_dir):
lib = env.Clone() lib = env.Clone()
vdirs = lib.VariantDirRecursive(variant_dir, library_dir) vdirs = lib.VariantDirRecursive(
variant_dir, library_dir, ignore_pattern=(".git", ".svn", "examples"))
return lib.Library( return lib.Library(
lib.subst(variant_dir), lib.subst(variant_dir),
[lib.GlobCXXFiles(vdir) for vdir in vdirs] [lib.GlobCXXFiles(vdir) for vdir in vdirs]