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-ninja-emission' into esp8266-arduino-toolchain

Browse Source
This commit is contained in:
J. Nick Koston
2026-08-22 14:31:40 -05:00
parent 57248d3d6f f9f642b81d
commit 42134329e3
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/writer.py
+15
View File
@@ -288,11 +288,13 @@ def copy_src_tree():
# Source file removed, delete target # Source file removed, delete target
p.unlink() p.unlink()
if target not in generated_files: if target not in generated_files:
_LOGGER.debug("Source removed: %s", target)
sources_changed = True sources_changed = True
else: else:
src_file = source_files_copy.pop(target) src_file = source_files_copy.pop(target)
with src_file.path() as src_path: with src_file.path() as src_path:
if copy_file_if_changed(src_path, p) and target not in generated_files: if copy_file_if_changed(src_path, p) and target not in generated_files:
_LOGGER.debug("Source changed: %s", target)
sources_changed = True sources_changed = True
# Now copy new files # Now copy new files
@@ -303,21 +305,25 @@ def copy_src_tree():
copy_file_if_changed(src_path, dst_path) copy_file_if_changed(src_path, dst_path)
and target not in generated_files and target not in generated_files
): ):
_LOGGER.debug("Source added: %s", target)
sources_changed = True sources_changed = True
# Finally copy defines # Finally copy defines
if write_file_if_changed( if write_file_if_changed(
CORE.relative_src_path("esphome", "core", "defines.h"), generate_defines_h() CORE.relative_src_path("esphome", "core", "defines.h"), generate_defines_h()
): ):
_LOGGER.debug("Source changed: esphome/core/defines.h")
sources_changed = True sources_changed = True
write_file_if_changed(CORE.relative_build_path("README.txt"), ESPHOME_README_TXT) write_file_if_changed(CORE.relative_build_path("README.txt"), ESPHOME_README_TXT)
if write_file_if_changed( if write_file_if_changed(
CORE.relative_src_path("esphome.h"), ESPHOME_H_FORMAT.format(include_s) CORE.relative_src_path("esphome.h"), ESPHOME_H_FORMAT.format(include_s)
): ):
_LOGGER.debug("Source changed: esphome.h")
sources_changed = True sources_changed = True
if write_file_if_changed( if write_file_if_changed(
CORE.relative_src_path("esphome", "core", "version.h"), generate_version_h() CORE.relative_src_path("esphome", "core", "version.h"), generate_version_h()
): ):
_LOGGER.debug("Source changed: esphome/core/version.h")
sources_changed = True sources_changed = True
# Generate new build_info files if needed # Generate new build_info files if needed
@@ -333,6 +339,7 @@ def copy_src_tree():
# Defensively force a rebuild if the build_info files don't exist, or if # Defensively force a rebuild if the build_info files don't exist, or if
# there was a config change which didn't actually cause a source change # there was a config change which didn't actually cause a source change
if not build_info_data_h_path.exists() or not build_info_data_cpp_path.exists(): if not build_info_data_h_path.exists() or not build_info_data_cpp_path.exists():
_LOGGER.debug("Build info files missing; regenerating")
sources_changed = True sources_changed = True
else: else:
try: try:
@@ -341,8 +348,16 @@ def copy_src_tree():
existing.get("config_hash") != config_hash existing.get("config_hash") != config_hash
or existing.get("esphome_version") != __version__ or existing.get("esphome_version") != __version__
): ):
_LOGGER.debug(
"Build info stale (config_hash %s -> %s, version %s -> %s)",
existing.get("config_hash"),
config_hash,
existing.get("esphome_version"),
__version__,
)
sources_changed = True sources_changed = True
except (json.JSONDecodeError, KeyError, OSError): except (json.JSONDecodeError, KeyError, OSError):
_LOGGER.debug("Build info JSON unreadable; regenerating")
sources_changed = True sources_changed = True
# Write build_info header and JSON metadata # Write build_info header and JSON metadata