From df83d90c064469925c7b546879176edd29a7ed0e Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 8 Oct 2021 14:58:41 +0300 Subject: [PATCH] Handle upper-cased "Include" & "Src" folders --- platformio/builder/tools/piolib.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index eb92f352..ea334592 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -184,19 +184,19 @@ class LibBuilderBase(object): @property def include_dir(self): - return ( - os.path.join(self.path, "include") - if os.path.isdir(os.path.join(self.path, "include")) - else None - ) + for name in ("include", "Include"): + d = os.path.join(self.path, name) + if os.path.isdir(d): + return d + return None @property def src_dir(self): - return ( - os.path.join(self.path, "src") - if os.path.isdir(os.path.join(self.path, "src")) - else self.path - ) + for name in ("src", "Src"): + d = os.path.join(self.path, name) + if os.path.isdir(d): + return d + return None def get_include_dirs(self): items = [] @@ -601,12 +601,6 @@ class MbedLibBuilder(LibBuilderBase): return {} return ManifestParserFactory.new_from_file(manifest_path).as_dict() - @property - def include_dir(self): - if os.path.isdir(os.path.join(self.path, "include")): - return os.path.join(self.path, "include") - return None - @property def src_dir(self): if os.path.isdir(os.path.join(self.path, "source")):