diff options
| author | fanquake <fanquake@gmail.com> | 2019-08-21 07:44:39 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-08-21 08:02:20 +0800 |
| commit | 8ee572f0940bbf1823e946ec507c5fe46db90fb8 (patch) | |
| tree | 977a3eecca509d2f82410d13dadc6e8752bbe3f5 | |
| parent | 70b12af87eb036623f5dd1f3a519efe6c156570d (diff) | |
| parent | c84ff23c6daade5145d960e1ac26596ddede2da1 (diff) | |
Merge #16371: build: ignore macOS make deploy artefacts & add them to clean-local
c84ff23c6daade5145d960e1ac26596ddede2da1 build: ignore macOS make deploy artefacts & add them to clean-local (fanquake)
Pull request description:
ACKs for top commit:
hebasto:
ACK c84ff23c6daade5145d960e1ac26596ddede2da1, tested on Linux Mint 19.2:
dongcarl:
ACK c84ff23c6daade5145d960e1ac26596ddede2da1
Tree-SHA512: 5a6525a5e433a7279807cc02d3f47bb7f4bd5da8142a945b21d3bfa71938cac823569b34b071e21525a817a187fb02a562bb1c5a9761e2019a2b0900a51a8315
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 25710978c3..809e851ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,7 @@ db4/ # clang-check *.plist + +osx_volname +dist/ +*.background.tiff diff --git a/Makefile.am b/Makefile.am index 712f2a454d..8b1e2a6b5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -310,4 +310,5 @@ clean-docs: clean-local: clean-docs rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__ + rm -rf osx_volname dist/ dpi36.background.tiff dpi72.background.tiff |