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

Keep consign DB in .pioenvs

Browse Source
This commit is contained in:
Ivan Kravets
2015-12-05 23:21:16 +02:00
parent 8c8de45f30
commit 16abaccf96
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
platformio/builder/main.py
View File

@ -41,8 +41,7 @@ from os import environ
from os.path import isfile, join from os.path import isfile, join
from time import time from time import time
from SCons.Script import (COMMAND_LINE_TARGETS, DefaultEnvironment, Exit, from SCons.Script import COMMAND_LINE_TARGETS, DefaultEnvironment, Variables
SConscript, SConscriptChdir, Variables)
from platformio.exception import UnknownBoard from platformio.exception import UnknownBoard
@ -141,10 +140,10 @@ if "BOARD" in env:
) )
if env['PLATFORM'] != env.get("BOARD_OPTIONS", {}).get("platform"): if env['PLATFORM'] != env.get("BOARD_OPTIONS", {}).get("platform"):
Exit("Error: '%s' platform doesn't support this board. " env.Exit(
"Use '%s' platform instead." % ( "Error: '%s' platform doesn't support this board. "
env['PLATFORM'], "Use '%s' platform instead." % (
env.get("BOARD_OPTIONS", {}).get("platform"))) env['PLATFORM'], env.get("BOARD_OPTIONS", {}).get("platform")))
for opt in ("LIB_IGNORE", "LIB_USE"): for opt in ("LIB_IGNORE", "LIB_USE"):
@ -158,16 +157,18 @@ if env.subst("$PIOPACKAGE_TOOLCHAIN"):
env.subst(join("$PIOPACKAGES_DIR", "$PIOPACKAGE_TOOLCHAIN", "bin")) env.subst(join("$PIOPACKAGES_DIR", "$PIOPACKAGE_TOOLCHAIN", "bin"))
) )
SConscriptChdir(0) env.SConscriptChdir(0)
SConscript(env.subst("$BUILD_SCRIPT")) env.SConsignFile(join("$PIOENVS_DIR", ".sconsign.dblite"))
env.SConscript("$BUILD_SCRIPT")
if environ.get("PLATFORMIO_EXTRA_SCRIPT", env.get("EXTRA_SCRIPT", None)): if environ.get("PLATFORMIO_EXTRA_SCRIPT", env.get("EXTRA_SCRIPT")):
SConscript(environ.get("PLATFORMIO_EXTRA_SCRIPT", env.get("EXTRA_SCRIPT"))) env.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()
Exit() env.Exit()
if "idedata" in COMMAND_LINE_TARGETS: if "idedata" in COMMAND_LINE_TARGETS:
print json.dumps(env.DumpIDEData()) print json.dumps(env.DumpIDEData())
Exit() env.Exit()