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

Fix unicode issue for Python 2.6

Browse Source
This commit is contained in:
Ivan Kravets
2015-11-27 23:49:49 +02:00
parent 7ce1dd4f5c
commit 304c023b4e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformio/builder/scripts/frameworks/mbed.py
View File

@ -227,9 +227,9 @@ env.Replace(
# restore external build flags # restore external build flags
env.ProcessFlags([ env.ProcessFlags([
env.get("BOARD_OPTIONS", {}).get("build", {}).get("extra_flags", None), env.get("BOARD_OPTIONS", {}).get("build", {}).get("extra_flags"),
env.get("BUILD_FLAGS"), env.get("BUILD_FLAGS"),
getenv("PLATFORMIO_BUILD_FLAGS", None), getenv("PLATFORMIO_BUILD_FLAGS"),
]) ])
# Hook for K64F and K22F # Hook for K64F and K22F

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

@ -40,9 +40,9 @@ def BuildProgram(env):
) )
env.ProcessFlags([ env.ProcessFlags([
env.get("BOARD_OPTIONS", {}).get("build", {}).get("extra_flags", None), env.get("BOARD_OPTIONS", {}).get("build", {}).get("extra_flags"),
env.get("BUILD_FLAGS"), env.get("BUILD_FLAGS"),
getenv("PLATFORMIO_BUILD_FLAGS", None), getenv("PLATFORMIO_BUILD_FLAGS"),
]) ])
env.BuildFramework() env.BuildFramework()
@ -67,8 +67,8 @@ def BuildProgram(env):
# Handle SRC_BUILD_FLAGS # Handle SRC_BUILD_FLAGS
env.ProcessFlags([ env.ProcessFlags([
env.get("SRC_BUILD_FLAGS"), env.get("SRC_BUILD_FLAGS", None),
getenv("PLATFORMIO_SRC_BUILD_FLAGS", None), getenv("PLATFORMIO_SRC_BUILD_FLAGS"),
]) ])
env.Append( env.Append(
@ -81,7 +81,7 @@ def BuildProgram(env):
env.LookupSources( env.LookupSources(
"$BUILDSRC_DIR", "$PROJECTSRC_DIR", duplicate=False, "$BUILDSRC_DIR", "$PROJECTSRC_DIR", duplicate=False,
src_filter=getenv("PLATFORMIO_SRC_FILTER", src_filter=getenv("PLATFORMIO_SRC_FILTER",
env.get("SRC_FILTER", None))), env.get("SRC_FILTER"))),
LIBS=env.get("LIBS", []) + deplibs, LIBS=env.get("LIBS", []) + deplibs,
LIBPATH=env.get("LIBPATH", []) + ["$BUILD_DIR"] LIBPATH=env.get("LIBPATH", []) + ["$BUILD_DIR"]
) )
@ -90,7 +90,7 @@ def BuildProgram(env):
def ProcessFlags(env, flags): def ProcessFlags(env, flags):
for f in flags: for f in flags:
if f: if f:
env.MergeFlags(f) env.MergeFlags(str(f))
# fix relative CPPPATH # fix relative CPPPATH
for i, p in enumerate(env.get("CPPPATH", [])): for i, p in enumerate(env.get("CPPPATH", [])):
@ -99,7 +99,7 @@ def ProcessFlags(env, flags):
# Cancel any previous definition of name, either built in or # Cancel any previous definition of name, either built in or
# provided with a -D option // Issue #191 # provided with a -D option // Issue #191
undefines = [f for f in env.get("CCFLAGS", []) if f.startswith("-U")] undefines = [u for u in env.get("CCFLAGS", []) if u.startswith("-U")]
if undefines: if undefines:
for undef in undefines: for undef in undefines:
env['CCFLAGS'].remove(undef) env['CCFLAGS'].remove(undef)