Commit a0808461 authored by TyphooN's avatar TyphooN

Merge branch 'ty/remove-export-import' into 'master'

Remove blockchain-export / import as they do not support uncle blocks.

See merge request !19
parents 4a7b3629 84a9db50
......@@ -14,7 +14,7 @@ RUN groupadd -g 1000 solo && useradd -r -u 1000 -g solo solo
RUN cmake . && make && mv libg* /usr/lib/
ARG SOLO_VERSION=1.0.4.1
ARG SOLO_VERSION=1.0.4.2
RUN echo $SOLO_VERSION
ARG GIT_SOURCE=https://gitlab.com/solo-project/solo.git
ARG GIT_BRANCH=master
......
......@@ -37,37 +37,6 @@ if(PER_BLOCK_CHECKPOINT)
set(blocksdat "blocksdat.o")
endif()
set(blockchain_import_sources
blockchain_import.cpp
bootstrap_file.cpp
blocksdat_file.cpp
)
set(blockchain_import_private_headers
bootstrap_file.h
blocksdat_file.h
bootstrap_serialization.h
)
monero_private_headers(blockchain_import
${blockchain_import_private_headers})
set(blockchain_export_sources
blockchain_export.cpp
bootstrap_file.cpp
blocksdat_file.cpp
)
set(blockchain_export_private_headers
bootstrap_file.h
blocksdat_file.h
bootstrap_serialization.h
)
monero_private_headers(blockchain_export
${blockchain_export_private_headers})
set(blockchain_blackball_sources
blockchain_blackball.cpp
)
......@@ -90,59 +59,9 @@ set(blockchain_usage_private_headers)
monero_private_headers(blockchain_usage
${blockchain_usage_private_headers})
monero_add_executable(blockchain_import
${blockchain_import_sources}
${blockchain_import_private_headers}
${blocksdat})
target_link_libraries(blockchain_import
PRIVATE
cryptonote_core
blockchain_db
p2p
version
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES})
if(ARCH_WIDTH)
target_compile_definitions(blockchain_import
PUBLIC -DARCH_WIDTH=${ARCH_WIDTH})
endif()
set_property(TARGET blockchain_import
PROPERTY
OUTPUT_NAME "solo-blockchain-import")
install(TARGETS blockchain_import DESTINATION bin)
monero_add_executable(blockchain_export
${blockchain_export_sources}
${blockchain_export_private_headers})
target_link_libraries(blockchain_export
PRIVATE
cryptonote_core
blockchain_db
p2p
version
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES})
set_property(TARGET blockchain_export
PROPERTY
OUTPUT_NAME "solo-blockchain-export")
install(TARGETS blockchain_export DESTINATION bin)
monero_add_executable(blockchain_blackball
${blockchain_blackball_sources}
${blockchain_blackball_private_headers})
monero_add_executable(blockchain_blackball
${blockchain_blackball_sources}
${blockchain_blackball_private_headers})
target_link_libraries(blockchain_blackball
PRIVATE
......
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
#define DEF_MONERO_VERSION "1.0.4.1"
#define DEF_MONERO_VERSION "1.0.4.2"
#define DEF_MONERO_RELEASE_NAME "Han"
#define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment