From 19c8bc49dee1b1c7f67b64c70d814fa8ad17b150 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 24 Jan 2017 23:25:18 +0200
Subject: [PATCH] Move framework related things from main script to own build
 script

---
 builder/frameworks/arduino.py |  8 +++++++
 builder/frameworks/espidf.py  |  7 +++++++
 builder/frameworks/simba.py   | 10 +++++++++
 builder/main.py               | 39 +----------------------------------
 4 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
index 7fce846..11800ab 100644
--- a/builder/frameworks/arduino.py
+++ b/builder/frameworks/arduino.py
@@ -99,6 +99,14 @@ env.Append(
         "-T", "esp32.common.ld",
         "-T", "esp32.rom.ld",
         "-T", "esp32.peripherals.ld"
+    ],
+
+    UPLOADERFLAGS=[
+        "0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools",
+                                "sdk", "bin", "bootloader.bin"),
+        "0x8000", '"%s"' % join(FRAMEWORK_DIR, "tools",
+                                "sdk", "bin", "partitions_singleapp.bin"),
+        "0x10000"
     ]
 )
 
diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
index 44ab914..6e7df5f 100644
--- a/builder/frameworks/espidf.py
+++ b/builder/frameworks/espidf.py
@@ -77,6 +77,7 @@ def build_espidf_bootloader():
         )
     )
 
+
 env.Prepend(
     CPPPATH=[
         join("$PROJECTSRC_DIR"),
@@ -128,6 +129,12 @@ env.Append(
         "-T", "esp32.rom.ld",
         "-T", "esp32.peripherals.ld"
     ],
+
+    UPLOADERFLAGS=[
+        "0x1000", join("$BUILD_DIR", "bootloader.bin"),
+        "0x4000", join("$BUILD_DIR", "partitions_table.bin"),
+        "0x10000"
+    ]
 )
 
 #
diff --git a/builder/frameworks/simba.py b/builder/frameworks/simba.py
index 2478bd2..c854e38 100644
--- a/builder/frameworks/simba.py
+++ b/builder/frameworks/simba.py
@@ -54,5 +54,15 @@ env.Replace(
     PLATFORMFW_DIR=env.PioPlatform().get_package_dir("framework-simba")
 )
 
+env.Append(
+    UPLOADERFLAGS=[
+        "0x1000", join("$PLATFORMFW_DIR", "3pp", "esp32",
+                       "bin", "bootloader.bin"),
+        "0x4000", join("$PLATFORMFW_DIR", "3pp", "esp32",
+                       "bin", "partitions_singleapp.bin"),
+        "0x10000"
+    ]
+)
+
 SConscript(
     [env.subst(join("$PLATFORMFW_DIR", "make", "platformio.sconscript"))])
diff --git a/builder/main.py b/builder/main.py
index ec78a88..63a7e17 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -80,15 +80,6 @@ env.Replace(
         "-Wl,--gc-sections"
     ],
 
-    #
-    # Packages
-    #
-
-    FRAMEWORK_ARDUINOESP32_DIR=platform.get_package_dir(
-        "framework-arduinoespressif32"),
-    ESPIDF_DIR=platform.get_package_dir("framework-espidf"),
-    FRAMEWORK_SIMBA_DIR=platform.get_package_dir("framework-simba"),
-
     #
     # Upload
     #
@@ -112,36 +103,8 @@ env.Replace(
     PROGSUFFIX=".elf"
 )
 
-if env.subst("$PIOFRAMEWORK") == "arduino":
-    env.Append(
-        UPLOADERFLAGS=[
-            "0x1000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
-                                    "sdk", "bin", "bootloader.bin"),
-            "0x8000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
-                                    "sdk", "bin", "partitions_singleapp.bin"),
-            "0x10000"
-        ]
-    )
-if env.subst("$PIOFRAMEWORK") == "espidf":
-    env.Append(
-        UPLOADERFLAGS=[
-            "0x1000", join("$BUILD_DIR", "bootloader.bin"),
-            "0x4000", join("$BUILD_DIR", "partitions_table.bin"),
-            "0x10000"
-        ]
-    )
-if env.subst("$PIOFRAMEWORK") == "simba":
-    env.Append(
-        UPLOADERFLAGS=[
-            "0x1000", join("$FRAMEWORK_SIMBA_DIR", "3pp", "esp32",
-                           "bin", "bootloader.bin"),
-            "0x4000", join("$FRAMEWORK_SIMBA_DIR", "3pp", "esp32",
-                           "bin", "partitions_singleapp.bin"),
-            "0x10000"
-        ]
-    )
-
 
+# Clone actual CCFLAGS to ASFLAGS
 env.Append(
     ASFLAGS=env.get("CCFLAGS", [])[:]
 )