fix(cmake_utilities): fix relinker.py some typo

Author: YuanMingfu-star

tools/cmake_utilities/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.1.1 - 2025-02-25
+
+* relinker: some typo
+* relinker: add CI for relinker func
+* relinker: relinker.py:76: SyntaxWarning: invalid escape sequence '('
+* relinker: incorrect IDF_VERSION for IDF 5.0
+
 ## v1.1.0 - 2025-01-16
 
 * relinker: support ESP32-C3 and SRAM optimization for flash-suspend

tools/cmake_utilities/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.1.0"
+version: "1.1.1"
 description: A collection of useful cmake utilities
 url: https://github.com/espressif/esp-iot-solution/tree/master/tools/cmake_utilities
 documentation: https://docs.espressif.com/projects/esp-iot-solution/zh_CN/latest/basic/cmake_utilities.html

tools/cmake_utilities/relinker.cmake

@@ -11,7 +11,7 @@ if(CONFIG_CU_RELINKER_ENABLE)
             message(FATAL_ERROR "Other targets are not supported.")
         endif()
 
-        set(idf_version "${CONFIG_IDF_INIT_VERSION}")
+        set(idf_version "$ENV{IDF_VERSION}")
         string(REGEX MATCH "^([0-9]+\\.[0-9]+)" version_prefix "${idf_version}")
 
         if(CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES)

tools/cmake_utilities/scripts/relinker/examples/iram_strip/esp32c2/5.0/object.csv

@@ -41,7 +41,7 @@ libesp_timer.a,system_time.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.di
 libesp_wifi.a,esp_adapter.c.obj,esp-idf/esp_wifi/CMakeFiles/__idf_esp_wifi.dir/esp32c2/esp_adapter.c.obj
 libfreertos.a,list.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/list.c.obj
 libfreertos.a,port.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/riscv/port.c.obj
-libfreertos.a,port_common.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/port_common.c.obj
+libfreertos.a,port_common.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/port_common.c.obj
 libfreertos.a,port_systick.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/port_systick.c.obj
 libfreertos.a,queue.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/queue.c.obj
 libfreertos.a,tasks.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/tasks.c.obj

tools/cmake_utilities/scripts/relinker/examples/iram_strip/esp32c2/5.3/object.csv

@@ -56,7 +56,7 @@ libheap.a,heap_caps.c.obj,esp-idf/heap/CMakeFiles/__idf_heap.dir/heap_caps.c.obj
 libheap.a,multi_heap.c.obj,./esp-idf/heap/CMakeFiles/__idf_heap.dir/multi_heap.c.obj
 liblog.a,log_freertos.c.obj,esp-idf/log/CMakeFiles/__idf_log.dir/log_freertos.c.obj
 liblog.a,log.c.obj,esp-idf/log/CMakeFiles/__idf_log.dir/log.c.obj
-libmbedcrypto.a,esp_mem.c.obj,esp-idf/mbedtls/mbedtls/library/CMakeFiles/mbedcrypto.dir/__/__/port/esp_mem.c.obj
+libmbedcrypto.a,esp_mem.c.obj,esp-idf/mbedtls/mbedtls/library/CMakeFiles/mbedcrypto.dir/$IDF_PATH/components/mbedtls/port/esp_mem.c.obj
 libnewlib.a,assert.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/assert.c.obj
 libnewlib.a,heap.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/heap.c.obj
 libnewlib.a,locks.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/locks.c.obj

tools/cmake_utilities/scripts/relinker/examples/iram_strip/esp32c3/5.0/object.csv

@@ -40,7 +40,7 @@ libesp_timer.a,system_time.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.di
 libesp_wifi.a,esp_adapter.c.obj,esp-idf/esp_wifi/CMakeFiles/__idf_esp_wifi.dir/esp32c3/esp_adapter.c.obj
 libfreertos.a,list.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/list.c.obj
 libfreertos.a,port.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/riscv/port.c.obj
-libfreertos.a,port_common.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/port_common.c.obj
+libfreertos.a,port_common.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/port_common.c.obj
 libfreertos.a,port_systick.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/port_systick.c.obj
 libfreertos.a,queue.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/queue.c.obj
 libfreertos.a,tasks.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/tasks.c.obj

tools/cmake_utilities/scripts/relinker/examples/iram_strip/esp32c3/5.3/object.csv

@@ -55,7 +55,7 @@ libheap.a,heap_caps.c.obj,esp-idf/heap/CMakeFiles/__idf_heap.dir/heap_caps.c.obj
 libheap.a,multi_heap.c.obj,./esp-idf/heap/CMakeFiles/__idf_heap.dir/multi_heap.c.obj
 liblog.a,log_freertos.c.obj,esp-idf/log/CMakeFiles/__idf_log.dir/log_freertos.c.obj
 liblog.a,log.c.obj,esp-idf/log/CMakeFiles/__idf_log.dir/log.c.obj
-libmbedcrypto.a,esp_mem.c.obj,esp-idf/mbedtls/mbedtls/library/CMakeFiles/mbedcrypto.dir/__/__/port/esp_mem.c.obj
+libmbedcrypto.a,esp_mem.c.obj,esp-idf/mbedtls/mbedtls/library/CMakeFiles/mbedcrypto.dir/$IDF_PATH/components/mbedtls/port/esp_mem.c.obj
 libnewlib.a,assert.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/assert.c.obj
 libnewlib.a,heap.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/heap.c.obj
 libnewlib.a,locks.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/locks.c.obj

tools/cmake_utilities/scripts/relinker/relinker.py

@@ -72,8 +72,8 @@ def __init__(self, file):
         self.libs_desc = ''
         self.libs = ''
         for line in lines:
-            if ') .iram1 EXCLUDE_FILE(*' in line and ') .iram1.*)' in l:
-                desc = '\(EXCLUDE_FILE\((.*)\) .iram1 '
+            if ') .iram1 EXCLUDE_FILE(*' in line and ') .iram1.*)' in line:
+                desc = r'\(EXCLUDE_FILE\((.*)\) .iram1 '
                 self.libs_desc = re.search(desc, line)[1]
                 self.libs = self.libs_desc.replace('*', '')
                 return