Skip to content
Snippets Groups Projects
Commit c4d2d8b4 authored by Aleksey Feoktistov's avatar Aleksey Feoktistov Committed by Roman Khlopkov
Browse files

features-5238

parent 3bdb85ae
No related branches found
No related tags found
2 merge requests!459Release 5.1,!398features-5238
...@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11) ...@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 5) SET( CPACK_PACKAGE_VERSION_MAJOR 5)
SET( CPACK_PACKAGE_VERSION_MINOR 1) SET( CPACK_PACKAGE_VERSION_MINOR 1)
SET( CPACK_PACKAGE_VERSION_PATCH 10) SET( CPACK_PACKAGE_VERSION_PATCH 11)
if (CMAKE_TARGET_ARCH MATCHES arm) if (CMAKE_TARGET_ARCH MATCHES arm)
SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}") SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}")
...@@ -48,15 +48,15 @@ endif() ...@@ -48,15 +48,15 @@ endif()
if (WIN32) if (WIN32)
set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange") set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
elseif(BSD) elseif(BSD)
set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange") set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
elseif(DARWIN) elseif(DARWIN)
set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange") set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
elseif(ANDROID) elseif(ANDROID)
set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange") set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
elseif(LINUX) elseif(LINUX)
set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn") set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
endif() endif()
add_subdirectory(cellframe-sdk) add_subdirectory(cellframe-sdk)
......
Subproject commit 48c778917accea702f76a61b3c1ff18159616750 Subproject commit 5a0ba58ea6dbbfd11d6659150b1589184b62ec23
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
#include "dap_chain_cs_blocks.h" #include "dap_chain_cs_blocks.h"
#include "dap_chain_cs_block_poa.h" #include "dap_chain_cs_block_poa.h"
#include "dap_chain_cs_block_pos.h" #include "dap_chain_cs_block_pos.h"
#include "dap_chain_cs_block_ton.h"
#include "dap_chain_cs_dag.h" #include "dap_chain_cs_dag.h"
#include "dap_chain_cs_dag_poa.h" #include "dap_chain_cs_dag_poa.h"
#include "dap_chain_cs_dag_pos.h" #include "dap_chain_cs_dag_pos.h"
...@@ -341,6 +342,11 @@ int main( int argc, const char **argv ) ...@@ -341,6 +342,11 @@ int main( int argc, const char **argv )
return -64; return -64;
} }
if (dap_chain_cs_block_ton_init() != 0) {
log_it(L_CRITICAL,"Can't init dap chain blocks consensus TON module");
return -69;
}
if(dap_chain_gdb_init() != 0) { if(dap_chain_gdb_init() != 0) {
log_it(L_CRITICAL, "Can't init dap chain gdb module"); log_it(L_CRITICAL, "Can't init dap chain gdb module");
return -71; return -71;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment