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 default values from project options

Browse Source
This commit is contained in:
Ivan Kravets
2019-10-31 15:28:02 +02:00
parent 9b65a091da
commit a18f8b2a4c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ class LibBuilderBase(object):
@property @property
def lib_archive(self): def lib_archive(self):
return self.env.GetProjectOption("lib_archive", True) return self.env.GetProjectOption("lib_archive")
@property @property
def lib_ldf_mode(self): def lib_ldf_mode(self):
@ -711,8 +711,9 @@ class PlatformIOLibBuilder(LibBuilderBase):
@property @property
def lib_archive(self): def lib_archive(self):
global_value = self.env.GetProjectOption("lib_archive") unique_value = "_not_declared_%s" % id(self)
if global_value is not None: global_value = self.env.GetProjectOption("lib_archive", unique_value)
if global_value != unique_value:
return global_value return global_value
return self._manifest.get("build", {}).get( return self._manifest.get("build", {}).get(
"libArchive", LibBuilderBase.lib_archive.fget(self) "libArchive", LibBuilderBase.lib_archive.fget(self)

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

@ -70,7 +70,7 @@ def _build_project_deps(env):
projenv.BuildSources( projenv.BuildSources(
"$BUILD_TEST_DIR", "$PROJECT_TEST_DIR", "$PIOTEST_SRC_FILTER" "$BUILD_TEST_DIR", "$PROJECT_TEST_DIR", "$PIOTEST_SRC_FILTER"
) )
if not is_test or env.GetProjectOption("test_build_project_src", False): if not is_test or env.GetProjectOption("test_build_project_src"):
projenv.BuildSources( projenv.BuildSources(
"$BUILD_SRC_DIR", "$PROJECT_SRC_DIR", env.get("SRC_FILTER") "$BUILD_SRC_DIR", "$PROJECT_SRC_DIR", env.get("SRC_FILTER")
) )