From 8cda6db02d8d739dfaee676a0de0dbbc7e92856e Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 25 May 2018 01:46:53 +0300 Subject: [PATCH] Rename LDF compatibility mode from "light" to "soft" --- docs | 2 +- platformio/builder/tools/piolib.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs b/docs index 670dad7c..3f618145 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 670dad7cf4330330276ec2b349ceb9cca6a1b0d7 +Subproject commit 3f618145977e971f1d51c32794dba1449b7d9f39 diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index 2d77d167..9048ea1c 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -86,8 +86,8 @@ class LibBuilderBase(object): LDF_MODES = ["off", "chain", "deep", "chain+", "deep+"] LDF_MODE_DEFAULT = "chain" - COMPAT_MODES = ["off", "light", "strict"] - COMPAT_MODE_DEFAULT = "light" + COMPAT_MODES = ["off", "soft", "strict"] + COMPAT_MODE_DEFAULT = "soft" CLASSIC_SCANNER = SCons.Scanner.C.CScanner() CCONDITIONAL_SCANNER = SCons.Scanner.C.CConditionalScanner() @@ -758,7 +758,7 @@ def GetLibBuilders(env): # pylint: disable=too-many-branches sys.stderr.write( "Platform incompatible library %s\n" % lb.path) return False - if compat_mode == "light" and "PIOFRAMEWORK" in env and \ + if compat_mode == "soft" and "PIOFRAMEWORK" in env and \ not lb.is_frameworks_compatible(env.get("PIOFRAMEWORK", [])): if verbose: sys.stderr.write(