Handle new environment variables PLATFORMIO_UPLOAD_PORT and PLATFORMIO_UPLOAD_FLAGS

platformio/builder/main.py

@@ -139,6 +139,13 @@ if env.subst("$PIOPACKAGE_TOOLCHAIN"):
         env.subst(join("$PIOPACKAGES_DIR", "$PIOPACKAGE_TOOLCHAIN", "bin"))
     )
 
+# handle custom variable from system environment
+for var in ("BUILD_FLAGS", "SRC_BUILD_FLAGS", "SRC_FILTER", "EXTRA_SCRIPT",
+            "UPLOAD_PORT", "UPLOAD_FLAGS"):
+    k = "PLATFORMIO_%s" % var
+    if environ.get(k):
+        env[var] = environ.get(k)
+
 env.SConscriptChdir(0)
 env.SConsignFile(join("$PIOENVS_DIR", ".sconsign.dblite"))
 env.SConscript("$BUILD_SCRIPT")
@@ -146,9 +153,8 @@ env.SConscript("$BUILD_SCRIPT")
 if "UPLOAD_FLAGS" in env:
     env.Append(UPLOADERFLAGS=["$UPLOAD_FLAGS"])
 
-if environ.get("PLATFORMIO_EXTRA_SCRIPT", env.get("EXTRA_SCRIPT")):
-    env.SConscript(
-        environ.get("PLATFORMIO_EXTRA_SCRIPT", env.get("EXTRA_SCRIPT")))
+if env.get("EXTRA_SCRIPT"):
+    env.SConscript(env.get("EXTRA_SCRIPT"))
 
 if "envdump" in COMMAND_LINE_TARGETS:
     print env.Dump()

platformio/builder/scripts/frameworks/mbed.py

@@ -32,7 +32,7 @@ import re
 import sys
 import xml.etree.ElementTree as ElementTree
 from binascii import crc32
-from os import getenv, walk
+from os import walk
 from os.path import basename, isfile, join, normpath
 
 from SCons.Script import DefaultEnvironment
@@ -233,8 +233,7 @@ env.Replace(
 # restore external build flags
 env.ProcessFlags([
     env.get("BOARD_OPTIONS", {}).get("build", {}).get("extra_flags"),
-    env.get("BUILD_FLAGS"),
-    getenv("PLATFORMIO_BUILD_FLAGS"),
+    env.get("BUILD_FLAGS")
 ])
 
 # Hook for K64F and K22F

platformio/builder/tools/platformio.py

@@ -16,7 +16,7 @@ from __future__ import absolute_import
 
 import re
 from glob import glob
-from os import getenv, listdir, sep, walk
+from os import listdir, sep, walk
 from os.path import basename, dirname, isdir, isfile, join, normpath, realpath
 
 from SCons.Script import COMMAND_LINE_TARGETS, DefaultEnvironment, SConscript
@@ -44,8 +44,7 @@ def BuildProgram(env):
 
     env.ProcessFlags([
         env.get("BOARD_OPTIONS", {}).get("build", {}).get("extra_flags"),
-        env.get("BUILD_FLAGS"),
-        getenv("PLATFORMIO_BUILD_FLAGS"),
+        env.get("BUILD_FLAGS")
     ])
 
     if env.get("FRAMEWORK"):
@@ -72,10 +71,7 @@ def BuildProgram(env):
         )
 
     # Handle SRC_BUILD_FLAGS
-    env.ProcessFlags([
-        env.get("SRC_BUILD_FLAGS", None),
-        getenv("PLATFORMIO_SRC_BUILD_FLAGS"),
-    ])
+    env.ProcessFlags([env.get("SRC_BUILD_FLAGS", None)])
 
     env.Append(
         CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
@@ -86,7 +82,7 @@ def BuildProgram(env):
 
     sources = env.LookupSources(
         "$BUILDSRC_DIR", "$PROJECTSRC_DIR", duplicate=False,
-        src_filter=getenv("PLATFORMIO_SRC_FILTER", env.get("SRC_FILTER")))
+        src_filter=env.get("SRC_FILTER"))
 
     if not sources and not COMMAND_LINE_TARGETS:
         env.Exit(