build: add background.tiff and .pngs to "make clean" #17389

pull RandyMcMillan wants to merge 21 commits into bitcoin:master from RandyMcMillan:make-clean-tiff changing 13 files +148 −74
  1. RandyMcMillan commented at 11:20 PM on November 5, 2019: contributor

    After the initial build

    /bitcoin/background.tiff /bitcoin/background.tiff.png /bitcoin/background.tiff@2x.png

    persist.

    They should be removed by make clean

    Pretested prior to PR: https://travis-ci.org/RandyMcMillan/bitcoin/builds/607770432

  2. doc: Add ShellCheck to lint tests dependencies 2ad74b78c6
  3. cli: fix -getinfo output when compiled with no wallet 3d05d33269
  4. Add EnsureLegacyScriptPubKeyMan and use in rpcwallet.cpp
    This also fixes unused variable warnings in rpcdump.cpp
    b07b07cd87
  5. doc: Update doc/bips.md with recent changes in master fa7f5a4d2a
  6. Pass CTxDestination to ScriptPubKeyMan::GetMetadata
    Pass CTxDestination instead of more ambiguous uint160 hash value. This is more
    type safe and more efficient since it avoids doing map lookups that will always
    fail and were not done previously before
    a18edd7b383d667b15b6d4b87aa3a055a9fa5051 from
    https://github.com/bitcoin/bitcoin/pull/17304
    
    Change suggested by Andrew Chow <achow101-github@achow101.com> in
    https://github.com/bitcoin/bitcoin/pull/17304#discussion_r340345745 and
    https://github.com/bitcoin/bitcoin/pull/17381#issuecomment-549994944
    4a0abf694e
  7. Get rid of confusing LegacyScriptPubKeyMan::TopUpKeyPool method
    Previous discussion https://github.com/bitcoin/bitcoin/pull/17304#discussion_r340307903
    491a599b37
  8. Clean up nested scope in GetReservedDestination
    Suggested https://github.com/bitcoin/bitcoin/pull/17304#discussion_r341194391
    by Gregory Sanders <gsanders87@gmail.com>
    
    Reason for keeping the `return true` `return false` verbosity is that more code
    will be added after the ReserveKeyFromKeyPool() call before returning.
    bfd826a675
  9. Add missing SetupGeneration error handling in EncryptWallet
    Suggested https://github.com/bitcoin/bitcoin/pull/17304#discussion_r341286026
    by me
    05b224a175
  10. doc: Add template for good first issues 7b78b8d3a6
  11. build: add background.tiff and pngs to make clean 5badb57334
  12. Add missing newline in util_ChainMerge test
    This was causing a lot of test cases not not be very meaningful because
    multiple configuration options were combined into one line.
    
    The changes in test output with this fix make sense and look like:
    
    ```diff
    - testnet=1 regtest=1 || test
    + testnet=1 regtest=1 || error: Invalid combination of -regtest, -testnet and -chain. Can use at most one.
    ```
    
    Issue was reported and debugged by
    Wladimir J. van der Laan <laanwj@protonmail.com> in
    https://github.com/bitcoin/bitcoin/pull/17385#issuecomment-550033222
    3645e4ca00
  13. fanquake added the label Build system on Nov 5, 2019
  14. Add util_ArgParsing test
    ArgsManager test coverage for parsing of integer and boolean values is
    currently very poor and doesn't give us a way of knowing whether changes to
    ArgsManager may unintentionally break backwards compatibility, so this adds a
    new test to catch regressions.
    286f197704
  15. Merge #17370: doc: Update doc/bips.md with recent changes in master
    fa7f5a4d2a2581cc25125311892a80efc2c494e2 doc: Update doc/bips.md with recent changes in master (MarcoFalke)
    
    Pull request description:
    
      Follow-up to #17165
    
    ACKs for top commit:
      jonatack:
        ACK fa7f5a4d2a2581cc25125311892a80efc2c494e2. Verified markdown view at https://github.com/MarcoFalke/bitcoin-core/blob/1911-docBips/doc/bips.md and the urls in the links. Some of the PRs are indicated with # and some without, but this is the case over the whole document.
      laanwj:
        ACK fa7f5a4d2a2581cc25125311892a80efc2c494e2
      fanquake:
        ACK fa7f5a4d2a2581cc25125311892a80efc2c494e2
    
    Tree-SHA512: 31782b5f1f2f10b1189f05f010f908c183dbe723477ca1c46ad1d3bee5ea483335847008a7fe48d72373ccd39b84e0b950d0d1b23e457cb70f34210c5f2dc6aa
    4e21f72980
  16. jonasschnelli commented at 4:25 AM on November 6, 2019: contributor

    utACK 5badb5733412729e38cc9792bc604ef66bddfd1a

  17. jonasschnelli added the label macOS on Nov 6, 2019
  18. practicalswift commented at 6:49 AM on November 6, 2019: contributor

    ACK 5badb5733412729e38cc9792bc604ef66bddfd1a -- diff looks correct

  19. Merge #17388: Add missing newline in util_ChainMerge test
    3645e4ca0033bb6365f41ef710111780c139370f Add missing newline in util_ChainMerge test (Russell Yanofsky)
    
    Pull request description:
    
      This was causing a lot of test cases not not be very meaningful because
      multiple configuration options were combined into one line.
    
      The changes in test output with this fix make sense and look like:
    
      ```diff
      - testnet=1 regtest=1 || test
      + testnet=1 regtest=1 || error: Invalid combination of -regtest, -testnet and -chain. Can use at most one.
      ```
    
      Issue was reported and debugged by
      Wladimir J. van der Laan <laanwj@protonmail.com> in
      https://github.com/bitcoin/bitcoin/pull/17385#issuecomment-550033222
    
      <!--
      *** Please remove the following help text before submitting: ***
    
      Pull requests without a rationale and clear improvement may be closed
      immediately.
      -->
    
      <!--
      Please provide clear motivation for your patch and explain how it improves
      Bitcoin Core user experience or Bitcoin Core developer experience
      significantly:
    
      * Any test improvements or new tests that improve coverage are always welcome.
      * All other changes should have accompanying unit tests (see `src/test/`) or
        functional tests (see `test/`). Contributors should note which tests cover
        modified code. If no tests exist for a region of modified code, new tests
        should accompany the change.
      * Bug fixes are most welcome when they come with steps to reproduce or an
        explanation of the potential issue as well as reasoning for the way the bug
        was fixed.
      * Features are welcome, but might be rejected due to design or scope issues.
        If a feature is based on a lot of dependencies, contributors should first
        consider building the system outside of Bitcoin Core, if possible.
      * Refactoring changes are only accepted if they are required for a feature or
        bug fix or otherwise improve developer experience significantly. For example,
        most "code style" refactoring changes require a thorough explanation why they
        are useful, what downsides they have and why they *significantly* improve
        developer experience or avoid serious programming bugs. Note that code style
        is often a subjective matter. Unless they are explicitly mentioned to be
        preferred in the [developer notes](/doc/developer-notes.md), stylistic code
        changes are usually rejected.
      -->
    
      <!--
      Bitcoin Core has a thorough review process and even the most trivial change
      needs to pass a lot of eyes and requires non-zero or even substantial time
      effort to review. There is a huge lack of active reviewers on the project, so
      patches often sit for a long time.
      -->
    
    ACKs for top commit:
      laanwj:
        ACK 3645e4ca0033bb6365f41ef710111780c139370f
      practicalswift:
        ACK 3645e4ca0033bb6365f41ef710111780c139370f -- diff looks correct
    
    Tree-SHA512: ca5bde9b9f553811d4827113f4880d15d7b8f4f1455b95bbf34c9a1512fdd53062f1a2133c50d9b54f94160a1ee77a54bc82681a5f3bf25d2b0d01f8a8e95165
    224c19645f
  20. laanwj commented at 9:39 AM on November 6, 2019: member

    Obligatory question: this remove is safe for non-MacOS platforms right?

  21. Merge #17368: cli: fix -getinfo output when compiled with no wallet
    3d05d332693ec860626fc77e6ba50dec94e4e83c cli: fix -getinfo output when compiled with no wallet (fanquake)
    
    Pull request description:
    
      master (33b155f28732487854cf0ca29ca17c50f8c6872e):
      ```bash
      src/bitcoin-cli -getinfo
      {
        "version": 199900,
        "protocolversion": 70015,
        "blocks": 602348,
        "headers": 602348,
        "verificationprogress": 0.9999995592310106,
        "timeoffset": 0,
        "connections": 10,
        "proxy": "",
        "difficulty": 13691480038694.45,
        "chain": "main",
        "walletversion": null,
        "balance": null,
        "keypoololdest": null,
        "keypoolsize": null,
        "paytxfee": null,
        "relayfee": 0.00001000,
        "warnings": "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications"
      }
      ```
    
      This PR (3d05d332693ec860626fc77e6ba50dec94e4e83c):
      ```bash
      {
        "version": 199900,
        "protocolversion": 70015,
        "blocks": 602348,
        "headers": 602348,
        "verificationprogress": 0.9999996313568186,
        "timeoffset": 0,
        "connections": 10,
        "proxy": "",
        "difficulty": 13691480038694.45,
        "chain": "main",
        "relayfee": 0.00001000,
        "warnings": "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications"
      }
      ```
    
    ACKs for top commit:
      MarcoFalke:
        ouch ACK 3d05d332693ec860626fc77e6ba50dec94e4e83c
      laanwj:
        ACK 3d05d332693ec860626fc77e6ba50dec94e4e83c
      darosior:
        ACK 3d05d332693ec860626fc77e6ba50dec94e4e83c
    
    Tree-SHA512: 055424e122a082cbfea410da287d9ceb7ed405fd68d53e2f5bef62beea80bc374a7d00366de0479d23faecb7f063b232aca52e9fdbdb97c58ddf46e7749136a9
    7967104aee
  22. build: Remove install command samples
    test/README.md contains comprehensive install instructions.
    80c9e66ab8
  23. Merge #17353: doc: Add ShellCheck to lint tests dependencies
    80c9e66ab84f8cecc2bf2eebf508a5aad8911246 build: Remove install command samples (Hennadii Stepanov)
    2ad74b78c61697068be5d157785592c0c875a347 doc: Add ShellCheck to lint tests dependencies (Hennadii Stepanov)
    
    Pull request description:
    
      In master (9641366950276da88af626d0898676195df8d83a) the lint tests dependencies list lacks ShellCheck. This PR fixes it.
    
      Also `lint-python.sh` is slightly improved.
    
    ACKs for top commit:
      laanwj:
        ACK 80c9e66ab84f8cecc2bf2eebf508a5aad8911246
      promag:
        ACK 80c9e66ab84f8cecc2bf2eebf508a5aad8911246, verified internal and external links. Nice looking table.
    
    Tree-SHA512: b63718a6c41be93137db70586465d84ca0b1ff33c0f2674147c928cb1bdf903ec7587861c09ad832841264285f99c7b171d5319eef3c989822a7cd01449222ae
    22a58811d4
  24. Merge #17339: doc: Add template for good first issues
    7b78b8d3a64503d582af8298241a20ebf582a0c5 doc: Add template for good first issues (Michael Folkson)
    
    Pull request description:
    
      closes #17317
    
      Attempted to address everyone's suggestions in #17317 without making it too long. The first half is for the benefit of the individual opening the issue and the second half is for the benefit of the new contributor. Ideally we don't want the second half to be deleted by the individual opening the issue but whether they delete the first half or not isn't really a concern
    
    ACKs for top commit:
      MarcoFalke:
        ACK 7b78b8d3a64503d582af8298241a20ebf582a0c5
      jonatack:
        ACK 7b78b8d3a64503d582af8298241a20ebf582a0c5
    
    Tree-SHA512: 5874b244a52f432637600a73aac493972971568f8d8af10aa731b8a6b221566015827dd82c310c60a76fb01140c3bc56a691206c3442018611c820d4b98d104f
    86771d4310
  25. Merge #17390: test: Add util_ArgParsing test
    286f197704e82045c762d332aba5d1ac52e0212d Add util_ArgParsing test (Russell Yanofsky)
    
    Pull request description:
    
      ArgsManager test coverage for parsing of integer and boolean values is
      currently very poor and doesn't give us a way of knowing whether changes to
      ArgsManager may unintentionally break backwards compatibility, so this adds a
      new test to catch regressions.
    
    ACKs for top commit:
      promag:
        ACK 286f197, more surprising results 😱
      laanwj:
        ACK 286f197704e82045c762d332aba5d1ac52e0212d
    
    Tree-SHA512: 9e1db3ef87e55abbc280af60c088f35765a1f9e2ec20507ad0c1992027b875490016868dcb8cc287e6df279dd0e00f10550901af3de3d36287867249e0bd8207
    6f4e247357
  26. Merge #17381: LegacyScriptPubKeyMan code cleanups
    05b224a175065aee4d6d9c471722bc4503f01fdf Add missing SetupGeneration error handling in EncryptWallet (Russell Yanofsky)
    bfd826a675445801adec86a469040f3ceb8172ee Clean up nested scope in GetReservedDestination (Russell Yanofsky)
    491a599b37f3e3a648e52aebed677ca11b0615e2 Get rid of confusing LegacyScriptPubKeyMan::TopUpKeyPool method (Russell Yanofsky)
    4a0abf694ee10cf186f25a67ca35c3fce0c10874 Pass CTxDestination to ScriptPubKeyMan::GetMetadata (Russell Yanofsky)
    b07b07cd8779355ba1dd16e7eb4af42e0ae1c587 Add EnsureLegacyScriptPubKeyMan and use in rpcwallet.cpp (Russell Yanofsky)
    
    Pull request description:
    
      This PR implements suggested code cleanups from #17300 and #17304 review comments
    
    ACKs for top commit:
      Sjors:
        re-ACK 05b224a
      laanwj:
        Code review ACK 05b224a175065aee4d6d9c471722bc4503f01fdf
    
    Tree-SHA512: 12fd86637088515b744c028e0501c5d21a9cf9ee9c9cfd70e9cb65d44611ea5643abd5f6f101105caa5aff015d74de606f074f08af7dae8429f929d21288ab45
    976cc766c4
  27. RandyMcMillan commented at 4:48 PM on November 6, 2019: contributor

    If the files don’t exist they will be created like an initial build.

    if TARGET_DARWIN is FALSE other platforms never see the macOS build nor do they rely on any macOS specific build products as far as I can see.

    https://github.com/bitcoin/bitcoin/blob/e65b4160e99fa86d6d840dce75cae29334afd1f2/Makefile.am#L168

    The logic in LINES:33-35 isn't correct either - but I am waiting on creating that PR.
    https://github.com/bitcoin/bitcoin/blob/e65b4160e99fa86d6d840dce75cae29334afd1f2/Makefile.am#L33

  28. laanwj commented at 9:17 AM on November 8, 2019: member

    The important thing here is that $(OSX_BACKGROUND_IMAGE) has a valid value, even when doing a non-macos build. If it would be empty, $(OSX_BACKGROUND_IMAGE)@2x.png would try to delete @2x.png, which is not the intent.

    Looking at the Makefile.am, it's set outside any conditionals, so I think it's okay.

  29. Merge branch 'make-clean-tiff' of https://github.com/RandyMcMillan/bitcoin into make-clean-tiff
    * 'make-clean-tiff' of https://github.com/RandyMcMillan/bitcoin:
      build: add background.tiff and pngs to make clean
    027e39019e
  30. RandyMcMillan closed this on Nov 8, 2019

  31. laanwj commented at 11:03 PM on November 8, 2019: member

    Why did you close this? I was waiting for maybe some confirmation from another reviewer but I think it was basically mergable.

  32. RandyMcMillan commented at 1:45 AM on November 9, 2019: contributor

    @laanwj - I was using the Mac Github app to review my commits before pushing - and there must have been some kind of bug. I just installed the update (I hope that fixes it). Kinda embarrassing. It explains some noise that I was creating earlier in my PRs which I apologized about. As you can see the PR is now displaying a bunch of commits that I couldn't see.

    Here is my topic branch - https://github.com/RandyMcMillan/bitcoin/tree/make-clean-tiff

    I thought I was losing my mind. https://github.com/desktop/desktop/issues/8401 https://github.com/desktop/desktop/issues/8155

  33. RandyMcMillan commented at 4:04 AM on November 9, 2019: contributor

    make clean isn't removing the Bitcoin-Qt.dmg either so I am going to take a look at that anyway.

  34. DrahtBot locked this on Dec 16, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-17 15:14 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me