From b9f464c827ee7c5075c58699c12f4d2b79e6efb7 Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Sat, 23 Nov 2024 13:32:32 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20cpm=20from=200.?= =?UTF-8?q?38.2=20to=200.40.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to fix deprecation warnings CMake Warning (dev) at /opt/homebrew/share/cmake/Modules/FetchContent.cmake:1953 (message): Calling FetchContent_Populate(cicd-repo-infrastructure) is deprecated, call FetchContent_MakeAvailable(cicd-repo-infrastructure) instead. Policy CMP0169 can be set to OLD to allow FetchContent_Populate(cicd-repo-infrastructure) to be called directly for now, but the ability to call it with declared details will be removed completely in a future version. Signed-off-by: Michael Krasnyk --- cmake/get_cpm.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/get_cpm.cmake b/cmake/get_cpm.cmake index 4b28edbf..163609c0 100644 --- a/cmake/get_cpm.cmake +++ b/cmake/get_cpm.cmake @@ -1,4 +1,4 @@ -set(CPM_DOWNLOAD_VERSION 0.38.2) +set(CPM_DOWNLOAD_VERSION 0.40.2) if(CPM_SOURCE_CACHE) set(CPM_DOWNLOAD_LOCATION From fb3cc2793fd00d1b4c6d3fb25c966c60a831395e Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Sat, 23 Nov 2024 13:36:49 +0100 Subject: [PATCH 2/2] :bug: Allow empty prefix in undefined symbols lines This should allow parsing strings like ``` compile-time-init-build/build/test/log/CMakeFiles/catalog2_lib.dir/catalog2a_lib.cpp.o: __Unwind_Resume unsigned int module>>() unsigned int catalog, char, (char)68, (char)32, (char)115, (char)116, (char)114, (char)105, (char)110, (char)103, (char)32, (char)119, (char)105, (char)116, (char)104, (char)32, (char)123, (char)125, (char)32, (char)97, (char)110, (char)100, (char)32, (char)123, (char)125, (char)32, (char)112, (char)108, (char)97, (char)99, (char)101, (char)104, (char)111, (char)108, (char)100, (char)101, (char)114>>>() std::terminate() ___cxa_begin_catch ___gxx_personality_v0 ___stack_chk_fail ___stack_chk_guard _log_calls compile-time-init-build/build/test/log/CMakeFiles/catalog2_lib.dir/catalog2b_lib.cpp.o: __Unwind_Resume unsigned int module>>() unsigned int catalog, char, (char)69, (char)32, (char)115, (char)116, (char)114, (char)105, (char)110, (char)103, (char)32, (char)119, (char)105, (char)116, (char)104, (char)32, (char)123, (char)125, (char)32, (char)112, (char)108, (char)97, (char)99, (char)101, (char)104, (char)111, (char)108, (char)100, (char)101, (char)114>>>() std::terminate() ___cxa_begin_catch ___gxx_personality_v0 ___stack_chk_fail ___stack_chk_guard _log_calls ``` Signed-off-by: Michael Krasnyk --- tools/gen_str_catalog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gen_str_catalog.py b/tools/gen_str_catalog.py index 74f02615..1a5ccdf1 100755 --- a/tools/gen_str_catalog.py +++ b/tools/gen_str_catalog.py @@ -93,7 +93,7 @@ def stable_module_key(module: str): def read_input(filenames: list[str], stable_ids): - line_re = re.compile(r"^.+?(unsigned int (catalog|module)<(.+?)>\(\))$") + line_re = re.compile(r"^.*(unsigned int (catalog|module)<(.+?)>\(\))$") def read_file(filename): with open(filename, "r") as f: