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

Remove redundant code

Browse Source
This commit is contained in:
Ivan Kravets
2023-07-07 22:48:09 +03:00
parent a102fd2d48
commit bf8f1e9efb
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
platformio/builder/tools/piointegration.py
View File

@ -14,7 +14,6 @@
import glob import glob
import os import os
import shlex
import SCons.Defaults # pylint: disable=import-error import SCons.Defaults # pylint: disable=import-error
import SCons.Subst # pylint: disable=import-error import SCons.Subst # pylint: disable=import-error
@ -139,14 +138,9 @@ def dump_svd_path(env):
return None return None
def _subst_cmd(env, cmd): def _split_flags_string(env, s):
args = env.subst_list(cmd, SCons.Subst.SUBST_CMD)[0] args = env.subst_list(s, SCons.Subst.SUBST_CMD)[0]
return " ".join([SCons.Subst.quote_spaces(arg) for arg in args]) return [str(arg) for arg in args]
def _split_flags_string(s):
flags = shlex.split(s, posix=False)
return [f[1:-1] if f.startswith('"') and f.endswith('"') else f for f in flags]
def DumpIntegrationData(*args): def DumpIntegrationData(*args):
@ -159,12 +153,8 @@ def DumpIntegrationData(*args):
], ],
"defines": dump_defines(projenv), "defines": dump_defines(projenv),
"includes": projenv.DumpIntegrationIncludes(), "includes": projenv.DumpIntegrationIncludes(),
"cc_flags": _split_flags_string( "cc_flags": _split_flags_string(projenv, "$CFLAGS $CCFLAGS $CPPFLAGS"),
_subst_cmd(projenv, "$CFLAGS $CCFLAGS $CPPFLAGS") "cxx_flags": _split_flags_string(projenv, "$CXXFLAGS $CCFLAGS $CPPFLAGS"),
),
"cxx_flags": _split_flags_string(
_subst_cmd(projenv, "$CXXFLAGS $CCFLAGS $CPPFLAGS")
),
"cc_path": where_is_program( "cc_path": where_is_program(
globalenv.subst("$CC"), globalenv.subst("${ENV['PATH']}") globalenv.subst("$CC"), globalenv.subst("${ENV['PATH']}")
), ),