From a6359a65034fa4d61a0b5ae63fc21b4442dfc0ca Mon Sep 17 00:00:00 2001 From: firstcryptoman Date: Sun, 19 Mar 2023 16:18:54 +0400 Subject: [PATCH] Config fixes --- CMakeLists.txt | 1 - ci_tools_atomic_dex/ci_scripts/windows_script.ps1 | 7 +++++++ cmake/install/windows/windows_post_install.cmake | 2 +- src/core/atomicdex/services/mm2/mm2.service.cpp | 14 +++++++------- vcpkg.json | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index edf592568b..4dbf66bc0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,6 @@ else () configure_file(${mm2_SOURCE_DIR}/mm2.exe ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/${DEX_API}.exe COPYONLY) configure_file(${mm2_SOURCE_DIR}/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY) configure_file(${mm2_SOURCE_DIR}/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY) - file(COPY ${jl777-coins_SOURCE_DIR}/icons/ DESTINATION ${mm2_SOURCE_DIR}/bin/atomic_defi_design/assets/images/coins/) endif () add_subdirectory(vendor/antara-gaming_sdk/modules) diff --git a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 index 3f7d4d94f4..c3b07f0f79 100644 --- a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 +++ b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 @@ -14,9 +14,16 @@ scoop cache rm git scoop cache rm cmake scoop cache rm ninja scoop cache rm llvm + $Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\$Env:QT_VERSION\msvc2019_64" $Env:QT_ROOT = "C:\Qt" + +git clone https://github.com/KomodoPlatform/coins/ -b master +mkdir -p atomic_defi_design\assets\images\coins +Get-Item -Path "coins\icons\*.png" | Move-Item -Destination "atomic_defi_design\assets\images\coins" + mkdir build cd build + cmake -DCMAKE_BUILD_TYPE="$Env:CMAKE_BUILD_TYPE" -GNinja ../ ninja install diff --git a/cmake/install/windows/windows_post_install.cmake b/cmake/install/windows/windows_post_install.cmake index 182391f249..a477153535 100644 --- a/cmake/install/windows/windows_post_install.cmake +++ b/cmake/install/windows/windows_post_install.cmake @@ -108,4 +108,4 @@ file(COPY ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/${DEX_PROJEC message(STATUS "Contents of folder: ls ${TARGET_APP_PATH}") execute_process(COMMAND ls "${TARGET_APP_PATH}") -message(STATUS "===== Windows Post Install Complete =====") \ No newline at end of file +message(STATUS "===== Windows Post Install Complete =====") diff --git a/src/core/atomicdex/services/mm2/mm2.service.cpp b/src/core/atomicdex/services/mm2/mm2.service.cpp index 3137c3ee49..49250a8fa6 100644 --- a/src/core/atomicdex/services/mm2/mm2.service.cpp +++ b/src/core/atomicdex/services/mm2/mm2.service.cpp @@ -63,7 +63,7 @@ namespace SPDLOG_INFO("There is a precedent configuration file, upgrading the new one with precedent settings"); //! Old cfg to ifs - LOG_PATH("opening file: {}", precedent_version_cfg_path); + LOG_PATH("opening previous version coins file: {}", precedent_version_cfg_path); QFile ifs; ifs.setFileName(atomic_dex::std_path_to_qstring(precedent_version_cfg_path)); ifs.open(QIODevice::Text | QIODevice::ReadOnly); @@ -72,7 +72,7 @@ namespace //! New cfg to ifs std::filesystem::path actual_version_filepath = cfg_path / (std::string(atomic_dex::get_raw_version()) + "-coins."s + wallet_name + ".json"s); - LOG_PATH("opening file: {}", actual_version_filepath); + LOG_PATH("opening new version coins file: {}", actual_version_filepath); QFile actual_version_ifs; actual_version_ifs.setFileName(atomic_dex::std_path_to_qstring(actual_version_filepath)); actual_version_ifs.open(QIODevice::Text | QIODevice::ReadOnly); @@ -97,13 +97,13 @@ namespace } } - LOG_PATH("closing file: {}", precedent_version_cfg_path); + LOG_PATH("closing old version coins file: {}", precedent_version_cfg_path); ifs.close(); - LOG_PATH("closing file: {}", actual_version_filepath); + LOG_PATH("closing new version coins file: {}", actual_version_filepath); actual_version_ifs.close(); //! Write contents - LOG_PATH("opening file: {}", actual_version_filepath); + LOG_PATH("opening new version file: {}", actual_version_filepath); QFile ofs; ofs.setFileName(atomic_dex::std_path_to_qstring(actual_version_filepath)); ofs.open(QIODevice::Text | QIODevice::WriteOnly); @@ -116,7 +116,7 @@ namespace { SPDLOG_ERROR("error: {}", ec.message()); } - LOG_PATH("closing file: {}", actual_version_filepath); + LOG_PATH("closing new version file: {}", actual_version_filepath); ofs.close(); } } @@ -2488,4 +2488,4 @@ namespace atomic_dex { update_coin_status(this->m_current_wallet_name, {ticker}, status, m_coins_informations, m_coin_cfg_mutex, "is_segwit_on"); } -} // namespace atomic_dex +} // namespace atomic_dex \ No newline at end of file diff --git a/vcpkg.json b/vcpkg.json index 040a73da17..7aa536cca7 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "atomicdex-desktop", - "version-string": "0.5.5", + "version-string": "0.5.7", "dependencies": [ "entt", "boost-multiprecision",