diff --git a/.gitmodules b/.gitmodules index 4a20536..296b01a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,9 @@ [submodule "contrib/KDMacTouchBar"] path = contrib/KDMacTouchBar url = https://github.com/KDAB/KDMacTouchBar.git -[submodule "monero"] - path = monero - url = https://git.wownero.com/wownero/wownero - branch = wowlet [submodule "contrib/quirc"] path = contrib/quirc url = https://github.com/dlbeer/quirc.git +[submodule "wownero"] + path = wownero + url = https://git.wownero.com/wownero/wownero.git diff --git a/CMakeLists.txt b/CMakeLists.txt index fcce773..288a265 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,10 +4,10 @@ project(wowlet) message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") set(THREADS_PREFER_PTHREAD_FLAG ON) -set(VERSION_MAJOR "2") -set(VERSION_MINOR "1") +set(VERSION_MAJOR "3") +set(VERSION_MINOR "0") set(VERSION_REVISION "0") -set(VERSION "beta-3") +set(VERSION "beta-4") option(FETCH_DEPS "Download dependencies if they are not found" ON) option(XMRIG "Include XMRig module" ON) @@ -57,7 +57,7 @@ if(STATIC) # manually set the unbound submodule the right commit that has the fix. # This only works with -DMANUAL_SUBMODULES=1 message(STATUS "applying unbound static build fix contrib/unbound_static.patch") - execute_process(COMMAND bash -c "git -C ${CMAKE_SOURCE_DIR}/monero/external/unbound apply ${CMAKE_SOURCE_DIR}/contrib/unbound_static.patch") + execute_process(COMMAND bash -c "git -C ${CMAKE_SOURCE_DIR}/wownero/external/unbound apply ${CMAKE_SOURCE_DIR}/contrib/unbound_static.patch") set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME ON) @@ -90,21 +90,19 @@ function (add_linker_flag_if_supported flag var) endfunction() find_package(Git) -if(GIT_FOUND) - message(STATUS "Initializing submodules") - execute_process(COMMAND git "submodule" "update" "--init" "--recursive") - execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero OUTPUT_VARIABLE _WOWNERO_HEAD OUTPUT_STRIP_TRAILING_WHITESPACE) - if(NOT _WOWNERO_HEAD STREQUAL WOWNERO_HEAD) - message(FATAL_ERROR "[submodule] Monero HEAD was at ${_WOWNERO_HEAD} but should be at ${WOWNERO_HEAD}") - else() - message(STATUS "[submodule] Wownero HEAD @ ${WOWNERO_HEAD}") - endif() -endif() - -add_subdirectory(monero) -set_property(TARGET wallet_merged PROPERTY FOLDER "monero") -get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH) -get_directory_property(UNBOUND_LIBRARY DIRECTORY "monero" DEFINITION UNBOUND_LIBRARY) +#if(GIT_FOUND) +# message(STATUS "Initializing submodules") +# execute_process(COMMAND git "submodule" "update" "--init" "--recursive") +# execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero OUTPUT_VARIABLE _WOWNERO_HEAD OUTPUT_STRIP_TRAILING_WHITESPACE) +# if(NOT _WOWNERO_HEAD STREQUAL WOWNERO_HEAD) +# message(FATAL_ERROR "[submodule] Wownero HEAD was at ${_WOWNERO_HEAD} but should be at ${WOWNERO_HEAD}") +# else() +# message(STATUS "[submodule] Wownero HEAD @ ${WOWNERO_HEAD}") +# endif() +#endif() + +add_subdirectory(wownero) +get_directory_property(ARCH_WIDTH DIRECTORY "wownero" DEFINITION ARCH_WIDTH) include(CMakePackageConfigHelpers) include(VersionMonero) diff --git a/cmake/GenVersion.cmake b/cmake/GenVersion.cmake index 220a03a..f2f83f7 100644 --- a/cmake/GenVersion.cmake +++ b/cmake/GenVersion.cmake @@ -35,7 +35,7 @@ if(RET) message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.") set(VERSIONTAG "unknown") set(VERSION_IS_RELEASE "false") - configure_file("monero/src/version.cpp.in" "${TO}") + configure_file("wownero/src/version.cpp.in" "${TO}") else() string(SUBSTRING ${COMMIT} 0 9 COMMIT) message(STATUS "You are currently on commit ${COMMIT}") @@ -61,5 +61,5 @@ else() set(VERSION_IS_RELEASE "false") endif() endif() - configure_file("monero/src/version.cpp.in" "${TO}") + configure_file("wownero/src/version.cpp.in" "${TO}") endif() \ No newline at end of file diff --git a/cmake/VersionMonero.cmake b/cmake/VersionMonero.cmake index 2ce459c..f7361c1 100644 --- a/cmake/VersionMonero.cmake +++ b/cmake/VersionMonero.cmake @@ -4,7 +4,7 @@ find_package(Git QUIET) # Check what commit we're on execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero) + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero) if(RET) # Something went wrong, set the version tag to -unknown @@ -37,7 +37,7 @@ endif() # Check latest tagged release execute_process(COMMAND "${GIT_EXECUTABLE}" describe --abbrev=0 RESULT_VARIABLE RET OUTPUT_VARIABLE TAG OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero) + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero) if(RET) message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.") diff --git a/monero b/monero deleted file mode 160000 index f611d5c..0000000 --- a/monero +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f611d5c9e32bc62f1735f6571b0bdb95cc020531 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9aa901f..e899ba7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -136,10 +136,10 @@ file(GLOB_RECURSE SRC_HEADERS *.h) target_include_directories(wowlet PUBLIC ${CMAKE_BINARY_DIR}/src/wowlet_autogen/include - ${CMAKE_SOURCE_DIR}/monero/include - ${CMAKE_SOURCE_DIR}/monero/src - ${CMAKE_SOURCE_DIR}/monero/external/easylogging++ - ${CMAKE_SOURCE_DIR}/monero/contrib/epee/include + ${CMAKE_SOURCE_DIR}/wownero/include + ${CMAKE_SOURCE_DIR}/wownero/src + ${CMAKE_SOURCE_DIR}/wownero/external/easylogging++ + ${CMAKE_SOURCE_DIR}/wownero/contrib/epee/include ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/daemon @@ -251,14 +251,9 @@ endif() # Link Wownero core libraries target_link_libraries(wowlet PUBLIC - wallet_merged - ${LMDB_LIBRARY} epee - ${UNBOUND_LIBRARY} - ${SODIUM_LIBRARY} + wallet_api easylogging - blockchain_db - hardforks ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} diff --git a/src/openpgp/CMakeLists.txt b/src/openpgp/CMakeLists.txt index 1c3f4ba..53e356b 100644 --- a/src/openpgp/CMakeLists.txt +++ b/src/openpgp/CMakeLists.txt @@ -16,5 +16,6 @@ target_include_directories(openpgp PUBLIC target_link_libraries(openpgp PUBLIC + epee ${GCRYPT_LIBRARY} ${GPG_ERROR_LIBRARY}) diff --git a/wownero b/wownero new file mode 160000 index 0000000..a5b93c8 --- /dev/null +++ b/wownero @@ -0,0 +1 @@ +Subproject commit a5b93c841409d3c2fb41b89989a0952e8a091d4e