Add support for custom boards variants directory (#238)

Author: 4project-co-il

builder/frameworks/arduino/arduino-sam.py

@@ -24,6 +24,8 @@
 
 import os
 
+from arduino_common import get_variants_dir
+
 from SCons.Script import DefaultEnvironment
 
 env = DefaultEnvironment()
@@ -40,7 +42,7 @@
 assert os.path.isdir(SYSTEM_DIR)
 assert os.path.isdir(FRAMEWORK_DIR)
 
-env.SConscript("arduino-common.py")
+env.SConscript("arduino_common.py")
 
 env.Append(
     CPPDEFINES=[
@@ -71,9 +73,7 @@
 libs = []
 
 if "build.variant" in board:
-    variants_dir = os.path.join(
-        "$PROJECT_DIR", board.get("build.variants_dir")) if board.get(
-            "build.variants_dir", "") else os.path.join(FRAMEWORK_DIR, "variants")
+    variants_dir = get_variants_dir()
     env.Append(
         CPPPATH=[
             os.path.join(variants_dir, board.get("build.variant"))

builder/frameworks/arduino/arduino-samd.py

@@ -24,6 +24,8 @@
 
 import os
 
+from arduino_common import get_variants_dir
+
 from SCons.Script import DefaultEnvironment
 
 env = DefaultEnvironment()
@@ -41,7 +43,7 @@
 
 assert all(os.path.isdir(d) for d in (FRAMEWORK_DIR, CMSIS_DIR, CMSIS_ATMEL_DIR))
 
-env.SConscript("arduino-common.py")
+env.SConscript("arduino_common.py")
 
 BUILD_CORE = "arduino"
 if VENDOR_CORE == "sparkfun" and board.get("build.mcu", "").startswith("samd51"):
@@ -178,9 +180,7 @@
 libs = []
 
 if "build.variant" in board:
-    variants_dir = os.path.join(
-        "$PROJECT_DIR", board.get("build.variants_dir")) if board.get(
-            "build.variants_dir", "") else os.path.join(FRAMEWORK_DIR, "variants")
+    variants_dir = get_variants_dir()
 
     env.Append(
         CPPPATH=[os.path.join(variants_dir, board.get("build.variant"))]

…der/frameworks/arduino/arduino-common.py …der/frameworks/arduino/arduino_common.pybuilder/frameworks/arduino/arduino-common.py renamed to builder/frameworks/arduino/arduino_common.py builder/frameworks/arduino/arduino-common.py renamed to builder/frameworks/arduino/arduino_common.py

@@ -42,6 +42,17 @@
 
 assert os.path.isdir(FRAMEWORK_DIR)
 
+
+def get_variants_dir():
+    if "build.variants_dir" not in board:
+        return os.path.join(FRAMEWORK_DIR, "variants")
+
+    if os.path.isabs(env.subst(board.get("build.variants_dir"))):
+        return board.get("build.variants_dir", "")
+
+    return os.path.join("$PROJECT_DIR", board.get("build.variants_dir"))
+
+
 machine_flags = [
     "-mcpu=%s" % board.get("build.cpu"),
     "-mthumb",
@@ -95,19 +106,18 @@
     LIBS=["m"]
 )
 
-variants_dir = os.path.join(
-    "$PROJECT_DIR", board.get("build.variants_dir")) if board.get(
-        "build.variants_dir", "") else os.path.join(FRAMEWORK_DIR, "variants")
-
 if not board.get("build.ldscript", ""):
     env.Append(
         LIBPATH=[
-            os.path.join(variants_dir, board.get("build.variant"), "linker_scripts", "gcc")
+            os.path.join(
+                get_variants_dir(),
+                board.get("build.variant"),
+                "linker_scripts",
+                "gcc",
+            )
         ]
     )
-    env.Replace(
-        LDSCRIPT_PATH=board.get("build.arduino.ldscript", "")
-    )
+    env.Replace(LDSCRIPT_PATH=board.get("build.arduino.ldscript", ""))
 
 if "build.usb_product" in board:
     env.Append(