Skip to content

HybridCompile: replace move operations with copy #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 21, 2025
Merged

HybridCompile: replace move operations with copy #346

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad6bacf
HybridCompile: replace move operations with copy
Jason2866 Nov 21, 2025
32d3aff
Enhance file copy error handling in espidf.py
Jason2866 Nov 21, 2025
103b99e
Simplify exception handling in espidf.py
Jason2866 Nov 21, 2025
095e392
Improve exception handling in espidf.py
Jason2866 Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions builder/frameworks/espidf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2587,17 +2587,17 @@ def _skip_prj_source_files(node):

if ("arduino" in env.subst("$PIOFRAMEWORK")) and ("espidf" not in env.subst("$PIOFRAMEWORK")):
def idf_lib_copy(source, target, env):
def _replace_move(src, dst):
def _replace_copy(src, dst):
dst_p = Path(dst)
dst_p.parent.mkdir(parents=True, exist_ok=True)
try:
os.remove(dst)
except FileNotFoundError:
shutil.copy2(src, dst)
except (OSError, IOError):
# Gracefully handle missing source files (e.g., PSRAM libs in non-PSRAM builds)
# This is expected when copying variant-specific libraries
pass
try:
os.replace(src, dst)
except OSError:
shutil.move(src, dst)
except Exception as e:
print(f"Warning: Failed to copy {src} to {dst}: {e}")
env_build = str(Path(env["PROJECT_BUILD_DIR"]) / env["PIOENV"])
sdkconfig_h_path = str(Path(env_build) / "config" / "sdkconfig.h")
arduino_libs = str(Path(ARDUINO_FRMWRK_LIB_DIR))
Expand All @@ -2616,15 +2616,15 @@ def _replace_move(src, dst):
if file.strip().endswith(".a"):
shutil.copyfile(file, str(Path(lib_dst) / file.split(os.path.sep)[-1]))

_replace_move(str(Path(lib_dst) / "libspi_flash.a"), str(Path(mem_var) / "libspi_flash.a"))
_replace_move(str(Path(env_build) / "memory.ld"), str(Path(ld_dst) / "memory.ld"))
_replace_copy(str(Path(lib_dst) / "libspi_flash.a"), str(Path(mem_var) / "libspi_flash.a"))
_replace_copy(str(Path(env_build) / "memory.ld"), str(Path(ld_dst) / "memory.ld"))
if mcu == "esp32s3":
_replace_move(str(Path(lib_dst) / "libesp_psram.a"), str(Path(mem_var) / "libesp_psram.a"))
_replace_move(str(Path(lib_dst) / "libesp_system.a"), str(Path(mem_var) / "libesp_system.a"))
_replace_move(str(Path(lib_dst) / "libfreertos.a"), str(Path(mem_var) / "libfreertos.a"))
_replace_move(str(Path(lib_dst) / "libbootloader_support.a"), str(Path(mem_var) / "libbootloader_support.a"))
_replace_move(str(Path(lib_dst) / "libesp_hw_support.a"), str(Path(mem_var) / "libesp_hw_support.a"))
_replace_move(str(Path(lib_dst) / "libesp_lcd.a"), str(Path(mem_var) / "libesp_lcd.a"))
_replace_copy(str(Path(lib_dst) / "libesp_psram.a"), str(Path(mem_var) / "libesp_psram.a"))
_replace_copy(str(Path(lib_dst) / "libesp_system.a"), str(Path(mem_var) / "libesp_system.a"))
_replace_copy(str(Path(lib_dst) / "libfreertos.a"), str(Path(mem_var) / "libfreertos.a"))
_replace_copy(str(Path(lib_dst) / "libbootloader_support.a"), str(Path(mem_var) / "libbootloader_support.a"))
_replace_copy(str(Path(lib_dst) / "libesp_hw_support.a"), str(Path(mem_var) / "libesp_hw_support.a"))
_replace_copy(str(Path(lib_dst) / "libesp_lcd.a"), str(Path(mem_var) / "libesp_lcd.a"))

shutil.copyfile(sdkconfig_h_path, str(Path(mem_var) / "include" / "sdkconfig.h"))
if not bool(os.path.isfile(str(Path(arduino_libs) / chip_variant / "sdkconfig.orig"))):
Expand Down