Skip to content

Commit 09b0161

Browse files
theStacktheStack
committed
scripted-diff: drop config/ subdir for bitcoin-config.h, rename to bitcoin-build-config.h
Follow-up for PR bitcoin#30856, commit 0dd6625. -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-
1 parent 90a5786 commit 09b0161

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+88
-88
lines changed

‎cmake/bitcoin-config.h.in ‎cmake/bitcoin-build-config.h.in

File renamed without changes.

‎cmake/introspection.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include(CheckCXXSourceCompiles)
66
include(CheckCXXSymbolExists)
77
include(CheckIncludeFileCXX)
88

9-
# The following HAVE_{HEADER}_H variables go to the bitcoin-config.h header.
9+
# The following HAVE_{HEADER}_H variables go to the bitcoin-build-config.h header.
1010
check_include_file_cxx(sys/prctl.h HAVE_SYS_PRCTL_H)
1111
check_include_file_cxx(sys/resources.h HAVE_SYS_RESOURCES_H)
1212
check_include_file_cxx(sys/vmmeter.h HAVE_SYS_VMMETER_H)

‎src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
include(GNUInstallDirs)
66
include(AddWindowsResources)
77

8-
configure_file(${PROJECT_SOURCE_DIR}/cmake/bitcoin-config.h.in config/bitcoin-config.h USE_SOURCE_PERMISSIONS @ONLY)
8+
configure_file(${PROJECT_SOURCE_DIR}/cmake/bitcoin-build-config.h.in bitcoin-build-config.h USE_SOURCE_PERMISSIONS @ONLY)
99
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
1010

1111
add_custom_target(generate_build_info

‎src/addrdb.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77

88
#include <addrdb.h>
99

‎src/addrman.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77

88
#include <addrman.h>
99
#include <addrman_impl.h>

‎src/bench/wallet_create.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// file COPYING or https://www.opensource.org/licenses/mit-license.php.
44

55
#include <bench/bench.h>
6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77
#include <random.h>
88
#include <support/allocators/secure.h>
99
#include <test/util/setup_common.h>

‎src/bench/wallet_ismine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <addresstype.h>
66
#include <bench/bench.h>
7-
#include <config/bitcoin-config.h> // IWYU pragma: keep
7+
#include <bitcoin-build-config.h> // IWYU pragma: keep
88
#include <key.h>
99
#include <key_io.h>
1010
#include <script/descriptor.h>

‎src/bench/wallet_loading.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <addresstype.h>
66
#include <bench/bench.h>
7-
#include <config/bitcoin-config.h> // IWYU pragma: keep
7+
#include <bitcoin-build-config.h> // IWYU pragma: keep
88
#include <consensus/amount.h>
99
#include <outputtype.h>
1010
#include <primitives/transaction.h>

‎src/bitcoin-cli.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77

88
#include <chainparamsbase.h>
99
#include <clientversion.h>

‎src/bitcoin-tx.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <chainparamsbase.h>
88
#include <clientversion.h>

‎src/bitcoin-util.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <arith_uint256.h>
88
#include <chain.h>

‎src/bitcoin-wallet.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <chainparams.h>
88
#include <chainparamsbase.h>

‎src/bitcoind.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77

88
#include <chainparams.h>
99
#include <clientversion.h>

‎src/clientversion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <clientversion.h>
88
#include <util/string.h>

‎src/clientversion.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
#include <util/macros.h>
99

10-
#include <config/bitcoin-config.h> // IWYU pragma: keep
10+
#include <bitcoin-build-config.h> // IWYU pragma: keep
1111

1212
// Check that required client information is defined
1313
#if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR)
14-
#error Client version information missing: version is not defined by bitcoin-config.h or in any other way
14+
#error Client version information missing: version is not defined by bitcoin-build-config.h or in any other way
1515
#endif
1616

1717
//! Copyright string used in Windows .rc files

‎src/common/run_command.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <common/run_command.h>
88

‎src/common/settings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <common/settings.h>
66

7-
#include <config/bitcoin-config.h> // IWYU pragma: keep
7+
#include <bitcoin-build-config.h> // IWYU pragma: keep
88

99
#include <tinyformat.h>
1010
#include <univalue.h>

‎src/common/system.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77

88
#include <common/system.h>
99

‎src/common/system.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef BITCOIN_COMMON_SYSTEM_H
77
#define BITCOIN_COMMON_SYSTEM_H
88

9-
#include <config/bitcoin-config.h> // IWYU pragma: keep
9+
#include <bitcoin-build-config.h> // IWYU pragma: keep
1010

1111
#include <cstdint>
1212
#include <string>

‎src/crypto/sha256.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <crypto/sha256.h>
88
#include <crypto/common.h>

‎src/httpserver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <httpserver.h>
88

‎src/init.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77

88
#include <init.h>
99

‎src/init/common.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <clientversion.h>
88
#include <common/args.h>

‎src/mapport.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <mapport.h>
88

‎src/net.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77

88
#include <net.h>
99

‎src/netbase.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77

88
#include <netbase.h>
99

‎src/node/interfaces.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
#include <validation.h>
6161
#include <validationinterface.h>
6262

63-
#include <config/bitcoin-config.h> // IWYU pragma: keep
63+
#include <bitcoin-build-config.h> // IWYU pragma: keep
6464

6565
#include <any>
6666
#include <memory>

‎src/node/kernel_notifications.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <node/kernel_notifications.h>
66

7-
#include <config/bitcoin-config.h> // IWYU pragma: keep
7+
#include <bitcoin-build-config.h> // IWYU pragma: keep
88

99
#include <chain.h>
1010
#include <common/args.h>

‎src/node/warnings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <config/bitcoin-config.h> // IWYU pragma: keep
6+
#include <bitcoin-build-config.h> // IWYU pragma: keep
77

88
#include <node/warnings.h>
99

‎src/qt/bitcoin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <qt/bitcoin.h>
88

‎src/qt/bitcoin.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef BITCOIN_QT_BITCOIN_H
66
#define BITCOIN_QT_BITCOIN_H
77

8-
#include <config/bitcoin-config.h> // IWYU pragma: keep
8+
#include <bitcoin-build-config.h> // IWYU pragma: keep
99

1010
#include <interfaces/node.h>
1111
#include <qt/initexecutor.h>

‎src/qt/bitcoingui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <qt/bitcoingui.h>
88

‎src/qt/bitcoingui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef BITCOIN_QT_BITCOINGUI_H
66
#define BITCOIN_QT_BITCOINGUI_H
77

8-
#include <config/bitcoin-config.h> // IWYU pragma: keep
8+
#include <bitcoin-build-config.h> // IWYU pragma: keep
99

1010
#include <qt/bitcoinunits.h>
1111
#include <qt/clientmodel.h>

‎src/qt/clientmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <qt/clientmodel.h>
88

‎src/qt/createwalletdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <interfaces/node.h>
88
#include <qt/createwalletdialog.h>

‎src/qt/intro.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <chainparams.h>
88
#include <qt/intro.h>

‎src/qt/modaloverlay.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <qt/modaloverlay.h>
88
#include <qt/forms/ui_modaloverlay.h>

‎src/qt/notificator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <qt/notificator.h>
88

‎src/qt/notificator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef BITCOIN_QT_NOTIFICATOR_H
66
#define BITCOIN_QT_NOTIFICATOR_H
77

8-
#include <config/bitcoin-config.h> // IWYU pragma: keep
8+
#include <bitcoin-build-config.h> // IWYU pragma: keep
99

1010
#include <QIcon>
1111
#include <QObject>

‎src/qt/optionsdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <qt/optionsdialog.h>
88
#include <qt/forms/ui_optionsdialog.h>

‎src/qt/optionsmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <qt/optionsmodel.h>
88

‎src/qt/qrimagewidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <QMouseEvent>
1616
#include <QPainter>
1717

18-
#include <config/bitcoin-config.h> // IWYU pragma: keep
18+
#include <bitcoin-build-config.h> // IWYU pragma: keep
1919

2020
#ifdef USE_QRCODE
2121
#include <qrencode.h>

‎src/qt/receiverequestdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <QDialog>
1515
#include <QString>
1616

17-
#include <config/bitcoin-config.h> // IWYU pragma: keep
17+
#include <bitcoin-build-config.h> // IWYU pragma: keep
1818

1919
ReceiveRequestDialog::ReceiveRequestDialog(QWidget* parent)
2020
: QDialog(parent, GUIUtil::dialog_flags),

‎src/qt/rpcconsole.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <config/bitcoin-config.h> // IWYU pragma: keep
5+
#include <bitcoin-build-config.h> // IWYU pragma: keep
66

77
#include <qt/rpcconsole.h>
88
#include <qt/forms/ui_debugwindow.h>

0 commit comments

Comments
 (0)