Skip to content

Commit 85ab51f

Browse files
authored
Update embedded file handling in _embed_files.py
1 parent 54ece58 commit 85ab51f

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

builder/frameworks/_embed_files.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@
2525
mcu = board.get("build.mcu", "esp32")
2626
is_xtensa = mcu in ("esp32", "esp32s2", "esp32s3")
2727

28+
cmake_dir = str(env.PioPlatform().get_package_dir("tool-cmake"))
29+
cmake_cmd = f'"{Path(cmake_dir) / "bin" / "cmake"}"'
30+
31+
idf_dir = str(env.PioPlatform().get_package_dir("framework-espidf"))
32+
data_embed_script = (
33+
f'"{Path(idf_dir) / "tools" / "cmake" / "scripts" / "data_file_embed_asm.cmake"}"'
34+
)
35+
2836
#
2937
# Embedded files helpers
3038
#
@@ -106,8 +114,8 @@ def embed_files(files, files_type):
106114

107115

108116
def transform_to_asm(target, source, env):
109-
files = [str(Path("$BUILD_DIR") / (s.name + ".S")) for s in source]
110-
return files, source
117+
asm_targets = [str(Path("$BUILD_DIR") / (s.name + ".S")) for s in source]
118+
return asm_targets, source
111119

112120

113121
env.Append(
@@ -139,12 +147,12 @@ def transform_to_asm(target, source, env):
139147
action=env.VerboseAction(
140148
" ".join(
141149
[
142-
f'"{Path(env.PioPlatform().get_package_dir("tool-cmake") or "") / "bin" / "cmake"}"',
150+
cmake_cmd,
143151
"-DDATA_FILE=$SOURCE",
144152
"-DSOURCE_FILE=$TARGET",
145153
"-DFILE_TYPE=$FILE_TYPE",
146154
"-P",
147-
f'"{Path(env.PioPlatform().get_package_dir("framework-espidf") or "") / "tools" / "cmake" / "scripts" / "data_file_embed_asm.cmake"}"',
155+
data_embed_script,
148156
]
149157
),
150158
"Generating assembly for $TARGET",

0 commit comments

Comments
 (0)