Skip to content

Commit 2a2631f

Browse files
author
MarcoFalke
committed
Merge bitcoin#18108: Fix .gitignore policy in build_msvc directory
dcb7af0 Ignore only auto-generated .vcxproj files (Hennadii Stepanov) 79c811c Specify ignored bitcoin-qt file precisely (Hennadii Stepanov) Pull request description: This PR makes `git` to ignore only auto-generated `.vcxproj` files, i.e.: https://github.com/bitcoin/bitcoin/blob/4c2578706c70148fc001f42a0918a2fb10252b43/build_msvc/msvc-autogen.py#L14-L25 Fix bitcoin#17287 ACKs for top commit: sipsorcery: ACK dcb7af0. Tree-SHA512: 5acfc3cb50e1239655bc9715711c8a0489093ed7cc287756614740f67908f11a55976cec75b29e263d4d3579b6b8af99bb3823515d43adf204cd5935fb2e1a3f
2 parents 470664f + dcb7af0 commit 2a2631f

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ src/qt/bitcoin-qt.includes
9090
*.qm
9191
Makefile
9292
!depends/Makefile
93-
bitcoin-qt
93+
src/qt/bitcoin-qt
9494
Bitcoin-Qt.app
9595
background.tiff*
9696

build_msvc/.gitignore

+13-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,19 @@ packages/*
88
*/Release
99
*/x64
1010
*.vcxproj.user
11-
*.vcxproj
11+
12+
# .vcxproj files that are auto-generated by the msvc-autogen.py script.
13+
libbitcoin_cli/libbitcoin_cli.vcxproj
14+
libbitcoin_common/libbitcoin_common.vcxproj
15+
libbitcoin_crypto/libbitcoin_crypto.vcxproj
16+
libbitcoin_server/libbitcoin_server.vcxproj
17+
libbitcoin_util/libbitcoin_util.vcxproj
18+
libbitcoin_wallet_tool/libbitcoin_wallet_tool.vcxproj
19+
libbitcoin_wallet/libbitcoin_wallet.vcxproj
20+
libbitcoin_zmq/libbitcoin_zmq.vcxproj
21+
bench_bitcoin/bench_bitcoin.vcxproj
22+
libtest_util/libtest_util.vcxproj
23+
1224
*/Win32
1325
libbitcoin_qt/QtGeneratedFiles/*
1426
test_bitcoin-qt/QtGeneratedFiles/*

0 commit comments

Comments
 (0)