phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge bitcoin/bitcoin#30937: build: scripted-diff: drop config/ subdir for bitcoin-config.h

Browse source 
882f736d0a doc: lint: correct outdated comment (s/Makefile.am/CMakeLists.txt/) (Sebastian Falbesoner)
1786be7b4a scripted-diff: drop config/ subdir for bitcoin-config.h, rename to bitcoin-build-config.h (Sebastian Falbesoner)

Pull request description:

  This PR is a follow-up to #30856, as suggested in comment https://github.com/bitcoin/bitcoin/pull/30856#issuecomment-2356804690. With the scripted diff, review should be fairly trivial, but it could still be seen as controversial due to the large number of files (78 in total) being touched.

ACKs for top commit:
  fanquake:
    ACK 882f736d0a

Tree-SHA512: 2e6cae4590f660e741edf84df456168b8b1f3861d381cfebf6647bb0a303c26bf7b969a837e0058e59bf852d220990dd8f5f400d8975fd0fab106d0507a70c9b
This commit is contained in:
merge-script 2024-10-10 13:33:38 +01:00
commit 9f45062b9b
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
81 changed files with 89 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
cmake/bitcoin-config.h.in → cmake/bitcoin-build-config.h.in
View file

2
cmake/introspection.cmake
View file

@ -6,7 +6,7 @@ include(CheckCXXSourceCompiles)
include(CheckCXXSymbolExists) include(CheckCXXSymbolExists)
include(CheckIncludeFileCXX) 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/prctl.h HAVE_SYS_PRCTL_H)
check_include_file_cxx(sys/resources.h HAVE_SYS_RESOURCES_H) check_include_file_cxx(sys/resources.h HAVE_SYS_RESOURCES_H)
check_include_file_cxx(sys/vmmeter.h HAVE_SYS_VMMETER_H) check_include_file_cxx(sys/vmmeter.h HAVE_SYS_VMMETER_H)

2
src/CMakeLists.txt
View file

@ -5,7 +5,7 @@
include(GNUInstallDirs) include(GNUInstallDirs)
include(AddWindowsResources) 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}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
add_custom_target(generate_build_info add_custom_target(generate_build_info

2
src/addrdb.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <addrdb.h> #include <addrdb.h>

2
src/addrman.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <addrman.h> #include <addrman.h>
#include <addrman_impl.h> #include <addrman_impl.h>

2
src/bench/wallet_create.cpp
View file

@ -3,7 +3,7 @@
// file COPYING or https://www.opensource.org/licenses/mit-license.php. // file COPYING or https://www.opensource.org/licenses/mit-license.php.
#include <bench/bench.h> #include <bench/bench.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <random.h> #include <random.h>
#include <support/allocators/secure.h> #include <support/allocators/secure.h>
#include <test/util/setup_common.h> #include <test/util/setup_common.h>

2
src/bench/wallet_ismine.cpp
View file

@ -4,7 +4,7 @@
#include <addresstype.h> #include <addresstype.h>
#include <bench/bench.h> #include <bench/bench.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <key.h> #include <key.h>
#include <key_io.h> #include <key_io.h>
#include <script/descriptor.h> #include <script/descriptor.h>

2
src/bench/wallet_loading.cpp
View file

@ -4,7 +4,7 @@
#include <addresstype.h> #include <addresstype.h>
#include <bench/bench.h> #include <bench/bench.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <consensus/amount.h> #include <consensus/amount.h>
#include <outputtype.h> #include <outputtype.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>

2
src/bitcoin-cli.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <clientversion.h> #include <clientversion.h>

2
src/bitcoin-tx.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <clientversion.h> #include <clientversion.h>

2
src/bitcoin-util.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <arith_uint256.h> #include <arith_uint256.h>
#include <chain.h> #include <chain.h>

2
src/bitcoin-wallet.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <chainparams.h> #include <chainparams.h>
#include <chainparamsbase.h> #include <chainparamsbase.h>

2
src/bitcoind.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <chainparams.h> #include <chainparams.h>
#include <clientversion.h> #include <clientversion.h>

2
src/clientversion.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <clientversion.h> #include <clientversion.h>
#include <util/string.h> #include <util/string.h>

4
src/clientversion.h
View file

@ -7,11 +7,11 @@
#include <util/macros.h> #include <util/macros.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
// Check that required client information is defined // Check that required client information is defined
#if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR) #if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR)
#error Client version information missing: version is not defined by bitcoin-config.h or in any other way #error Client version information missing: version is not defined by bitcoin-build-config.h or in any other way
#endif #endif
//! Copyright string used in Windows .rc files //! Copyright string used in Windows .rc files

2
src/common/netif.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or https://www.opensource.org/licenses/mit-license.php. // file COPYING or https://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <common/netif.h> #include <common/netif.h>

2
src/common/run_command.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <common/run_command.h> #include <common/run_command.h>

2
src/common/settings.cpp
View file

@ -4,7 +4,7 @@
#include <common/settings.h> #include <common/settings.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <tinyformat.h> #include <tinyformat.h>
#include <univalue.h> #include <univalue.h>

2
src/common/system.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <common/system.h> #include <common/system.h>

2
src/common/system.h
View file

@ -6,7 +6,7 @@
#ifndef BITCOIN_COMMON_SYSTEM_H #ifndef BITCOIN_COMMON_SYSTEM_H
#define BITCOIN_COMMON_SYSTEM_H #define BITCOIN_COMMON_SYSTEM_H
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <cstdint> #include <cstdint>
#include <string> #include <string>

2
src/crypto/sha256.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <crypto/sha256.h> #include <crypto/sha256.h>
#include <crypto/common.h> #include <crypto/common.h>

2
src/httpserver.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <httpserver.h> #include <httpserver.h>

2
src/init.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <init.h> #include <init.h>

2
src/init/common.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <clientversion.h> #include <clientversion.h>
#include <common/args.h> #include <common/args.h>

2
src/mapport.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <mapport.h> #include <mapport.h>

2
src/net.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <net.h> #include <net.h>

2
src/netbase.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <netbase.h> #include <netbase.h>

2
src/node/interfaces.cpp
View file

@ -61,7 +61,7 @@
#include <validation.h> #include <validation.h>
#include <validationinterface.h> #include <validationinterface.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <any> #include <any>
#include <memory> #include <memory>

2
src/node/kernel_notifications.cpp
View file

@ -4,7 +4,7 @@
#include <node/kernel_notifications.h> #include <node/kernel_notifications.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <chain.h> #include <chain.h>
#include <common/args.h> #include <common/args.h>

2
src/node/warnings.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <node/warnings.h> #include <node/warnings.h>

2
src/qt/bitcoin.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/bitcoin.h> #include <qt/bitcoin.h>

2
src/qt/bitcoin.h
View file

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_BITCOIN_H #ifndef BITCOIN_QT_BITCOIN_H
#define BITCOIN_QT_BITCOIN_H #define BITCOIN_QT_BITCOIN_H
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <interfaces/node.h> #include <interfaces/node.h>
#include <qt/initexecutor.h> #include <qt/initexecutor.h>

2
src/qt/bitcoingui.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/bitcoingui.h> #include <qt/bitcoingui.h>

2
src/qt/bitcoingui.h
View file

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_BITCOINGUI_H #ifndef BITCOIN_QT_BITCOINGUI_H
#define BITCOIN_QT_BITCOINGUI_H #define BITCOIN_QT_BITCOINGUI_H
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>
#include <qt/clientmodel.h> #include <qt/clientmodel.h>

2
src/qt/clientmodel.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/clientmodel.h> #include <qt/clientmodel.h>

2
src/qt/createwalletdialog.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <interfaces/node.h> #include <interfaces/node.h>
#include <qt/createwalletdialog.h> #include <qt/createwalletdialog.h>

2
src/qt/intro.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <chainparams.h> #include <chainparams.h>
#include <qt/intro.h> #include <qt/intro.h>

2
src/qt/modaloverlay.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/modaloverlay.h> #include <qt/modaloverlay.h>
#include <qt/forms/ui_modaloverlay.h> #include <qt/forms/ui_modaloverlay.h>

2
src/qt/notificator.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/notificator.h> #include <qt/notificator.h>

2
src/qt/notificator.h
View file

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_NOTIFICATOR_H #ifndef BITCOIN_QT_NOTIFICATOR_H
#define BITCOIN_QT_NOTIFICATOR_H #define BITCOIN_QT_NOTIFICATOR_H
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <QIcon> #include <QIcon>
#include <QObject> #include <QObject>

2
src/qt/optionsdialog.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/optionsdialog.h> #include <qt/optionsdialog.h>
#include <qt/forms/ui_optionsdialog.h> #include <qt/forms/ui_optionsdialog.h>

2
src/qt/optionsmodel.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/optionsmodel.h> #include <qt/optionsmodel.h>

2
src/qt/qrimagewidget.cpp
View file

@ -15,7 +15,7 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QPainter> #include <QPainter>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#ifdef USE_QRCODE #ifdef USE_QRCODE
#include <qrencode.h> #include <qrencode.h>

2
src/qt/receiverequestdialog.cpp
View file

@ -14,7 +14,7 @@
#include <QDialog> #include <QDialog>
#include <QString> #include <QString>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
ReceiveRequestDialog::ReceiveRequestDialog(QWidget* parent) ReceiveRequestDialog::ReceiveRequestDialog(QWidget* parent)
: QDialog(parent, GUIUtil::dialog_flags), : QDialog(parent, GUIUtil::dialog_flags),

2
src/qt/rpcconsole.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/rpcconsole.h> #include <qt/rpcconsole.h>
#include <qt/forms/ui_debugwindow.h> #include <qt/forms/ui_debugwindow.h>

2
src/qt/rpcconsole.h
View file

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_RPCCONSOLE_H #ifndef BITCOIN_QT_RPCCONSOLE_H
#define BITCOIN_QT_RPCCONSOLE_H #define BITCOIN_QT_RPCCONSOLE_H
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/clientmodel.h> #include <qt/clientmodel.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>

2
src/qt/sendcoinsdialog.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/sendcoinsdialog.h> #include <qt/sendcoinsdialog.h>
#include <qt/forms/ui_sendcoinsdialog.h> #include <qt/forms/ui_sendcoinsdialog.h>

2
src/qt/signverifymessagedialog.cpp
View file

@ -11,7 +11,7 @@
#include <qt/walletmodel.h> #include <qt/walletmodel.h>
#include <common/signmessage.h> // For MessageSign(), MessageVerify() #include <common/signmessage.h> // For MessageSign(), MessageVerify()
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <key_io.h> #include <key_io.h>
#include <wallet/wallet.h> #include <wallet/wallet.h>

2
src/qt/splashscreen.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/splashscreen.h> #include <qt/splashscreen.h>

2
src/qt/test/optiontests.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <common/args.h> #include <common/args.h>
#include <init.h> #include <init.h>

2
src/qt/test/test_main.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <interfaces/init.h> #include <interfaces/init.h>
#include <interfaces/node.h> #include <interfaces/node.h>

2
src/qt/utilitydialog.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <qt/utilitydialog.h> #include <qt/utilitydialog.h>

2
src/random.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <random.h> #include <random.h>

2
src/randomenv.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <randomenv.h> #include <randomenv.h>

2
src/rest.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <rest.h> #include <rest.h>

2
src/rpc/external_signer.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <common/args.h> #include <common/args.h>
#include <common/system.h> #include <common/system.h>

2
src/rpc/mining.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>

2
src/rpc/node.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <chainparams.h> #include <chainparams.h>
#include <httpserver.h> #include <httpserver.h>

2
src/rpc/register.h
View file

@ -5,7 +5,7 @@
#ifndef BITCOIN_RPC_REGISTER_H #ifndef BITCOIN_RPC_REGISTER_H
#define BITCOIN_RPC_REGISTER_H #define BITCOIN_RPC_REGISTER_H
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
/** These are in one header file to avoid creating tons of single-function /** These are in one header file to avoid creating tons of single-function
* headers for everything under src/rpc/ */ * headers for everything under src/rpc/ */

2
src/rpc/server.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <rpc/server.h> #include <rpc/server.h>

2
src/rpc/util.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <clientversion.h> #include <clientversion.h>
#include <common/args.h> #include <common/args.h>

2
src/test/system_tests.cpp
View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
// //
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <test/util/setup_common.h> #include <test/util/setup_common.h>
#include <common/run_command.h> #include <common/run_command.h>
#include <univalue.h> #include <univalue.h>

2
src/util/check.cpp
View file

@ -4,7 +4,7 @@
#include <util/check.h> #include <util/check.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <clientversion.h> #include <clientversion.h>
#include <tinyformat.h> #include <tinyformat.h>

2
src/util/fs_helpers.cpp
View file

@ -5,7 +5,7 @@
#include <util/fs_helpers.h> #include <util/fs_helpers.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <logging.h> #include <logging.h>
#include <sync.h> #include <sync.h>

2
src/util/syserror.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <tinyformat.h> #include <tinyformat.h>
#include <util/syserror.h> #include <util/syserror.h>

2
src/util/threadnames.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <cstring> #include <cstring>
#include <string> #include <string>

2
src/util/tokenpipe.cpp
View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <util/tokenpipe.h> #include <util/tokenpipe.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#ifndef WIN32 #ifndef WIN32

2
src/util/trace.h
View file

@ -5,7 +5,7 @@
#ifndef BITCOIN_UTIL_TRACE_H #ifndef BITCOIN_UTIL_TRACE_H
#define BITCOIN_UTIL_TRACE_H #define BITCOIN_UTIL_TRACE_H
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#ifdef ENABLE_TRACING #ifdef ENABLE_TRACING

2
src/validation.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <validation.h> #include <validation.h>

2
src/wallet/init.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <common/args.h> #include <common/args.h>
#include <init.h> #include <init.h>

2
src/wallet/rpc/addresses.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <core_io.h> #include <core_io.h>
#include <key_io.h> #include <key_io.h>

2
src/wallet/rpc/backup.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <chain.h> #include <chain.h>
#include <clientversion.h> #include <clientversion.h>

2
src/wallet/rpc/wallet.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <core_io.h> #include <core_io.h>
#include <key_io.h> #include <key_io.h>

2
src/wallet/sqlite.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <wallet/sqlite.h> #include <wallet/sqlite.h>

2
src/wallet/test/db_tests.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>

2
src/wallet/test/fuzz/wallet_bdb_parser.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/FuzzedDataProvider.h>
#include <test/fuzz/fuzz.h> #include <test/fuzz/fuzz.h>
#include <test/fuzz/util.h> #include <test/fuzz/util.h>

2
src/wallet/test/util.h
View file

@ -5,7 +5,7 @@
#ifndef BITCOIN_WALLET_TEST_UTIL_H #ifndef BITCOIN_WALLET_TEST_UTIL_H
#define BITCOIN_WALLET_TEST_UTIL_H #define BITCOIN_WALLET_TEST_UTIL_H
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <addresstype.h> #include <addresstype.h>
#include <wallet/db.h> #include <wallet/db.h>

2
src/wallet/wallet.cpp
View file

@ -5,7 +5,7 @@
#include <wallet/wallet.h> #include <wallet/wallet.h>
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <addresstype.h> #include <addresstype.h>
#include <blockfilter.h> #include <blockfilter.h>
#include <chain.h> #include <chain.h>

2
src/wallet/walletdb.cpp
View file

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <wallet/walletdb.h> #include <wallet/walletdb.h>

2
src/wallet/wallettool.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
#include <wallet/wallettool.h> #include <wallet/wallettool.h>

18
test/lint/test_runner/src/main.rs
View file

@ -29,7 +29,7 @@ fn get_linter_list() -> Vec<&'static Linter> {
lint_fn: lint_doc lint_fn: lint_doc
}, },
&Linter { &Linter {
description: "Check that no symbol from bitcoin-config.h is used without the header being included", description: "Check that no symbol from bitcoin-build-config.h is used without the header being included",
name: "includes_build_config", name: "includes_build_config",
lint_fn: lint_includes_build_config lint_fn: lint_includes_build_config
}, },
@ -395,7 +395,7 @@ Please add any false positives, such as subtrees, or externally sourced files to
} }
fn lint_includes_build_config() -> LintResult { fn lint_includes_build_config() -> LintResult {
let config_path = "./cmake/bitcoin-config.h.in"; let config_path = "./cmake/bitcoin-build-config.h.in";
let defines_regex = format!( let defines_regex = format!(
r"^\s*(?!//).*({})", r"^\s*(?!//).*({})",
check_output(Command::new("grep").args(["define", "--", config_path])) check_output(Command::new("grep").args(["define", "--", config_path]))
@ -429,7 +429,7 @@ fn lint_includes_build_config() -> LintResult {
]) ])
.args(get_pathspecs_exclude_subtrees()) .args(get_pathspecs_exclude_subtrees())
.args([ .args([
// These are exceptions which don't use bitcoin-config.h, rather the Makefile.am adds // These are exceptions which don't use bitcoin-build-config.h, rather CMakeLists.txt adds
// these cppflags manually. // these cppflags manually.
":(exclude)src/crypto/sha256_arm_shani.cpp", ":(exclude)src/crypto/sha256_arm_shani.cpp",
":(exclude)src/crypto/sha256_avx2.cpp", ":(exclude)src/crypto/sha256_avx2.cpp",
@ -447,9 +447,9 @@ fn lint_includes_build_config() -> LintResult {
"--files-with-matches" "--files-with-matches"
}, },
if mode { if mode {
"^#include <config/bitcoin-config.h> // IWYU pragma: keep$" "^#include <bitcoin-build-config.h> // IWYU pragma: keep$"
} else { } else {
"#include <config/bitcoin-config.h>" // Catch redundant includes with and without the IWYU pragma "#include <bitcoin-build-config.h>" // Catch redundant includes with and without the IWYU pragma
}, },
"--", "--",
]) ])
@ -463,11 +463,11 @@ fn lint_includes_build_config() -> LintResult {
return Err(format!( return Err(format!(
r#" r#"
^^^ ^^^
One or more files use a symbol declared in the bitcoin-config.h header. However, they are not One or more files use a symbol declared in the bitcoin-build-config.h header. However, they are not
including the header. This is problematic, because the header may or may not be indirectly including the header. This is problematic, because the header may or may not be indirectly
included. If the indirect include were to be intentionally or accidentally removed, the build could included. If the indirect include were to be intentionally or accidentally removed, the build could
still succeed, but silently be buggy. For example, a slower fallback algorithm could be picked, still succeed, but silently be buggy. For example, a slower fallback algorithm could be picked,
even though bitcoin-config.h indicates that a faster feature is available and should be used. even though bitcoin-build-config.h indicates that a faster feature is available and should be used.
If you are unsure which symbol is used, you can find it with this command: If you are unsure which symbol is used, you can find it with this command:
git grep --perl-regexp '{}' -- file_name git grep --perl-regexp '{}' -- file_name
@ -475,7 +475,7 @@ git grep --perl-regexp '{}' -- file_name
Make sure to include it with the IWYU pragma. Otherwise, IWYU may falsely instruct to remove the Make sure to include it with the IWYU pragma. Otherwise, IWYU may falsely instruct to remove the
include again. include again.
#include <config/bitcoin-config.h> // IWYU pragma: keep #include <bitcoin-build-config.h> // IWYU pragma: keep
"#, "#,
defines_regex defines_regex
)); ));
@ -484,7 +484,7 @@ include again.
if redundant { if redundant {
return Err(r#" return Err(r#"
^^^ ^^^
None of the files use a symbol declared in the bitcoin-config.h header. However, they are including None of the files use a symbol declared in the bitcoin-build-config.h header. However, they are including
the header. Consider removing the unused include. the header. Consider removing the unused include.
"# "#
.to_string()); .to_string());