Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-03 03:31:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(tools): Windows builds when paths contain spaces (prefix_map, ldgen, CI)

Browse Source 
- Harden prefix_map.cmake for paths with spaces on Windows

- ldgen: fragments-list-file, list normalization, CMake integration (tools/cmake + cmakev2)

- CI exclude list for check_tools; test_spaces bundle tweak

Made-with: Cursor
This commit is contained in:
Jakub Kocka
2026-06-04 14:45:05 +08:00
parent 424a685692
commit 2e5d930e6b
8 changed files with 80 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cmake/prefix_map.cmake
+29 -13
View File
@@ -5,6 +5,10 @@
# to fixed names. This is used when reproducible builds are required.
# This function also creates a gdbinit file for the debugger to
# remap the substituted paths back to the real paths in the filesystem.
#
# On Windows hosts, very long compile commands are avoided by enabling Ninja response
# files in toolchain.cmake (CMAKE_NINJA_FORCE_RESPONSE_FILE), not by dropping these
# options when paths contain spaces.
function(__generate_prefix_map compile_options_var)
set(compile_options)
set(gdbinit_dir ${BUILD_DIR}/gdbinit)
@@ -13,27 +17,38 @@ function(__generate_prefix_map compile_options_var)
idf_build_get_property(build_components BUILD_COMPONENTS)
if(CONFIG_COMPILER_HIDE_PATHS_MACROS)
list(APPEND compile_options "-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=.")
list(APPEND compile_options "-fmacro-prefix-map=${idf_path}=/IDF")
file(TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}" _src_dir)
file(TO_CMAKE_PATH "${idf_path}" _idf_path)
list(APPEND compile_options "-fmacro-prefix-map=${_src_dir}=.")
list(APPEND compile_options "-fmacro-prefix-map=${_idf_path}=/IDF")
endif()
if(CONFIG_APP_REPRODUCIBLE_BUILD)
list(APPEND compile_options "-fdebug-prefix-map=${idf_path}=/IDF")
list(APPEND compile_options "-fdebug-prefix-map=${PROJECT_DIR}=/IDF_PROJECT")
list(APPEND compile_options "-fdebug-prefix-map=${BUILD_DIR}=/IDF_BUILD")
file(TO_CMAKE_PATH "${idf_path}" _idf_path)
file(TO_CMAKE_PATH "${PROJECT_DIR}" _project_dir)
file(TO_CMAKE_PATH "${BUILD_DIR}" _build_dir)
list(APPEND compile_options "-fdebug-prefix-map=${_idf_path}=/IDF")
list(APPEND compile_options "-fdebug-prefix-map=${_project_dir}=/IDF_PROJECT")
list(APPEND compile_options "-fdebug-prefix-map=${_build_dir}=/IDF_BUILD")
# Generate mapping for component paths
set(gdbinit_file_lines)
string(APPEND gdbinit_file_lines "set substitute-path /IDF ${idf_path}\n")
string(APPEND gdbinit_file_lines "set substitute-path /IDF_PROJECT ${PROJECT_DIR}\n")
string(APPEND gdbinit_file_lines "set substitute-path /IDF_BUILD ${BUILD_DIR}\n")
# Map components outside IDF_PATH to stable synthetic paths (reproducible builds).
foreach(component_name ${build_components})
idf_component_get_property(component_dir ${component_name} COMPONENT_DIR)
string(TOUPPER ${component_name} component_name_uppercase)
set(substituted_path "/COMPONENT_${component_name_uppercase}_DIR")
list(APPEND compile_options "-fdebug-prefix-map=${component_dir}=${substituted_path}")
string(APPEND gdbinit_file_lines "set substitute-path ${substituted_path} ${component_dir}\n")
file(TO_CMAKE_PATH "${component_dir}" _component_dir)
file(RELATIVE_PATH _component_rel "${_idf_path}" "${_component_dir}")
if(_component_rel MATCHES "^\\.\\.(/|$)")
string(TOUPPER ${component_name} component_name_uppercase)
set(substituted_path "/COMPONENT_${component_name_uppercase}_DIR")
list(APPEND compile_options "-fdebug-prefix-map=${_component_dir}=${substituted_path}")
string(APPEND gdbinit_file_lines "set substitute-path ${substituted_path} ${component_dir}\n")
endif()
endforeach()
# Mapping for toolchain path
execute_process(
COMMAND ${CMAKE_C_COMPILER} -print-sysroot
OUTPUT_VARIABLE compiler_sysroot
@@ -43,7 +58,8 @@ function(__generate_prefix_map compile_options_var)
endif()
string(STRIP "${compiler_sysroot}" compiler_sysroot)
get_filename_component(compiler_sysroot "${compiler_sysroot}/.." REALPATH)
list(APPEND compile_options "-fdebug-prefix-map=${compiler_sysroot}=/TOOLCHAIN")
file(TO_CMAKE_PATH "${compiler_sysroot}" _compiler_sysroot)
list(APPEND compile_options "-fdebug-prefix-map=${_compiler_sysroot}=/TOOLCHAIN")
string(APPEND gdbinit_file_lines "set substitute-path /TOOLCHAIN ${compiler_sysroot}\n")
else()
set(gdbinit_file_lines "# There is no prefix map defined for the project.\n")