diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-02-15 10:39:40 -0800 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-02-15 10:40:44 -0800 |
| commit | 2a2631fb0dc781504df0f3fe8b42f21cbdb6f20d (patch) | |
| tree | bba2076c3b38bcfd7594573019a2c44976f87f72 | |
| parent | 470664f2b788e2cce9202991d11476a6fef00ef4 (diff) | |
| parent | dcb7af053da8f4ce479db7e776802cea26e84434 (diff) | |
| download | bitcoin-2a2631fb0dc781504df0f3fe8b42f21cbdb6f20d.tar.xz | |
Merge #18108: Fix .gitignore policy in build_msvc directory
dcb7af053da8f4ce479db7e776802cea26e84434 Ignore only auto-generated .vcxproj files (Hennadii Stepanov)
79c811ca2b922e19c4e6289bfd57481e587cd024 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 dcb7af053da8f4ce479db7e776802cea26e84434.
Tree-SHA512: 5acfc3cb50e1239655bc9715711c8a0489093ed7cc287756614740f67908f11a55976cec75b29e263d4d3579b6b8af99bb3823515d43adf204cd5935fb2e1a3f
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | build_msvc/.gitignore | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index bc8751c805..1c487f43a7 100644 --- a/.gitignore +++ b/.gitignore @@ -90,7 +90,7 @@ src/qt/bitcoin-qt.includes *.qm Makefile !depends/Makefile -bitcoin-qt +src/qt/bitcoin-qt Bitcoin-Qt.app background.tiff* diff --git a/build_msvc/.gitignore b/build_msvc/.gitignore index 4d4aef7e35..3e71c7b8d3 100644 --- a/build_msvc/.gitignore +++ b/build_msvc/.gitignore @@ -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/* |