platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Propagating External Environment

Browse Source
This commit is contained in:
Ivan Kravets
2015-08-03 15:08:54 +03:00
parent 0646ffc93f
commit 584d03c802
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platformio/builder/main.py
View File

@ -12,7 +12,7 @@ except ImportError:
from platformio import util from platformio import util
import json import json
from os import getenv from os import environ
from os.path import isfile, join from os.path import isfile, join
from time import time from time import time
@ -63,6 +63,9 @@ DefaultEnvironment(
toolpath=[join("$PIOBUILDER_DIR", "tools")], toolpath=[join("$PIOBUILDER_DIR", "tools")],
variables=commonvars, variables=commonvars,
# Propagating External Environment
ENV=environ,
UNIX_TIME=int(time()), UNIX_TIME=int(time()),
PIOHOME_DIR=util.get_home_dir(), PIOHOME_DIR=util.get_home_dir(),
@ -123,8 +126,6 @@ for opt in ("LIB_IGNORE", "LIB_USE"):
continue continue
env[opt] = [l.strip() for l in env[opt].split(",") if l.strip()] env[opt] = [l.strip() for l in env[opt].split(",") if l.strip()]
# restore process $PATH
env['ENV']['PATH'] = getenv("PATH")
if env.subst("$PIOPACKAGE_TOOLCHAIN"): if env.subst("$PIOPACKAGE_TOOLCHAIN"):
env.PrependENVPath( env.PrependENVPath(
"PATH", "PATH",
@ -134,8 +135,8 @@ if env.subst("$PIOPACKAGE_TOOLCHAIN"):
SConscriptChdir(0) SConscriptChdir(0)
SConscript(env.subst("$BUILD_SCRIPT")) SConscript(env.subst("$BUILD_SCRIPT"))
if getenv("PLATFORMIO_EXTRA_SCRIPT", env.get("EXTRA_SCRIPT", None)): if environ.get("PLATFORMIO_EXTRA_SCRIPT", env.get("EXTRA_SCRIPT", None)):
SConscript(getenv("PLATFORMIO_EXTRA_SCRIPT", env.get("EXTRA_SCRIPT"))) SConscript(environ.get("PLATFORMIO_EXTRA_SCRIPT", env.get("EXTRA_SCRIPT")))
if "envdump" in COMMAND_LINE_TARGETS: if "envdump" in COMMAND_LINE_TARGETS:
print env.Dump() print env.Dump()