From 8e09d637e7bfa59c35fe6bf4234bd65fa9a4ddb0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 26 Aug 2016 18:52:44 +0300 Subject: [PATCH] Improve compatibility with Arduino 1.0 library format --- platformio/__init__.py | 2 +- platformio/builder/tools/piolib.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index f002cab1..740e93b3 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 0, "0a11") +VERSION = (3, 0, "0a12") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index be761225..e88ea9aa 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -346,21 +346,22 @@ class ArduinoLibBuilder(LibBuilderBase): def get_inc_dirs(self, use_build_dir=False): inc_dirs = LibBuilderBase.get_inc_dirs(self, use_build_dir) - if not isdir(join(self.src_dir, "utility")): + if not isdir(join(self.path, "utility")): return inc_dirs inc_dirs.append( - join(self.build_dir if use_build_dir else self.src_dir, "utility")) + join(self.build_dir if use_build_dir else self.path, "utility")) return inc_dirs @property def src_filter(self): if isdir(join(self.path, "src")): return LibBuilderBase.src_filter.fget(self) - src_filter = [ - "+<*.%s>" % ext - for ext in piotool.SRC_BUILD_EXT + piotool.SRC_HEADER_EXT - ] - src_filter.append("+" % sep) + src_filter = [] + is_utility = isdir(join(self.path, "utility")) + for ext in piotool.SRC_BUILD_EXT + piotool.SRC_HEADER_EXT: + src_filter.append("+<*.%s>" % ext) + if is_utility: + src_filter.append("+" % (sep, ext)) return src_filter def is_framework_compatible(self, framework):