From 8926e27c468839ff36ee79f2c244f2bac4e94ff3 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 30 Jan 2015 23:24:37 +0200 Subject: [PATCH] Fix bug with "ignore_pattern" for BuildLibrary when path contains "examples" --- platformio/builder/tools/platformio.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py index 7bb942b6..731feb73 100644 --- a/platformio/builder/tools/platformio.py +++ b/platformio/builder/tools/platformio.py @@ -56,8 +56,10 @@ def GlobCXXFiles(env, path): return files -def VariantDirRecursive(env, variant_dir, src_dir, duplicate=True): - ignore_pattern = (".git", ".svn", "examples") +def VariantDirRecursive(env, variant_dir, src_dir, duplicate=True, + ignore_pattern=None): + if not ignore_pattern: + ignore_pattern = (".git", ".svn") variants = [] src_dir = env.subst(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): 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( lib.subst(variant_dir), [lib.GlobCXXFiles(vdir) for vdir in vdirs]