From da6f424b111ae78395d8a4b789054e1b20fc582d Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 16 Jul 2016 00:19:56 +0300 Subject: [PATCH] Export root "env" to the extra script --- docs/projectconf.rst | 4 +--- platformio/builder/main.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/projectconf.rst b/docs/projectconf.rst index 0c905b2f..f0e6b941 100644 --- a/docs/projectconf.rst +++ b/docs/projectconf.rst @@ -486,9 +486,7 @@ Example, specify own upload command for :ref:`platform_atmelavr`: .. code-block:: python - from SCons.Script import DefaultEnvironment - - env = DefaultEnvironment() + Import('env') env.Replace(UPLOADHEXCMD='"$UPLOADER" ${ARGUMENTS.get("custom_option")} --uploader --flags') diff --git a/platformio/builder/main.py b/platformio/builder/main.py index 822421ec..7c1fc192 100644 --- a/platformio/builder/main.py +++ b/platformio/builder/main.py @@ -128,7 +128,7 @@ if "UPLOAD_FLAGS" in env: env.Append(UPLOADERFLAGS=["$UPLOAD_FLAGS"]) if env.get("EXTRA_SCRIPT"): - env.SConscript(env.get("EXTRA_SCRIPT")) + env.SConscript(env.get("EXTRA_SCRIPT"), exports="env") if "envdump" in COMMAND_LINE_TARGETS: print env.Dump()