From 68e57b8ac41bf0e5412a4e54bca79100db1d0fa0 Mon Sep 17 00:00:00 2001 From: Aster Seker Date: Wed, 23 Sep 2026 20:16:36 +0300 Subject: [PATCH] build(deps): refresh bundled dependencies Update Kurlyk, TimeShield, and log-it-cpp dependencies, pin log-it-cpp to stable v1.0.2, and refresh the Windows curl/OpenSSL snapshots. Canonicalize migrated submodule URLs to the LimiNode organization and adapt the TimeShield include layout. --- .gitmodules | 22 ++++++++-------- external/CMakeLists.txt | 26 +++++++++++-------- external/curl-8.11.0_1-win64-mingw | 1 - external/curl-8.22.0_1-win64-mingw | 1 + external/kurlyk | 2 +- external/log-it-cpp | 2 +- external/openssl-win64-v3.4.0 | 1 - external/openssl-win64-v3.5.8 | 1 + external/time-shield-cpp | 2 +- .../data/trading/TradeTimeZone.hpp | 10 +++---- .../storages/SignalRecordDB/detail.hpp | 2 +- .../storages/TradeRecordDB/detail.hpp | 2 +- 12 files changed, 38 insertions(+), 34 deletions(-) delete mode 160000 external/curl-8.11.0_1-win64-mingw create mode 160000 external/curl-8.22.0_1-win64-mingw delete mode 160000 external/openssl-win64-v3.4.0 create mode 160000 external/openssl-win64-v3.5.8 diff --git a/.gitmodules b/.gitmodules index c75d77b0..7a3cb90b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,18 @@ [submodule "external/kurlyk"] path = external/kurlyk - url = https://github.com/NewYaroslav/kurlyk.git + url = https://github.com/LimiNode/kurlyk.git [submodule "external/asio"] path = external/asio url = https://github.com/chriskohlhoff/asio.git -[submodule "external/openssl-win64-v3.4.0"] - path = external/openssl-win64-v3.4.0 - url = https://github.com/NewYaroslav/openssl-win64-v3.4.0.git -[submodule "external/curl-8.11.0_1-win64-mingw"] - path = external/curl-8.11.0_1-win64-mingw - url = https://github.com/NewYaroslav/curl-8.11.0_1-win64-mingw.git +[submodule "external/openssl-win64-v3.5.8"] + path = external/openssl-win64-v3.5.8 + url = https://github.com/LimiNode/openssl-win64-v3.5.8.git +[submodule "external/curl-8.22.0_1-win64-mingw"] + path = external/curl-8.22.0_1-win64-mingw + url = https://github.com/LimiNode/curl-8.22.0_1-win64-mingw.git [submodule "external/log-it-cpp"] path = external/log-it-cpp - url = https://github.com/NewYaroslav/log-it-cpp.git + url = https://github.com/LimiNode/log-it-cpp.git [submodule "external/Simple-WebSocket-Server"] path = external/Simple-WebSocket-Server url = https://gitlab.com/eidheim/Simple-WebSocket-Server.git @@ -21,10 +21,10 @@ url = https://github.com/nlohmann/json.git [submodule "external/time-shield-cpp"] path = external/time-shield-cpp - url = https://github.com/NewYaroslav/time-shield-cpp.git + url = https://github.com/LimiNode/time-shield-cpp.git [submodule "external/SimpleNamedPipe"] path = external/SimpleNamedPipe - url = https://github.com/NewYaroslav/SimpleNamedPipe.git + url = https://github.com/LimiNode/SimpleNamedPipe.git [submodule "external/AES"] path = external/AES url = https://github.com/SergeyBel/AES.git @@ -33,7 +33,7 @@ url = https://github.com/google/googletest.git [submodule "external/mdbx-containers"] path = external/mdbx-containers - url = https://github.com/NewYaroslav/mdbx-containers.git + url = https://github.com/LimiNode/mdbx-containers.git [submodule "external/libmdbx"] path = external/libmdbx url = https://github.com/Mithril-mine/libmdbx.git diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 0c123345..9bd70703 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -43,24 +43,28 @@ include(${EXTERNAL_CMAKE_DIR}/libmdbx-wrapper.cmake) if(WIN32) # openssl -install_headers_to_include(openssl ${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.4.0/include/openssl) -install_static_libs_to_lib(${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.4.0/lib/VC/x64/MT) -install_runtime_dlls_to_bin(${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.4.0/bin) +install_headers_to_include(openssl ${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.5.8/include/openssl) +# The 3.5.8 snapshot ships its x64 import/static libraries in the MD tree. +install_static_libs_to_lib(${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.5.8/lib/VC/x64/MD) +install_runtime_dlls_to_bin(${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.5.8/bin) # curl -install_headers_to_include(curl ${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/include/curl) +install_headers_to_include(curl ${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/include/curl) -file(GLOB CURL_STATIC_LIBS "${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/lib/*.a") +file(GLOB CURL_STATIC_LIBS "${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/lib/*.a") # Удаляем libssl.a и libcrypto.a list(FILTER CURL_STATIC_LIBS EXCLUDE REGEX ".*libssl.a$") list(FILTER CURL_STATIC_LIBS EXCLUDE REGEX ".*libcrypto.a$") install_lib_files_to_lib(${CURL_STATIC_LIBS}) -# install_static_libs_to_lib(${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/lib) -install_runtime_dlls_to_bin(${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/bin) -file(COPY - ${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/bin/curl-ca-bundle.crt - DESTINATION ${OPTIONX_DEPS_OUTPUT_DIR}/bin -) +# install_static_libs_to_lib(${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/lib) +install_runtime_dlls_to_bin(${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/bin) +set(CURL_CA_BUNDLE "${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/bin/curl-ca-bundle.crt") +if(EXISTS "${CURL_CA_BUNDLE}") + file(COPY + "${CURL_CA_BUNDLE}" + DESTINATION ${OPTIONX_DEPS_OUTPUT_DIR}/bin + ) +endif() else() # Non-Windows builds use system OpenSSL/CURL targets from the root # tests/examples link configuration. diff --git a/external/curl-8.11.0_1-win64-mingw b/external/curl-8.11.0_1-win64-mingw deleted file mode 160000 index 840e56c6..00000000 --- a/external/curl-8.11.0_1-win64-mingw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 840e56c6b2a11076ad5d15526bd2d4cedc8cdb9d diff --git a/external/curl-8.22.0_1-win64-mingw b/external/curl-8.22.0_1-win64-mingw new file mode 160000 index 00000000..9c73074a --- /dev/null +++ b/external/curl-8.22.0_1-win64-mingw @@ -0,0 +1 @@ +Subproject commit 9c73074a9b33bf4e4bff3ba4269f93bb7c3e7f28 diff --git a/external/kurlyk b/external/kurlyk index fe2698de..7303f53d 160000 --- a/external/kurlyk +++ b/external/kurlyk @@ -1 +1 @@ -Subproject commit fe2698dec259a7e417883e1f41985ed21ec28b55 +Subproject commit 7303f53d9048da80cfd7f4e7e79b7f23d842199c diff --git a/external/log-it-cpp b/external/log-it-cpp index 0ebf5463..659c38ee 160000 --- a/external/log-it-cpp +++ b/external/log-it-cpp @@ -1 +1 @@ -Subproject commit 0ebf5463a13159fb72482551f27d2838aae4eed3 +Subproject commit 659c38eef86cb3cbab448fb76852641830a89430 diff --git a/external/openssl-win64-v3.4.0 b/external/openssl-win64-v3.4.0 deleted file mode 160000 index 635bbfe8..00000000 --- a/external/openssl-win64-v3.4.0 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 635bbfe81230fcf4c3579f9e9f13fdeff71e8d70 diff --git a/external/openssl-win64-v3.5.8 b/external/openssl-win64-v3.5.8 new file mode 160000 index 00000000..01e30963 --- /dev/null +++ b/external/openssl-win64-v3.5.8 @@ -0,0 +1 @@ +Subproject commit 01e3096342bfd6433ca2244eebda04f702b5f3c9 diff --git a/external/time-shield-cpp b/external/time-shield-cpp index e9d99727..d5f1203f 160000 --- a/external/time-shield-cpp +++ b/external/time-shield-cpp @@ -1 +1 @@ -Subproject commit e9d99727d705b263636b305d9bddfb4da0c6af0e +Subproject commit d5f1203f24341e4146af35d5bb36e762056d181f diff --git a/include/optionx_cpp/data/trading/TradeTimeZone.hpp b/include/optionx_cpp/data/trading/TradeTimeZone.hpp index 0501ba37..97b3b35f 100644 --- a/include/optionx_cpp/data/trading/TradeTimeZone.hpp +++ b/include/optionx_cpp/data/trading/TradeTimeZone.hpp @@ -7,11 +7,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace optionx { diff --git a/include/optionx_cpp/storages/SignalRecordDB/detail.hpp b/include/optionx_cpp/storages/SignalRecordDB/detail.hpp index 70bd646c..73cbe41e 100644 --- a/include/optionx_cpp/storages/SignalRecordDB/detail.hpp +++ b/include/optionx_cpp/storages/SignalRecordDB/detail.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include "data.hpp" diff --git a/include/optionx_cpp/storages/TradeRecordDB/detail.hpp b/include/optionx_cpp/storages/TradeRecordDB/detail.hpp index f6729849..05aa1e71 100644 --- a/include/optionx_cpp/storages/TradeRecordDB/detail.hpp +++ b/include/optionx_cpp/storages/TradeRecordDB/detail.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include "data.hpp"