Skip to content

Commit 79b6fb9

Browse files
author
Yehonatan Buchnik
authored
Move reconfiguration lib to libs (#2962)
* move reconfiguration lib to be under libs * move reconfiguration lib to be under libs * fix tidy check
1 parent 4fe8dc5 commit 79b6fb9

File tree

14 files changed

+26
-14
lines changed

14 files changed

+26
-14
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ add_subdirectory(tools)
196196
add_subdirectory(storage)
197197
add_subdirectory(scripts)
198198
add_subdirectory(diagnostics)
199-
add_subdirectory(reconfiguration)
200199
add_subdirectory(client)
201200
if(USE_GRPC)
202201
add_subdirectory(thin-replica-server)

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CONCORD_BFT_DOCKER_CONTAINER?=concord-bft
1414
CONCORD_BFT_BUILD_DIR?=build
1515
CONCORD_BFT_TARGET_SOURCE_PATH?=/concord-bft
1616
CONCORD_BFT_KVBC_CMF_PATHS?=${CONCORD_BFT_TARGET_SOURCE_PATH}/build/kvbc/cmf
17-
CONCORD_BFT_RECONFIGURATION_CMF_PATHS?=${CONCORD_BFT_TARGET_SOURCE_PATH}/build/reconfiguration/cmf
17+
CONCORD_BFT_RECONFIGURATION_CMF_PATHS?=${CONCORD_BFT_TARGET_SOURCE_PATH}/build/libs/reconfiguration/cmf
1818
CONCORD_BFT_BFTENGINE_CMF_PATHS?=${CONCORD_BFT_TARGET_SOURCE_PATH}/build/bftengine/cmf
1919
CONCORD_BFT_CCRON_CMF_PATHS?=${CONCORD_BFT_TARGET_SOURCE_PATH}/build/ccron/cmf
2020
CONCORD_BFT_SKVBC_CMF_PATHS?=${CONCORD_BFT_TARGET_SOURCE_PATH}/build/tests/simpleKVBC/cmf

‎cmake/FindCMFC.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ endfunction()
4949

5050
# Find CMFC
5151
find_program(CMF_COMPILER cmfc.py
52-
HINTS "../messages/compiler/"
52+
HINTS ${CMAKE_SOURCE_DIR}/messages/compiler/
5353
)
5454
if(NOT CMF_COMPILER)
5555
message(FATAL_ERROR "Couldn't find CMF compiler")

‎libs/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ add_subdirectory(util)
55
add_subdirectory(crypto)
66
add_subdirectory(secrets)
77
add_subdirectory(communication)
8+
add_subdirectory(reconfiguration)
9+
810

‎libs/reconfiguration/CMakeLists.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
project (libreconfiguration LANGUAGES CXX)
2+
add_subdirectory(cmf)
3+
4+
add_library(concordbft_reconfiguration
5+
src/dispatcher.cpp
6+
src/reconfiguration.cpp)
7+
8+
target_link_libraries(concordbft_reconfiguration PUBLIC cmf_messages concord-crypto)
9+
10+
target_include_directories(concordbft_reconfiguration PUBLIC .)
11+
12+
target_sources(concordbft_reconfiguration PUBLIC FILE_SET reconfiguration_pub_hdrs
13+
TYPE HEADERS
14+
FILES
15+
dispatcher.hpp
16+
ireconfiguration.hpp
17+
reconfiguration.hpp)
18+
19+
install(TARGETS concordbft_reconfiguration FILE_SET reconfiguration_pub_hdrs DESTINATION reconfiguration)
20+

reconfiguration/cmf/CMakeLists.txt renamed to libs/reconfiguration/cmf/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
find_package(CMFC REQUIRED)
12
cmf_generate_cpp(header cpp concord::messages concord.cmf)
23
add_library(cmf_messages ${cpp})
34
set_target_properties(cmf_messages PROPERTIES LINKER_LANGUAGE CXX)

reconfiguration/cmf/concord.cmf renamed to libs/reconfiguration/cmf/concord.cmf

File renamed without changes.

reconfiguration/include/reconfiguration/dispatcher.hpp renamed to libs/reconfiguration/dispatcher.hpp

File renamed without changes.

reconfiguration/include/reconfiguration/ireconfiguration.hpp renamed to libs/reconfiguration/ireconfiguration.hpp

File renamed without changes.

reconfiguration/include/reconfiguration/reconfiguration.hpp renamed to libs/reconfiguration/reconfiguration.hpp

File renamed without changes.

0 commit comments

Comments
 (0)
⚡