Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix .gitignore policy in build_msvc directory #18108

Merged
merged 2 commits into from
Feb 15, 2020
Merged

Fix .gitignore policy in build_msvc directory #18108

merged 2 commits into from
Feb 15, 2020

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Feb 10, 2020

This PR makes git to ignore only auto-generated .vcxproj files, i.e.:

bitcoin/build_msvc/msvc-autogen.py

Lines 14 to 25 in 4c25787

libs = [
'libbitcoin_cli',
'libbitcoin_common',
'libbitcoin_crypto',
'libbitcoin_server',
'libbitcoin_util',
'libbitcoin_wallet_tool',
'libbitcoin_wallet',
'libbitcoin_zmq',
'bench_bitcoin',
'libtest_util',
]

Fix #17287

@hebasto
Specify ignored bitcoin-qt file precisely
79c811c 
This commit prevents ignoring the build_msvc/bitcoin-qt directory.
@hebasto
Ignore only auto-generated .vcxproj files
dcb7af0
@sipsorcery
Copy link
Contributor

ACK dcb7af0.

maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Feb 15, 2020
Merge bitcoin#18108: Fix .gitignore policy in build_msvc directory
2a2631f 
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
@maflcko maflcko merged commit dcb7af0 into bitcoin:master Feb 15, 2020
@hebasto hebasto deleted the 20200210-fix-msvc-gitignore branch February 15, 2020 18:54
@gwillen
Copy link
Contributor

gwillen commented Feb 15, 2020

Hooray, as a non-Windows dev who tripped over this when making a change that impacted the Windows build, thanks.

@MarkLTZ MarkLTZ mentioned this pull request Apr 4, 2020
Closed
MarkLTZ added a commit to litecoinz-core/litecoinz that referenced this pull request Apr 7, 2020
@MarkLTZ
Follow Bitcoin PRs:
8823f65 
- doc: fix git add argument bitcoin#18513
- build: Fix libevent linking for bench_bitcoin binary bitcoin#18397
- script: fix SCRIPT_ERR_SIG_PUSHONLY error string bitcoin#18412
- doc: Comment fix merkle.cpp bitcoin#18379
- log: Fix UB with bench on genesis block bitcoin#15283
- test: Fix mining to an invalid target + ensure that a new block has the correct hash internally bitcoin#18350
- Fix missing header in sync.h bitcoin#18357
- refactor: Fix implicit value conversion in formatPingTime bitcoin#18260
- Fix .gitignore policy in build_msvc directory bitcoin#18108
- build: Fix behavior when ALLOW_HOST_PACKAGES unset bitcoin#18051
- test: Fix p2p_invalid_messages failing in Python 3.8 because of warning bitcoin#17931
- qa: Fix double-negative arg test bitcoin#17893
- build: Fix configure report about qr bitcoin#17547
- log: Fix log message for -par=1 bitcoin#17325
- bench: Fix negative values and zero for -evals flag bitcoin#17267
- depends: fix boost mac cross build with clang 9+ bitcoin#17231
- doc: Fix broken bitcoin-cli examples bitcoin#17119
- doc: fix Makefile target in benchmarking.md bitcoin#17081
- contrib: fix minor typos in makeseeds.py bitcoin#17042
- test: Fix Python Docstring to include all Args. bitcoin#17030
- doc: Fix some misspellings bitcoin#17351
- doc: Doxygen-friendly script/descriptor.h comments bitcoin#16947
- doc: Fix doxygen errors bitcoin#17945
- doc: Doxygen-friendly CuckooCache comments bitcoin#16986
- doc: Add to Doxygen documentation guidelines bitcoin#17873
MarkLTZ added a commit to litecoinz-core/litecoinz that referenced this pull request Apr 7, 2020
@MarkLTZ
Follow Bitcoin PRs:
0a1571d 
- doc: fix git add argument bitcoin#18513
- build: Fix libevent linking for bench_bitcoin binary bitcoin#18397
- script: fix SCRIPT_ERR_SIG_PUSHONLY error string bitcoin#18412
- doc: Comment fix merkle.cpp bitcoin#18379
- log: Fix UB with bench on genesis block bitcoin#15283
- test: Fix mining to an invalid target + ensure that a new block has the correct hash internally bitcoin#18350
- Fix missing header in sync.h bitcoin#18357
- refactor: Fix implicit value conversion in formatPingTime bitcoin#18260
- Fix .gitignore policy in build_msvc directory bitcoin#18108
- build: Fix behavior when ALLOW_HOST_PACKAGES unset bitcoin#18051
- test: Fix p2p_invalid_messages failing in Python 3.8 because of warning bitcoin#17931
- qa: Fix double-negative arg test bitcoin#17893
- build: Fix configure report about qr bitcoin#17547
- log: Fix log message for -par=1 bitcoin#17325
- bench: Fix negative values and zero for -evals flag bitcoin#17267
- depends: fix boost mac cross build with clang 9+ bitcoin#17231
- doc: Fix broken bitcoin-cli examples bitcoin#17119
- doc: fix Makefile target in benchmarking.md bitcoin#17081
- contrib: fix minor typos in makeseeds.py bitcoin#17042
- test: Fix Python Docstring to include all Args. bitcoin#17030
- doc: Fix some misspellings bitcoin#17351
- doc: Doxygen-friendly script/descriptor.h comments bitcoin#16947
- doc: Fix doxygen errors bitcoin#17945
- doc: Doxygen-friendly CuckooCache comments bitcoin#16986
- doc: Add to Doxygen documentation guidelines bitcoin#17873
- depends: Consistent use of package variable bitcoin#17928
- init: Replace URL_WEBSITE with PACKAGE_URL bitcoin#18503
- doc: Add missed copyright headers bitcoin#17691
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@sipsorcery sipsorcery sipsorcery approved these changes

@fanquake fanquake Awaiting requested review from fanquake

Assignees
No one assigned
Labels
Windows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Git ignore policy in build_msvc directory
5 participants
@hebasto @sipsorcery @gwillen @fanquake @maflcko