Construct build directory based on the build type // Resolve #4373

This commit is contained in:
Ivan Kravets committed 2023-07-19 15:12:31 +03:00
1 parent 0da1a38df5
commit b135a73945
14 files changed
+112 -105

No files matched your search

+4 -15
View File
@@ -44,19 +44,6 @@ def scons_patched_match_splitext(path, suffixes=None):
return tokens
def GetBuildType(env):
modes = []
if (
set(["__debug", "sizedata"]) # sizedata = for memory inspection
& set(COMMAND_LINE_TARGETS)
or env.GetProjectOption("build_type") == "debug"
):
modes.append("debug")
if "__test" in COMMAND_LINE_TARGETS or env.GetProjectOption("build_type") == "test":
modes.append("test")
return "+".join(modes or ["release"])
def BuildProgram(env):
env.ProcessProgramDeps()
env.ProcessProjectDeps()
@@ -74,7 +61,7 @@ def BuildProgram(env):
env.Prepend(_LIBFLAGS="-Wl,--start-group ")
env.Append(_LIBFLAGS=" -Wl,--end-group")
program = env.Program(env.subst("$PROGPATH"), env["PIOBUILDFILES"])
program = env.Program(env.subst("$PROGPATH"), env.get("PIOBUILDFILES", []))
env.Replace(PIOMAINPROG=program)
AlwaysBuild(
@@ -157,6 +144,9 @@ def ProcessProjectDeps(env):
}
)
if env.IsIntegrationDump():
return
if "test" in env["BUILD_TYPE"]:
build_files_before_nums = len(env.get("PIOBUILDFILES", []))
plb.env.BuildSources(
@@ -373,7 +363,6 @@ def exists(_):
def generate(env):
env.AddMethod(GetBuildType)
env.AddMethod(BuildProgram)
env.AddMethod(ProcessProgramDeps)
env.AddMethod(ProcessProjectDeps)
+2 -2
View File
@@ -23,7 +23,7 @@ from platformio.proc import exec_command, where_is_program
def IsIntegrationDump(_):
return "__idedata" in COMMAND_LINE_TARGETS
return set(["__idedata", "__metadata"]) & set(COMMAND_LINE_TARGETS)
def DumpIntegrationIncludes(env):
@@ -146,7 +146,7 @@ def _split_flags_string(env, s):
def DumpIntegrationData(*args):
projenv, globalenv = args[0:2] # pylint: disable=unbalanced-tuple-unpacking
data = {
"build_type": globalenv.GetBuildType(),
"build_type": globalenv["BUILD_TYPE"],
"env_name": globalenv["PIOENV"],
"libsource_dirs": [
globalenv.subst(item) for item in globalenv.GetLibSourceDirs()