From 7e985219ad14f1651ac6662bd55cb897be8a5736 Mon Sep 17 00:00:00 2001
From: Valeriy Koval <valeros@bigmir.net>
Date: Tue, 15 Dec 2015 19:29:37 +0200
Subject: [PATCH] Update builder for SPL framework.

---
 examples/stm32/stm32-spl-blink/platformio.ini |  6 ++--
 platformio/builder/scripts/frameworks/spl.py  | 29 ++++++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/examples/stm32/stm32-spl-blink/platformio.ini b/examples/stm32/stm32-spl-blink/platformio.ini
index 1324053c..29d797e9 100644
--- a/examples/stm32/stm32-spl-blink/platformio.ini
+++ b/examples/stm32/stm32-spl-blink/platformio.ini
@@ -19,15 +19,15 @@
 
 [env:disco_f407vg]
 platform = ststm32
-framework = cmsis,spl
+framework = spl
 board = disco_f407vg
 
 [env:disco_l152rb]
 platform = ststm32
-framework = cmsis,spl
+framework = spl
 board = disco_l152rb
 
 [env:disco_f303vc]
 platform = ststm32
-framework = cmsis,spl
+framework = spl
 board = disco_f303vc
diff --git a/platformio/builder/scripts/frameworks/spl.py b/platformio/builder/scripts/frameworks/spl.py
index 41832a3f..13e8cac0 100644
--- a/platformio/builder/scripts/frameworks/spl.py
+++ b/platformio/builder/scripts/frameworks/spl.py
@@ -34,13 +34,24 @@ env.Replace(
 )
 
 env.VariantDirWrap(
-    join("$BUILD_DIR", "FrameworkSPLInc"),
+    join("$BUILD_DIR", "FrameworkCMSIS"),
     join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}",
-         "variants", "${BOARD_OPTIONS['build']['variant']}", "inc")
+         "cmsis", "cores", "${BOARD_OPTIONS['build']['core']}")
+)
+
+env.VariantDirWrap(
+    join("$BUILD_DIR", "FrameworkSPLInc"),
+    join(
+        "$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}", "spl",
+        "variants", env.subst("${BOARD_OPTIONS['build']['variant']}")[0:7],
+        "inc"
+    )
 )
 
 env.Append(
     CPPPATH=[
+        join("$BUILD_DIR", "FrameworkCMSIS"),
+        join("$BUILD_DIR", "FrameworkCMSISVariant"),
         join("$BUILD_DIR", "FrameworkSPLInc"),
         join("$BUILD_DIR", "FrameworkSPL")
     ]
@@ -71,10 +82,20 @@ elif "STM32L1XX_MD" in extra_flags:
     src_filter_patterns += ["-<stm32l1xx_flash_ramfunc.c>"]
 
 libs = []
+
+libs.append(envsafe.BuildLibrary(
+    join("$BUILD_DIR", "FrameworkCMSISVariant"),
+    join(
+        "$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}", "cmsis",
+        "variants", env.subst("${BOARD_OPTIONS['build']['variant']}")[0:7]
+    )
+))
+
 libs.append(envsafe.BuildLibrary(
     join("$BUILD_DIR", "FrameworkSPL"),
-    join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}", "variants",
-         "${BOARD_OPTIONS['build']['variant']}", "src"),
+    join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}",
+         "spl", "variants",
+         env.subst("${BOARD_OPTIONS['build']['variant']}")[0:7], "src"),
     src_filter=" ".join(src_filter_patterns)
 ))