From 2a7fc9f807a98a124e16b50b1d44fa8837f38bca Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Wed, 14 Aug 2024 14:06:18 +0300 Subject: [PATCH] Sync PlatformIO build script Signed-off-by: Valerii Koval --- tools/platformio/platformio-build.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/platformio/platformio-build.py b/tools/platformio/platformio-build.py index 9d347ef818..0f0b2642aa 100644 --- a/tools/platformio/platformio-build.py +++ b/tools/platformio/platformio-build.py @@ -46,15 +46,13 @@ ) series = mcu_type[:7].upper() + "xx" variants_dir = ( - join("$PROJECT_DIR", board_config.get("build.variants_dir")) + join(env.subst("$PROJECT_DIR"), board_config.get("build.variants_dir")) if board_config.get("build.variants_dir", "") else join(FRAMEWORK_DIR, "variants") ) variant_dir = join(variants_dir, variant) inc_variant_dir = variant_dir -if not IS_WINDOWS and not ( - set(["_idedata", "idedata"]) & set(COMMAND_LINE_TARGETS) and " " not in variant_dir -): +if not IS_WINDOWS and not (env.IsIntegrationDump() and " " not in variant_dir): inc_variant_dir = variant_dir.replace("(", r"\(").replace(")", r"\)") upload_protocol = env.subst("$UPLOAD_PROTOCOL")