Include tinyformat as a subtree #13834

pull Empact wants to merge 3 commits into bitcoin:master from Empact:tinyformat-subtree changing 45 files +1345 −64
  1. Empact commented at 4:02 pm on August 1, 2018: member

    This adds the existing c42f/tinyformat@689695c of tinyformat as a subtree, and extracts the modifications that had been made to a utilstrprintf.h wrapper file which is included instead of tinyformat.h directly.

    The benefits being that this should be easier to verifiably update and clearer what changes are being introduced, while making it easier to identify tinyformat.h as a dependency rather than a project file, and apply special treatment relative to that fact.

  2. Squashed 'src/tinyformat/' content from commit 689695cf5
    git-subtree-dir: src/tinyformat
    git-subtree-split: 689695cf58700e6defe3741829564cd682d5ae57
    237c78cc7d
  3. Merge commit '237c78cc7db34523d2d27640ee1b7618ddccfe88' as 'src/tinyformat' 97b6f6884e
  4. Introduce modifications to tinyformat via utilstrprintf.h
    This includes changes in:
    695041e4952ea40e0 - util: Update tinyformat
    1b8fd35aadfad6a1e - Make tinyformat errors raise an exception instead of assert()ing
    9b6d4c5cdc1ad7b12 - Move strprintf define to tinyformat.h
    6e5fd003e04b81115 - Move `*Version()` functions to version.h/cpp
    9eaa0afa6ec5d3dd0 - tinyformat: force USE_VARIADIC_TEMPLATES
    b651270cd6bfdd6d7 - util: Throw tinyformat::format_error on formatting error
    
    This does not include changes in:
    64fb0ac016c7fd01c - Declare single-argument (non-converting) constructors "explicit"
    4d9b4256d89d1f7c6 - Fix typos
    
    And drop src/tinyformat.h in favor of the subtree src/tinyformat/
    
    Note I excluded only the tinyformat cpp from the boost checks out of an
    abundance of caution - these files are not actually built into bitcoin so are
    not at risk of pulling in unwanted dependencies, whereas the header, and other
    dependencies might be.
    7d312cbd3f
  5. Empact commented at 4:03 pm on August 1, 2018: member
  6. Empact commented at 4:09 pm on August 1, 2018: member
    wip: I have some build issues to sort out, will reopen when I do
  7. Empact closed this on Aug 1, 2018

  8. MarcoFalke commented at 4:15 pm on August 1, 2018: member

    Seems like a lot of files to pull in just to make it a subtree, no? Imo tinyformat is really meant to be a single file just to be copied into the project.

    You can get the local modifications with diff $upstream_file $local_file using the upstream version mentioned in the last bump: 60b98f8e145617e9e50a2eb7f3181953e1e8c424

  9. Empact commented at 4:34 pm on August 1, 2018: member
    I’d be down with other approaches. My main desire is to separate the bitcoin code from the dependency code, and just a sub-folder is sufficient for that.
  10. Empact commented at 9:28 pm on August 1, 2018: member
    Reopening as the build seems to be sorted. I have pending follow-ups which relate to this that will help to explain the motivation.
  11. Empact commented at 9:29 pm on August 1, 2018: member
    Huh seems I’m unable to re-open due to the force pushes I made in the interim. Opening a new PR instead.
  12. MarcoFalke locked this on Sep 8, 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: 2024-11-17 12:12 UTC

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