feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Keep Scons env state between SConscripts

Browse Source
This commit is contained in:
Ivan Kravets
2015-02-03 13:50:08 +02:00
parent eeb58da1cb
commit d57cc7b156
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/builder/scripts/frameworks/arduino.py
View File

@ -56,4 +56,4 @@ libs.append(env.BuildLibrary(
join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}") join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
)) ))
Return("libs") Return("env libs")

2
platformio/builder/scripts/frameworks/energia.py
View File

@ -54,4 +54,4 @@ libs.append(env.BuildLibrary(
join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}") join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
)) ))
Return("libs") Return("env libs")

3
platformio/builder/tools/platformio.py
View File

@ -24,10 +24,11 @@ def ProcessGeneral(env):
env.ConvertInoToCpp() env.ConvertInoToCpp()
for f in env['FRAMEWORK'].split(","): for f in env['FRAMEWORK'].split(","):
SConscriptChdir(0) SConscriptChdir(0)
corelibs = SConscript( env, libs = SConscript(
env.subst(join("$PIOBUILDER_DIR", "scripts", env.subst(join("$PIOBUILDER_DIR", "scripts",
"frameworks", "%s.py" % f.strip().lower())), "frameworks", "%s.py" % f.strip().lower())),
exports="env") exports="env")
corelibs += libs
return corelibs return corelibs