From 1786be7b4a56db8f4a0dd13cf3672bf53d1d2a51 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Thu, 10 Oct 2024 12:20:34 +0200 Subject: [PATCH] scripted-diff: drop config/ subdir for bitcoin-config.h, rename to bitcoin-build-config.h Follow-up for PR #30856, commit 0dd66251. -BEGIN VERIFY SCRIPT- sed -i "s|config/bitcoin-config\.h|bitcoin-build-config.h|g" $(git grep -l config/bitcoin-config\.h) sed -i "s|bitcoin-config\.h|bitcoin-build-config.h|g" $(git grep -l "bitcoin-config\.h" ./src ./test ./cmake) git mv ./cmake/bitcoin-config.h.in ./cmake/bitcoin-build-config.h.in -END VERIFY SCRIPT- --- ...n-config.h.in => bitcoin-build-config.h.in} | 0 cmake/introspection.cmake | 2 +- src/CMakeLists.txt | 2 +- src/addrdb.cpp | 2 +- src/addrman.cpp | 2 +- src/bench/wallet_create.cpp | 2 +- src/bench/wallet_ismine.cpp | 2 +- src/bench/wallet_loading.cpp | 2 +- src/bitcoin-cli.cpp | 2 +- src/bitcoin-tx.cpp | 2 +- src/bitcoin-util.cpp | 2 +- src/bitcoin-wallet.cpp | 2 +- src/bitcoind.cpp | 2 +- src/clientversion.cpp | 2 +- src/clientversion.h | 4 ++-- src/common/netif.cpp | 2 +- src/common/run_command.cpp | 2 +- src/common/settings.cpp | 2 +- src/common/system.cpp | 2 +- src/common/system.h | 2 +- src/crypto/sha256.cpp | 2 +- src/httpserver.cpp | 2 +- src/init.cpp | 2 +- src/init/common.cpp | 2 +- src/mapport.cpp | 2 +- src/net.cpp | 2 +- src/netbase.cpp | 2 +- src/node/interfaces.cpp | 2 +- src/node/kernel_notifications.cpp | 2 +- src/node/warnings.cpp | 2 +- src/qt/bitcoin.cpp | 2 +- src/qt/bitcoin.h | 2 +- src/qt/bitcoingui.cpp | 2 +- src/qt/bitcoingui.h | 2 +- src/qt/clientmodel.cpp | 2 +- src/qt/createwalletdialog.cpp | 2 +- src/qt/intro.cpp | 2 +- src/qt/modaloverlay.cpp | 2 +- src/qt/notificator.cpp | 2 +- src/qt/notificator.h | 2 +- src/qt/optionsdialog.cpp | 2 +- src/qt/optionsmodel.cpp | 2 +- src/qt/qrimagewidget.cpp | 2 +- src/qt/receiverequestdialog.cpp | 2 +- src/qt/rpcconsole.cpp | 2 +- src/qt/rpcconsole.h | 2 +- src/qt/sendcoinsdialog.cpp | 2 +- src/qt/signverifymessagedialog.cpp | 2 +- src/qt/splashscreen.cpp | 2 +- src/qt/test/optiontests.cpp | 2 +- src/qt/test/test_main.cpp | 2 +- src/qt/utilitydialog.cpp | 2 +- src/random.cpp | 2 +- src/randomenv.cpp | 2 +- src/rest.cpp | 2 +- src/rpc/external_signer.cpp | 2 +- src/rpc/mining.cpp | 2 +- src/rpc/node.cpp | 2 +- src/rpc/register.h | 2 +- src/rpc/server.cpp | 2 +- src/rpc/util.cpp | 2 +- src/test/system_tests.cpp | 2 +- src/util/check.cpp | 2 +- src/util/fs_helpers.cpp | 2 +- src/util/syserror.cpp | 2 +- src/util/threadnames.cpp | 2 +- src/util/tokenpipe.cpp | 2 +- src/util/trace.h | 2 +- src/validation.cpp | 2 +- src/wallet/init.cpp | 2 +- src/wallet/rpc/addresses.cpp | 2 +- src/wallet/rpc/backup.cpp | 2 +- src/wallet/rpc/wallet.cpp | 2 +- src/wallet/sqlite.cpp | 2 +- src/wallet/test/db_tests.cpp | 2 +- src/wallet/test/fuzz/wallet_bdb_parser.cpp | 2 +- src/wallet/test/util.h | 2 +- src/wallet/wallet.cpp | 2 +- src/wallet/walletdb.cpp | 2 +- src/wallet/wallettool.cpp | 2 +- test/lint/test_runner/src/main.rs | 18 +++++++++--------- 81 files changed, 89 insertions(+), 89 deletions(-) rename cmake/{bitcoin-config.h.in => bitcoin-build-config.h.in} (100%) diff --git a/cmake/bitcoin-config.h.in b/cmake/bitcoin-build-config.h.in similarity index 100% rename from cmake/bitcoin-config.h.in rename to cmake/bitcoin-build-config.h.in diff --git a/cmake/introspection.cmake b/cmake/introspection.cmake index 5435a109d41..29c93869a73 100644 --- a/cmake/introspection.cmake +++ b/cmake/introspection.cmake @@ -6,7 +6,7 @@ include(CheckCXXSourceCompiles) include(CheckCXXSymbolExists) include(CheckIncludeFileCXX) -# The following HAVE_{HEADER}_H variables go to the bitcoin-config.h header. +# The following HAVE_{HEADER}_H variables go to the bitcoin-build-config.h header. check_include_file_cxx(sys/prctl.h HAVE_SYS_PRCTL_H) check_include_file_cxx(sys/resources.h HAVE_SYS_RESOURCES_H) check_include_file_cxx(sys/vmmeter.h HAVE_SYS_VMMETER_H) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d10638e887d..4a86465bbaf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,7 +5,7 @@ include(GNUInstallDirs) include(AddWindowsResources) -configure_file(${PROJECT_SOURCE_DIR}/cmake/bitcoin-config.h.in config/bitcoin-config.h USE_SOURCE_PERMISSIONS @ONLY) +configure_file(${PROJECT_SOURCE_DIR}/cmake/bitcoin-build-config.h.in bitcoin-build-config.h USE_SOURCE_PERMISSIONS @ONLY) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) add_custom_target(generate_build_info diff --git a/src/addrdb.cpp b/src/addrdb.cpp index b89141c88e3..4637906441e 100644 --- a/src/addrdb.cpp +++ b/src/addrdb.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include // IWYU pragma: keep +#include // IWYU pragma: keep #include diff --git a/src/addrman.cpp b/src/addrman.cpp index 84d228dc822..358d4fc0a81 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include // IWYU pragma: keep +#include // IWYU pragma: keep #include #include diff --git a/src/bench/wallet_create.cpp b/src/bench/wallet_create.cpp index 43b5b5c91e3..3b916d7c39b 100644 --- a/src/bench/wallet_create.cpp +++ b/src/bench/wallet_create.cpp @@ -3,7 +3,7 @@ // file COPYING or https://www.opensource.org/licenses/mit-license.php. #include -#include // IWYU pragma: keep +#include // IWYU pragma: keep #include #include #include diff --git a/src/bench/wallet_ismine.cpp b/src/bench/wallet_ismine.cpp index 29e370ce29f..5343814ab2c 100644 --- a/src/bench/wallet_ismine.cpp +++ b/src/bench/wallet_ismine.cpp @@ -4,7 +4,7 @@ #include #include -#include // IWYU pragma: keep +#include // IWYU pragma: keep #include #include #include