github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-08-22 22:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'esp8266-native-build-spec' into esp8266-native-ninja-emission

Browse Source
This commit is contained in:
J. Nick Koston
2026-08-22 16:16:23 -05:00
parent b024fd53dd 8f3e9f97c0
commit 0ace5d0415
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/arduino/library.py
+3 -4
View File
@@ -7,8 +7,7 @@ library builds its own archive; all include dirs join one global path.
Deviations from PlatformIO: flat-layout libraries get the recursive default Deviations from PlatformIO: flat-layout libraries get the recursive default
source filter; ``dot_a_linkage`` is honored; bundled libraries never run a source filter; ``dot_a_linkage`` is honored; bundled libraries never run a
manifest ``extraScript``; manifest ``-I`` flags join the global include path; manifest ``extraScript``; manifest ``-I`` flags join the global include path;
``precompiled``/``ldflags`` properties are not honored (a warning names the ``precompiled``/``ldflags`` properties are refused by name.
library).
""" """
from __future__ import annotations from __future__ import annotations
@@ -99,7 +98,7 @@ def _resolve_src_dir(name: str, read_path: Path, build: dict) -> str:
return src_dir return src_dir
def _warn_dropped_link_fields(name: str, data: dict) -> None: def _reject_unsupported_link_fields(name: str, data: dict) -> None:
for dropped_key in ("precompiled", "ldflags"): for dropped_key in ("precompiled", "ldflags"):
if data.get(dropped_key): if data.get(dropped_key):
# PIO's Arduino lib builder honors these; building without them # PIO's Arduino lib builder honors these; building without them
@@ -236,7 +235,7 @@ def _collect_lib_sources(
def _library_info(name: str, read_path: Path, data: dict) -> ArduinoLibrary: def _library_info(name: str, read_path: Path, data: dict) -> ArduinoLibrary:
"""Resolve one library's sources, include dirs, and flags (PIO semantics).""" """Resolve one library's sources, include dirs, and flags (PIO semantics)."""
build = _manifest_build(name, data) build = _manifest_build(name, data)
_warn_dropped_link_fields(name, data) _reject_unsupported_link_fields(name, data)
src_dir = _resolve_src_dir(name, read_path, build) src_dir = _resolve_src_dir(name, read_path, build)
src_filter = ensure_list(build.get("srcFilter", DEFAULT_BUILD_SRC_FILTER)) src_filter = ensure_list(build.get("srcFilter", DEFAULT_BUILD_SRC_FILTER))
if not all(isinstance(entry, str) for entry in src_filter): if not all(isinstance(entry, str) for entry in src_filter):