Skip to content

Commit 1786be7

Browse files
committed
scripted-diff: drop config/ subdir for bitcoin-config.h, rename to bitcoin-build-config.h
Follow-up for PR #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 0c2c3bb commit 1786be7

Some content is hidden

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

81 files changed

+89
-89
lines changed
File renamed without changes.

cmake/introspection.cmake

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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>

0 commit comments

Comments
 (0)