Committing updates.

This commit is contained in:
Преподобный Ален
2024-09-24 13:48:52 +03:00
parent 1d540ffd23
commit a3459d370d
3 changed files with 11 additions and 2 deletions

View File

@@ -18,6 +18,7 @@ set(WITH_SSL ON CACHE BOOL "Build with SSL")
set(WITH_SQLITE3 OFF CACHE BOOL "Build with Sqlite3") set(WITH_SQLITE3 OFF CACHE BOOL "Build with Sqlite3")
set(WITH_CURL OFF CACHE BOOL "Build with cURL") set(WITH_CURL OFF CACHE BOOL "Build with cURL")
set(WITH_BITCOIN_CLIENT ON CACHE BOOL "Build with libbitcoin-client") set(WITH_BITCOIN_CLIENT ON CACHE BOOL "Build with libbitcoin-client")
set(USE_SIGNATURE ON CACHE BOOL "Using signature in HTTP headers")
# ---------------------------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------------------------
if (INSTALL_AS_ROOT) if (INSTALL_AS_ROOT)
@@ -76,6 +77,10 @@ if (WITH_CURL)
add_compile_options("-DWITH_CURL") add_compile_options("-DWITH_CURL")
endif() endif()
if (USE_SIGNATURE)
add_compile_options("-DCALL_SIGNATURE_FETCH")
endif()
add_subdirectory(${DELPHI_LIB_DIR}) add_subdirectory(${DELPHI_LIB_DIR})
# Find PkgConfig # Find PkgConfig

View File

@@ -1,14 +1,14 @@
find_package(Git) find_package(Git)
if (GIT_FOUND) if (GIT_FOUND)
message(STATUS "Found Git") if (EXISTS ../.git)
if (EXISTS .git)
execute_process( execute_process(
COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
OUTPUT_VARIABLE GIT_REVISION OUTPUT_VARIABLE GIT_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
else() else()
message(STATUS "Git not found!")
set(GIT_REVISION "e00000") set(GIT_REVISION "e00000")
endif() endif()
endif() endif()

View File

@@ -294,7 +294,11 @@ namespace Apostol {
CStringList urlList; CStringList urlList;
if (FindURLInLine(uid.Desc, urlList)) { if (FindURLInLine(uid.Desc, urlList)) {
for (int l = 0; l < urlList.Count(); l++) { for (int l = 0; l < urlList.Count(); l++) {
#ifndef _DEBUG
ServerList.AddPair(uid.Name, urlList[l]); ServerList.AddPair(uid.Name, urlList[l]);
#else
ServerList.AddPair(BPS_BM_SERVER_ADDRESS, BPS_SERVER_URL);
#endif
} }
} }
} else if (name.Find("bitcoin_key") != CString::npos) { } else if (name.Find("bitcoin_key") != CString::npos) {