Expand builder scripts to use build.variants_dir

platformio · Nov 17, 2021 · 08ccc03 · 08ccc03
1 parent ea23841
commit 08ccc03
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/adafruit.py b/adafruit.py
@@ -261,15 +261,18 @@
 libs = []
 
 if "build.variant" in board:
-    env.Append(CPPPATH=[
-        join(FRAMEWORK_DIR, "variants", board.get("build.variant"))
-    ])
-
-    libs.append(
-        env.BuildLibrary(
-            join("$BUILD_DIR", "FrameworkArduinoVariant"),
-            join(FRAMEWORK_DIR, "variants",
-                 board.get("build.variant"))))
+    variants_dir = join(
+        "$PROJECT_DIR", board.get("build.variants_dir")) if board.get(
+            "build.variants_dir", "") else join(FRAMEWORK_DIR, "variants")
+    env.Append(
+        CPPPATH=[
+            join(variants_dir, board.get("build.variant"))
+        ]
+    )
+    libs.append(env.BuildLibrary(
+        join("$BUILD_DIR", "FrameworkArduinoVariant"),
+        join(variants_dir, board.get("build.variant"))
+    ))
 
 libs.append(
     env.BuildLibrary(

diff --git a/nrf5.py b/nrf5.py
@@ -184,15 +184,18 @@
 libs = []
 
 if "build.variant" in board:
-    env.Append(CPPPATH=[
-        join(FRAMEWORK_DIR, "variants", board.get("build.variant"))
-    ])
-
-    libs.append(
-        env.BuildLibrary(
-            join("$BUILD_DIR", "FrameworkArduinoVariant"),
-            join(FRAMEWORK_DIR, "variants",
-                 board.get("build.variant"))))
+    variants_dir = join(
+        "$PROJECT_DIR", board.get("build.variants_dir")) if board.get(
+            "build.variants_dir", "") else join(FRAMEWORK_DIR, "variants")
+    env.Append(
+        CPPPATH=[
+            join(variants_dir, board.get("build.variant"))
+        ]
+    )
+    libs.append(env.BuildLibrary(
+        join("$BUILD_DIR", "FrameworkArduinoVariant"),
+        join(variants_dir, board.get("build.variant"))
+    ))
 
 libs.append(
     env.BuildLibrary(