From 3a77bed0d4e69e22b753a8bc91bcedf048eaa075 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 23 Mar 2019 14:24:43 +0200
Subject: [PATCH] Fix an issue when PlatformIO Build System does not pick up
 "mbed_lib.json" files from libraries // Resolve #2164

---
 HISTORY.rst                        |  2 ++
 platformio/builder/tools/piolib.py | 57 +++++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index b7629c20..7bd5d9de 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -18,6 +18,8 @@ PlatformIO 3.0
 
 * Project Generator: fixed a warning "Property !!! WARNING !!! is not allowed" for VSCode
   (`issue #2243 <https://github.com/platformio/platformio-core/issues/2243>`_)
+* Fixed an issue when PlatformIO Build System does not pick up "mbed_lib.json" files from libraries
+  (`issue #2164 <https://github.com/platformio/platformio-core/issues/2164>`_)
 * Fixed an error with conflicting declaration of a prototype (Arduino sketch preprocessor)
 * Fixed "FileExistsError" when `platformio ci <https://docs.platformio.org/en/latest/userguide/cmd_ci.html>`__ command is used in pair with ``--keep-build-dir`` option
 
diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py
index 2613c868..2c4b3054 100644
--- a/platformio/builder/tools/piolib.py
+++ b/platformio/builder/tools/piolib.py
@@ -71,6 +71,8 @@ class LibBuilderFactory(object):
 
         # check source files
         for root, _, files in os.walk(path, followlinks=True):
+            if "mbed_lib.json" in files:
+                return ["mbed"]
             for fname in files:
                 if not env.IsFileWithExt(
                         fname, piotool.SRC_BUILD_EXT + piotool.SRC_HEADER_EXT):
@@ -262,7 +264,6 @@ class LibBuilderBase(object):
 
     def process_extra_options(self):
         with util.cd(self.path):
-            self.env.ProcessUnFlags(self.build_unflags)
             self.env.ProcessFlags(self.build_flags)
             if self.extra_script:
                 self.env.SConscriptChdir(1)
@@ -272,6 +273,7 @@ class LibBuilderBase(object):
                         "env": self.env,
                         "pio_lib_builder": self
                     })
+            self.env.ProcessUnFlags(self.build_unflags)
 
     def process_dependencies(self):
         if not self.dependencies:
@@ -591,6 +593,59 @@ class MbedLibBuilder(LibBuilderBase):
     def is_frameworks_compatible(self, frameworks):
         return util.items_in_list(frameworks, ["mbed"])
 
+    @property
+    def build_flags(self):
+        return self._mbed_lib_json_to_build_flags()
+
+    def _mbed_lib_json_to_build_flags(self):  # pylint: disable=too-many-locals
+        json_files = [
+            join(root, "mbed_lib.json")
+            for root, _, files in os.walk(self.path)
+            if "mbed_lib.json" in files
+        ]
+        if not json_files:
+            return None
+
+        build_flags = []
+        cppdefines = str(self.env.Flatten(self.env.subst("$CPPDEFINES")))
+        for p in json_files:
+            manifest = util.load_json(p)
+
+            # default macros
+            build_flags.extend(["-D" + m for m in manifest.get("macros", [])])
+
+            macros = {}
+            # configuration items
+            for key, options in manifest.get("config", {}).items():
+                if "value" not in options:
+                    continue
+                macros[key] = dict(
+                    name=options.get("macro_name"), value=options.get("value"))
+            # overrode items per target
+            for target, options in manifest.get("target_overrides",
+                                                {}).items():
+                if target != "*" and "TARGET_" + target not in cppdefines:
+                    continue
+                build_flags.extend(
+                    ["-D" + m for m in options.get("target.macros_add", [])])
+                for key, value in options.items():
+                    if not key.startswith("target.") and key in macros:
+                        macros[key]['value'] = value
+            for key, macro in macros.items():
+                name = macro['name']
+                value = macro['value']
+                if not name:
+                    name = key
+                    if "." not in name:
+                        name = manifest.get("name") + "." + name
+                    name = re.sub(r"[^a-z\d]+", "_", name, flags=re.I).upper()
+                    name = "MBED_CONF_" + name
+                if isinstance(value, bool):
+                    value = 1 if value else 0
+                build_flags.append("-D%s=%s" % (name, value))
+
+        return build_flags
+
 
 class PlatformIOLibBuilder(LibBuilderBase):