Skip to content

Commit

Permalink
Merge #18108: Fix .gitignore policy in build_msvc directory
Browse files Browse the repository at this point in the history
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 #17287

ACKs for top commit:
  sipsorcery:
    ACK dcb7af0.

Tree-SHA512: 5acfc3cb50e1239655bc9715711c8a0489093ed7cc287756614740f67908f11a55976cec75b29e263d4d3579b6b8af99bb3823515d43adf204cd5935fb2e1a3f
  • Loading branch information
MarcoFalke committed Feb 15, 2020
2 parents 470664f + dcb7af0 commit 2a2631f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ src/qt/bitcoin-qt.includes
*.qm
Makefile
!depends/Makefile
bitcoin-qt
src/qt/bitcoin-qt
Bitcoin-Qt.app
background.tiff*

Expand Down
14 changes: 13 additions & 1 deletion build_msvc/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,19 @@ packages/*
*/Release
*/x64
*.vcxproj.user
*.vcxproj

# .vcxproj files that are auto-generated by the msvc-autogen.py script.
libbitcoin_cli/libbitcoin_cli.vcxproj
libbitcoin_common/libbitcoin_common.vcxproj
libbitcoin_crypto/libbitcoin_crypto.vcxproj
libbitcoin_server/libbitcoin_server.vcxproj
libbitcoin_util/libbitcoin_util.vcxproj
libbitcoin_wallet_tool/libbitcoin_wallet_tool.vcxproj
libbitcoin_wallet/libbitcoin_wallet.vcxproj
libbitcoin_zmq/libbitcoin_zmq.vcxproj
bench_bitcoin/bench_bitcoin.vcxproj
libtest_util/libtest_util.vcxproj

*/Win32
libbitcoin_qt/QtGeneratedFiles/*
test_bitcoin-qt/QtGeneratedFiles/*

0 comments on commit 2a2631f

Please sign in to comment.