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

Use the cached "BUILD_TYPE" from env

Browse Source
This commit is contained in:
Ivan Kravets
2022-07-30 12:15:49 +03:00
parent 0939b43899
commit 6653c02487
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platformio/builder/main.py
View File

@ -127,6 +127,7 @@ env.Replace(
PROJECT_DATA_DIR=config.get("platformio", "data_dir"), PROJECT_DATA_DIR=config.get("platformio", "data_dir"),
PROJECTDATA_DIR="$PROJECT_DATA_DIR", # legacy for dev/platform PROJECTDATA_DIR="$PROJECT_DATA_DIR", # legacy for dev/platform
PROJECT_BUILD_DIR=config.get("platformio", "build_dir"), PROJECT_BUILD_DIR=config.get("platformio", "build_dir"),
BUILD_TYPE=env.GetBuildType(),
BUILD_CACHE_DIR=config.get("platformio", "build_cache_dir"), BUILD_CACHE_DIR=config.get("platformio", "build_cache_dir"),
LIBSOURCE_DIRS=[ LIBSOURCE_DIRS=[
config.get("platformio", "lib_dir"), config.get("platformio", "lib_dir"),

6
platformio/builder/tools/piolib.py
View File

@ -146,7 +146,7 @@ class LibBuilderBase:
self._processed_search_files = [] self._processed_search_files = []
# pass a macro to the projenv + libs # pass a macro to the projenv + libs
if "test" in env.GetBuildType(): if "test" in env["BUILD_TYPE"]:
self.env.Append(CPPDEFINES=["PIO_UNIT_TESTING"]) self.env.Append(CPPDEFINES=["PIO_UNIT_TESTING"])
# reset source filter, could be overridden with extra script # reset source filter, could be overridden with extra script
@ -911,7 +911,7 @@ class ProjectAsLibBuilder(LibBuilderBase):
def get_search_files(self): def get_search_files(self):
items = [] items = []
build_type = self.env.GetBuildType() build_type = self.env["BUILD_TYPE"]
# project files # project files
if "test" not in build_type or self.env.GetProjectOption("test_build_src"): if "test" not in build_type or self.env.GetProjectOption("test_build_src"):
items.extend(super().get_search_files()) items.extend(super().get_search_files())
@ -1164,7 +1164,7 @@ def ConfigureProjectLibBuilder(env):
project = ProjectAsLibBuilder(env, "$PROJECT_DIR") project = ProjectAsLibBuilder(env, "$PROJECT_DIR")
if "test" in env.GetBuildType(): if "test" in env["BUILD_TYPE"]:
project.env.ConfigureTestTarget() project.env.ConfigureTestTarget()
ldf_mode = LibBuilderBase.lib_ldf_mode.fget(project) # pylint: disable=no-member ldf_mode = LibBuilderBase.lib_ldf_mode.fget(project) # pylint: disable=no-member

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

@ -86,7 +86,7 @@ def BuildProgram(env):
) )
) )
print("Building in %s mode" % env.GetBuildType()) print("Building in %s mode" % env["BUILD_TYPE"])
return program return program
@ -121,7 +121,7 @@ def ProcessProgramDeps(env):
# process framework scripts # process framework scripts
env.BuildFrameworks(env.get("PIOFRAMEWORK")) env.BuildFrameworks(env.get("PIOFRAMEWORK"))
if "debug" in env.GetBuildType(): if "debug" in env["BUILD_TYPE"]:
env.ConfigureDebugTarget() env.ConfigureDebugTarget()
# remove specified flags # remove specified flags
@ -149,7 +149,7 @@ def ProcessProjectDeps(env):
} }
) )
if "test" in env.GetBuildType(): if "test" in env["BUILD_TYPE"]:
build_files_before_nums = len(env.get("PIOBUILDFILES", [])) build_files_before_nums = len(env.get("PIOBUILDFILES", []))
plb.env.BuildSources( plb.env.BuildSources(
"$BUILD_TEST_DIR", "$PROJECT_TEST_DIR", "$PIOTEST_SRC_FILTER" "$BUILD_TEST_DIR", "$PROJECT_TEST_DIR", "$PIOTEST_SRC_FILTER"
@ -161,7 +161,7 @@ def ProcessProjectDeps(env):
) )
env.Exit(1) env.Exit(1)
if "test" not in env.GetBuildType() or env.GetProjectOption("test_build_src"): if "test" not in env["BUILD_TYPE"] or env.GetProjectOption("test_build_src"):
plb.env.BuildSources( plb.env.BuildSources(
"$BUILD_SRC_DIR", "$PROJECT_SRC_DIR", env.get("SRC_FILTER") "$BUILD_SRC_DIR", "$PROJECT_SRC_DIR", env.get("SRC_FILTER")
) )