From 31091362ee165187db13bb7bc81f0c4b93dd33b9 Mon Sep 17 00:00:00 2001 From: gruve-p Date: Sat, 31 Aug 2024 14:10:08 +0200 Subject: [PATCH] Fixes after merging upstream --- CMakeLists.txt | 66 ++++++++++++++--------------- cmake/module/AddBoostIfNeeded.cmake | 4 +- cmake/module/FindBerkeleyDB.cmake | 2 +- cmake/module/GenerateSetupNsi.cmake | 16 +++---- cmake/module/Maintenance.cmake | 44 +++++++++---------- cmake/script/Coverage.cmake | 12 +++--- cmake/tests.cmake | 4 +- doc/build-windows-msvc.md | 14 +++--- 8 files changed, 81 insertions(+), 81 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d89e93c2d6e4..533a509d331d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ endif() #============================= # Project / Package metadata #============================= -set(PACKAGE_NAME "Bitcoin Core") +set(PACKAGE_NAME "Groestlcoin Core") set(CLIENT_VERSION_MAJOR 28) set(CLIENT_VERSION_MINOR 99) set(CLIENT_VERSION_BUILD 0) @@ -48,8 +48,8 @@ set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES project(BitcoinCore VERSION ${CLIENT_VERSION_MAJOR}.${CLIENT_VERSION_MINOR}.${CLIENT_VERSION_BUILD} - DESCRIPTION "Bitcoin client software" - HOMEPAGE_URL "https://bitcoincore.org/" + DESCRIPTION "Groestlcoin client software" + HOMEPAGE_URL "https://groestlcoin.org/" LANGUAGES NONE ) @@ -60,7 +60,7 @@ endif() set(COPYRIGHT_HOLDERS "The %s developers") set(COPYRIGHT_HOLDERS_FINAL "The ${PACKAGE_NAME} developers") -set(PACKAGE_BUGREPORT "https://github.com/bitcoin/bitcoin/issues") +set(PACKAGE_BUGREPORT "https://github.com/groestlcoin/groestlcoin/issues") #============================= # Language setup @@ -82,16 +82,16 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/module) #============================= include(CMakeDependentOption) # When adding a new option, end the with a full stop for consistency. -option(BUILD_DAEMON "Build bitcoind executable." ON) -option(BUILD_GUI "Build bitcoin-qt executable." OFF) -option(BUILD_CLI "Build bitcoin-cli executable." ON) +option(BUILD_DAEMON "Build groestlcoind executable." ON) +option(BUILD_GUI "Build groestlcoin-qt executable." OFF) +option(BUILD_CLI "Build groestlcoin-cli executable." ON) -option(BUILD_TESTS "Build test_bitcoin executable." ON) -option(BUILD_TX "Build bitcoin-tx executable." ${BUILD_TESTS}) -option(BUILD_UTIL "Build bitcoin-util executable." ${BUILD_TESTS}) +option(BUILD_TESTS "Build test_groestlcoin executable." ON) +option(BUILD_TX "Build groestlcoin-tx executable." ${BUILD_TESTS}) +option(BUILD_UTIL "Build groestlcoin-util executable." ${BUILD_TESTS}) -option(BUILD_UTIL_CHAINSTATE "Build experimental bitcoin-chainstate executable." OFF) -option(BUILD_KERNEL_LIB "Build experimental bitcoinkernel library." ${BUILD_UTIL_CHAINSTATE}) +option(BUILD_UTIL_CHAINSTATE "Build experimental groestlcoin-chainstate executable." OFF) +option(BUILD_KERNEL_LIB "Build experimental groestlcoinkernel library." ${BUILD_UTIL_CHAINSTATE}) option(ENABLE_WALLET "Enable wallet." ON) option(WITH_SQLITE "Enable SQLite wallet support." ${ENABLE_WALLET}) @@ -106,13 +106,13 @@ if(WITH_SQLITE) set(ENABLE_WALLET ON) endif() option(WITH_BDB "Enable Berkeley DB (BDB) wallet support." OFF) -cmake_dependent_option(WARN_INCOMPATIBLE_BDB "Warn when using a Berkeley DB (BDB) version other than 4.8." ON "WITH_BDB" OFF) +cmake_dependent_option(WARN_INCOMPATIBLE_BDB "Warn when using a Berkeley DB (BDB) version other than 5.3." ON "WITH_BDB" OFF) if(WITH_BDB) - find_package(BerkeleyDB 4.8 MODULE REQUIRED) + find_package(BerkeleyDB 5.3 MODULE REQUIRED) set(USE_BDB ON) set(ENABLE_WALLET ON) - if(NOT BerkeleyDB_VERSION VERSION_EQUAL 4.8) - message(WARNING "Found Berkeley DB (BDB) other than 4.8.\n" + if(NOT BerkeleyDB_VERSION VERSION_EQUAL 5.3) + message(WARNING "Found Berkeley DB (BDB) other than 5.3.\n" "BDB (legacy) wallets opened by this build will not be portable!" ) if(WARN_INCOMPATIBLE_BDB) @@ -122,7 +122,7 @@ if(WITH_BDB) endif() endif() endif() -cmake_dependent_option(BUILD_WALLET_TOOL "Build bitcoin-wallet tool." ${BUILD_TESTS} "ENABLE_WALLET" OFF) +cmake_dependent_option(BUILD_WALLET_TOOL "Build groestlcoin-wallet tool." ${BUILD_TESTS} "ENABLE_WALLET" OFF) option(ENABLE_HARDENING "Attempt to harden the resulting executables." ON) option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting executables." OFF) @@ -172,7 +172,7 @@ endif() cmake_dependent_option(WITH_DBUS "Enable DBus support." ON "CMAKE_SYSTEM_NAME STREQUAL \"Linux\" AND BUILD_GUI" OFF) -option(WITH_MULTIPROCESS "Build multiprocess bitcoin-node and bitcoin-gui executables in addition to monolithic bitcoind and bitcoin-qt executables. Requires libmultiprocess library. Experimental." OFF) +option(WITH_MULTIPROCESS "Build multiprocess groestlcoin-node and groestlcoin-gui executables in addition to monolithic groestlcoind and groestlcoin-qt executables. Requires libmultiprocess library. Experimental." OFF) if(WITH_MULTIPROCESS) find_package(Libmultiprocess COMPONENTS Lib) find_package(LibmultiprocessNative COMPONENTS Bin @@ -180,7 +180,7 @@ if(WITH_MULTIPROCESS) ) endif() -cmake_dependent_option(BUILD_GUI_TESTS "Build test_bitcoin-qt executable." ON "BUILD_GUI;BUILD_TESTS" OFF) +cmake_dependent_option(BUILD_GUI_TESTS "Build test_groestlcoin-qt executable." ON "BUILD_GUI;BUILD_TESTS" OFF) if(BUILD_GUI) set(qt_components Core Gui Widgets LinguistTools) if(ENABLE_WALLET) @@ -199,7 +199,7 @@ if(BUILD_GUI) unset(qt_components) endif() -option(BUILD_BENCH "Build bench_bitcoin executable." OFF) +option(BUILD_BENCH "Build bench_groestlcoin executable." OFF) option(BUILD_FUZZ_BINARY "Build fuzz binary." OFF) cmake_dependent_option(BUILD_FOR_FUZZING "Build for fuzzing. Enabling this will disable all other targets and override BUILD_FUZZ_BINARY." OFF "NOT MSVC" OFF) @@ -602,21 +602,21 @@ message("\n") message("Configure summary") message("=================") message("Executables:") -message(" bitcoind ............................ ${BUILD_DAEMON}") -message(" bitcoin-node (multiprocess) ......... ${WITH_MULTIPROCESS}") -message(" bitcoin-qt (GUI) .................... ${BUILD_GUI}") +message(" groestlcoind ............................ ${BUILD_DAEMON}") +message(" groestlcoin-node (multiprocess) ......... ${WITH_MULTIPROCESS}") +message(" groestlcoin-qt (GUI) .................... ${BUILD_GUI}") if(BUILD_GUI AND WITH_MULTIPROCESS) set(bitcoin_gui_status ON) else() set(bitcoin_gui_status OFF) endif() -message(" bitcoin-gui (GUI, multiprocess) ..... ${bitcoin_gui_status}") -message(" bitcoin-cli ......................... ${BUILD_CLI}") -message(" bitcoin-tx .......................... ${BUILD_TX}") -message(" bitcoin-util ........................ ${BUILD_UTIL}") -message(" bitcoin-wallet ...................... ${BUILD_WALLET_TOOL}") -message(" bitcoin-chainstate (experimental) ... ${BUILD_UTIL_CHAINSTATE}") -message(" libbitcoinkernel (experimental) ..... ${BUILD_KERNEL_LIB}") +message(" groestlcoin-gui (GUI, multiprocess) ..... ${bitcoin_gui_status}") +message(" groestlcoin-cli ......................... ${BUILD_CLI}") +message(" groestlcoin-tx .......................... ${BUILD_TX}") +message(" groestlcoin-util ........................ ${BUILD_UTIL}") +message(" groestlcoin-wallet ...................... ${BUILD_WALLET_TOOL}") +message(" groestlcoin-chainstate (experimental) ... ${BUILD_UTIL_CHAINSTATE}") +message(" libgroestlcoinkernel (experimental) ..... ${BUILD_KERNEL_LIB}") message("Optional features:") message(" wallet support ...................... ${ENABLE_WALLET}") if(ENABLE_WALLET) @@ -632,9 +632,9 @@ message(" USDT tracing ........................ ${WITH_USDT}") message(" QR code (GUI) ....................... ${WITH_QRENCODE}") message(" DBus (GUI, Linux only) .............. ${WITH_DBUS}") message("Tests:") -message(" test_bitcoin ........................ ${BUILD_TESTS}") -message(" test_bitcoin-qt ..................... ${BUILD_GUI_TESTS}") -message(" bench_bitcoin ....................... ${BUILD_BENCH}") +message(" test_groestlcoin ........................ ${BUILD_TESTS}") +message(" test_groestlcoin-qt ..................... ${BUILD_GUI_TESTS}") +message(" bench_groestlcoin ....................... ${BUILD_BENCH}") message(" fuzz binary ......................... ${BUILD_FUZZ_BINARY}") message("") if(CMAKE_CROSSCOMPILING) diff --git a/cmake/module/AddBoostIfNeeded.cmake b/cmake/module/AddBoostIfNeeded.cmake index 89603ecd6155d..efb3464957353 100644 --- a/cmake/module/AddBoostIfNeeded.cmake +++ b/cmake/module/AddBoostIfNeeded.cmake @@ -8,7 +8,7 @@ function(add_boost_if_needed) Boost. Therefore, a proper check will be appropriate here. Implementation notes: - Although only Boost headers are used to build Bitcoin Core, + Although only Boost headers are used to build Groestlcoin Core, we still leverage a standard CMake's approach to handle dependencies, i.e., the Boost::headers "library". A command target_link_libraries(target PRIVATE Boost::headers) @@ -71,7 +71,7 @@ function(add_boost_if_needed) include(CheckIncludeFileCXX) check_include_file_cxx(boost/test/included/unit_test.hpp HAVE_BOOST_INCLUDED_UNIT_TEST_H) if(NOT HAVE_BOOST_INCLUDED_UNIT_TEST_H) - message(FATAL_ERROR "Building test_bitcoin executable requested but boost/test/included/unit_test.hpp header not available.") + message(FATAL_ERROR "Building test_groestlcoin executable requested but boost/test/included/unit_test.hpp header not available.") endif() endif() diff --git a/cmake/module/FindBerkeleyDB.cmake b/cmake/module/FindBerkeleyDB.cmake index 03a3cce10c53f..f8fec16db3280 100644 --- a/cmake/module/FindBerkeleyDB.cmake +++ b/cmake/module/FindBerkeleyDB.cmake @@ -36,7 +36,7 @@ if(CMAKE_HOST_APPLE) # To find such a package, the find_path() and find_library() commands # need additional path hints that are computed by Homebrew itself. execute_process( - COMMAND ${HOMEBREW_EXECUTABLE} --prefix berkeley-db@4 + COMMAND ${HOMEBREW_EXECUTABLE} --prefix berkeley-db@5.3 OUTPUT_VARIABLE _BerkeleyDB_homebrew_prefix ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/cmake/module/GenerateSetupNsi.cmake b/cmake/module/GenerateSetupNsi.cmake index b7ea423611f7f..0e37adced88f7 100644 --- a/cmake/module/GenerateSetupNsi.cmake +++ b/cmake/module/GenerateSetupNsi.cmake @@ -6,13 +6,13 @@ function(generate_setup_nsi) set(abs_top_srcdir ${PROJECT_SOURCE_DIR}) set(abs_top_builddir ${PROJECT_BINARY_DIR}) set(PACKAGE_URL ${PROJECT_HOMEPAGE_URL}) - set(PACKAGE_TARNAME "bitcoin") - set(BITCOIN_GUI_NAME "bitcoin-qt") - set(BITCOIN_DAEMON_NAME "bitcoind") - set(BITCOIN_CLI_NAME "bitcoin-cli") - set(BITCOIN_TX_NAME "bitcoin-tx") - set(BITCOIN_WALLET_TOOL_NAME "bitcoin-wallet") - set(BITCOIN_TEST_NAME "test_bitcoin") + set(PACKAGE_TARNAME "groestlcoin") + set(BITCOIN_GUI_NAME "groestlcoin-qt") + set(BITCOIN_DAEMON_NAME "groestlcoind") + set(BITCOIN_CLI_NAME "groestlcoin-cli") + set(BITCOIN_TX_NAME "groestlcoin-tx") + set(BITCOIN_WALLET_TOOL_NAME "groestlcoin-wallet") + set(BITCOIN_TEST_NAME "test_groestlcoin") set(EXEEXT ${CMAKE_EXECUTABLE_SUFFIX}) - configure_file(${PROJECT_SOURCE_DIR}/share/setup.nsi.in ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi @ONLY) + configure_file(${PROJECT_SOURCE_DIR}/share/setup.nsi.in ${PROJECT_BINARY_DIR}/groestlcoin-win64-setup.nsi @ONLY) endfunction() diff --git a/cmake/module/Maintenance.cmake b/cmake/module/Maintenance.cmake index 2c6cfc1863c28..0358e1a6fd84f 100644 --- a/cmake/module/Maintenance.cmake +++ b/cmake/module/Maintenance.cmake @@ -42,7 +42,7 @@ function(add_maintenance_targets) VERBATIM ) - foreach(target IN ITEMS bitcoind bitcoin-qt bitcoin-cli bitcoin-tx bitcoin-util bitcoin-wallet test_bitcoin bench_bitcoin) + foreach(target IN ITEMS groestlcoind groestlcoin-qt groestlcoin-cli groestlcoin-tx groestlcoin-util groestlcoin-wallet test_groestlcoin bench_groestlcoin) if(TARGET ${target}) list(APPEND executables $) endif() @@ -66,45 +66,45 @@ function(add_maintenance_targets) endfunction() function(add_windows_deploy_target) - if(MINGW AND TARGET bitcoin-qt AND TARGET bitcoind AND TARGET bitcoin-cli AND TARGET bitcoin-tx AND TARGET bitcoin-wallet AND TARGET bitcoin-util AND TARGET test_bitcoin) + if(MINGW AND TARGET groestlcoin-qt AND TARGET groestlcoind AND TARGET groestlcoin-cli AND TARGET groestlcoin-tx AND TARGET groestlcoin-wallet AND TARGET groestlcoin-util AND TARGET test_groestlcoin) # TODO: Consider replacing this code with the CPack NSIS Generator. # See https://cmake.org/cmake/help/latest/cpack_gen/nsis.html include(GenerateSetupNsi) generate_setup_nsi() add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.exe + OUTPUT ${PROJECT_BINARY_DIR}/groestlcoin-win64-setup.exe COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/release - COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ - COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ - COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ - COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ - COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ - COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ - COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ - COMMAND makensis -V2 ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi + COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ + COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ + COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ + COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ + COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ + COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ + COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ + COMMAND makensis -V2 ${PROJECT_BINARY_DIR}/groestlcoin-win64-setup.nsi VERBATIM ) - add_custom_target(deploy DEPENDS ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.exe) + add_custom_target(deploy DEPENDS ${PROJECT_BINARY_DIR}/groestlcoin-win64-setup.exe) endif() endfunction() function(add_macos_deploy_target) - if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND TARGET bitcoin-qt) - set(macos_app "Bitcoin-Qt.app") + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND TARGET groestlcoin-qt) + set(macos_app "Groestlcoin-Qt.app") # Populate Contents subdirectory. configure_file(${PROJECT_SOURCE_DIR}/share/qt/Info.plist.in ${macos_app}/Contents/Info.plist) file(CONFIGURE OUTPUT ${macos_app}/Contents/PkgInfo CONTENT "APPL????") # Populate Contents/Resources subdirectory. file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/empty.lproj CONTENT "") - configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${macos_app}/Contents/Resources/bitcoin.icns COPYONLY) + configure_file(${PROJECT_SOURCE_DIR}/src/qt/res/icons/groestlcoin.icns ${macos_app}/Contents/Resources/groestlcoin.icns COPYONLY) file(CONFIGURE OUTPUT ${macos_app}/Contents/Resources/Base.lproj/InfoPlist.strings CONTENT "{ CFBundleDisplayName = \"@PACKAGE_NAME@\"; CFBundleName = \"@PACKAGE_NAME@\"; }" ) add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Bitcoin-Qt + OUTPUT ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Groestlcoin-Qt COMMAND ${CMAKE_COMMAND} --install ${PROJECT_BINARY_DIR} --config $ --component GUI --prefix ${macos_app}/Contents/MacOS --strip - COMMAND ${CMAKE_COMMAND} -E rename ${macos_app}/Contents/MacOS/bin/$ ${macos_app}/Contents/MacOS/Bitcoin-Qt + COMMAND ${CMAKE_COMMAND} -E rename ${macos_app}/Contents/MacOS/bin/$ ${macos_app}/Contents/MacOS/Groestlcoin-Qt COMMAND ${CMAKE_COMMAND} -E rm -rf ${macos_app}/Contents/MacOS/bin VERBATIM ) @@ -114,7 +114,7 @@ function(add_macos_deploy_target) add_custom_command( OUTPUT ${PROJECT_BINARY_DIR}/${osx_volname}.zip COMMAND ${PYTHON_COMMAND} ${PROJECT_SOURCE_DIR}/contrib/macdeploy/macdeployqtplus ${macos_app} ${osx_volname} -translations-dir=${QT_TRANSLATIONS_DIR} -zip - DEPENDS ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Bitcoin-Qt + DEPENDS ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Groestlcoin-Qt VERBATIM ) add_custom_target(deploydir @@ -125,13 +125,13 @@ function(add_macos_deploy_target) ) else() add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/dist/${macos_app}/Contents/MacOS/Bitcoin-Qt + OUTPUT ${PROJECT_BINARY_DIR}/dist/${macos_app}/Contents/MacOS/Groestlcoin-Qt COMMAND OBJDUMP=${CMAKE_OBJDUMP} ${PYTHON_COMMAND} ${PROJECT_SOURCE_DIR}/contrib/macdeploy/macdeployqtplus ${macos_app} ${osx_volname} -translations-dir=${QT_TRANSLATIONS_DIR} - DEPENDS ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Bitcoin-Qt + DEPENDS ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Groestlcoin-Qt VERBATIM ) add_custom_target(deploydir - DEPENDS ${PROJECT_BINARY_DIR}/dist/${macos_app}/Contents/MacOS/Bitcoin-Qt + DEPENDS ${PROJECT_BINARY_DIR}/dist/${macos_app}/Contents/MacOS/Groestlcoin-Qt ) find_program(ZIP_COMMAND zip REQUIRED) @@ -145,7 +145,7 @@ function(add_macos_deploy_target) DEPENDS ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip ) endif() - add_dependencies(deploydir bitcoin-qt) + add_dependencies(deploydir groestlcoin-qt) add_dependencies(deploy deploydir) endif() endfunction() diff --git a/cmake/script/Coverage.cmake b/cmake/script/Coverage.cmake index 0df2e0b734d81..6ecb698ff2fd4 100644 --- a/cmake/script/Coverage.cmake +++ b/cmake/script/Coverage.cmake @@ -19,7 +19,7 @@ execute_process( COMMAND_ERROR_IS_FATAL ANY ) execute_process( - COMMAND ${LCOV_COMMAND} --capture --directory src --test-name test_bitcoin --output-file test_bitcoin.info + COMMAND ${LCOV_COMMAND} --capture --directory src --test-name test_groestlcoin --output-file test_groestlcoin.info WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} ) execute_process( @@ -27,19 +27,19 @@ execute_process( WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} ) execute_process( - COMMAND ${LCOV_FILTER_COMMAND} test_bitcoin.info test_bitcoin_filtered.info + COMMAND ${LCOV_FILTER_COMMAND} test_groestlcoin.info test_groestlcoin_filtered.info WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} ) execute_process( - COMMAND ${LCOV_COMMAND} --add-tracefile test_bitcoin_filtered.info --output-file test_bitcoin_filtered.info + COMMAND ${LCOV_COMMAND} --add-tracefile test_groestlcoin_filtered.info --output-file test_groestlcoin_filtered.info WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} ) execute_process( - COMMAND ${LCOV_COMMAND} --add-tracefile baseline_filtered.info --add-tracefile test_bitcoin_filtered.info --output-file test_bitcoin_coverage.info + COMMAND ${LCOV_COMMAND} --add-tracefile baseline_filtered.info --add-tracefile test_groestlcoin_filtered.info --output-file test_groestlcoin_coverage.info WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} ) execute_process( - COMMAND ${GENHTML_COMMAND} test_bitcoin_coverage.info --output-directory test_bitcoin.coverage + COMMAND ${GENHTML_COMMAND} test_groestlcoin_coverage.info --output-directory test_groestlcoin.coverage WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} ) @@ -65,7 +65,7 @@ execute_process( WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} ) execute_process( - COMMAND ${LCOV_COMMAND} --add-tracefile baseline_filtered.info --add-tracefile test_bitcoin_filtered.info --add-tracefile functional_test_filtered.info --output-file total_coverage.info + COMMAND ${LCOV_COMMAND} --add-tracefile baseline_filtered.info --add-tracefile test_groestlcoin_filtered.info --add-tracefile functional_test_filtered.info --output-file total_coverage.info COMMAND ${GREP_EXECUTABLE} "%" COMMAND ${AWK_EXECUTABLE} "{ print substr($3,2,50) \"/\" $5 }" OUTPUT_FILE coverage_percent.txt diff --git a/cmake/tests.cmake b/cmake/tests.cmake index 279132980017f..ad5be92689380 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -2,9 +2,9 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or https://opensource.org/license/mit/. -if(TARGET bitcoin-util AND TARGET bitcoin-tx AND PYTHON_COMMAND) +if(TARGET groestlcoin-util AND TARGET groestlcoin-tx AND PYTHON_COMMAND) add_test(NAME util_test_runner - COMMAND ${CMAKE_COMMAND} -E env BITCOINUTIL=$ BITCOINTX=$ ${PYTHON_COMMAND} ${PROJECT_BINARY_DIR}/test/util/test_runner.py + COMMAND ${CMAKE_COMMAND} -E env BITCOINUTIL=$ BITCOINTX=$ ${PYTHON_COMMAND} ${PROJECT_BINARY_DIR}/test/util/test_runner.py ) endif() diff --git a/doc/build-windows-msvc.md b/doc/build-windows-msvc.md index 1daca1f93e258..941d8ba360fd8 100644 --- a/doc/build-windows-msvc.md +++ b/doc/build-windows-msvc.md @@ -1,6 +1,6 @@ # Windows / MSVC Build Guide -This guide describes how to build bitcoind, command-line utilities, and GUI on Windows using Micsrosoft Visual Studio. +This guide describes how to build groestlcoind, command-line utilities, and GUI on Windows using Micsrosoft Visual Studio. For cross-compiling options, please see [`build-windows.md`](./build-windows.md). @@ -21,21 +21,21 @@ The former is assumed hereinafter. Download and install [Git for Windows](https://git-scm.com/download/win). Once installed, Git is available from PowerShell or the Command Prompt. -### 3. Clone Bitcoin Repository +### 3. Clone Groestlcoin Repository -Clone the Bitcoin Core repository to a directory. All build scripts and commands will run from this directory. +Clone the Groestlcoin Core repository to a directory. All build scripts and commands will run from this directory. ``` -git clone https://github.com/bitcoin/bitcoin.git +git clone https://github.com/groestlcoin/groestlcoin.git ``` ## Triplets and Presets -The Bitcoin Core project supports the following vcpkg triplets: +The Groestlcoin Core project supports the following vcpkg triplets: - `x64-windows` (both CRT and library linkage is dynamic) - `x64-windows-static` (both CRT and library linkage is static) -To facilitate build process, the Bitcoin Core project provides presets, which are used in this guide. +To facilitate build process, the Groestlcoin Core project provides presets, which are used in this guide. Available presets can be listed as follows: ``` @@ -79,4 +79,4 @@ Available features are listed in the [`vcpkg.json`](/vcpkg.json) file. ### 7. Antivirus Software -To improve the build process performance, one might add the Bitcoin repository directory to the Microsoft Defender Antivirus exclusions. +To improve the build process performance, one might add the Groestlcoin repository directory to the Microsoft Defender Antivirus exclusions.