msvc: Update vcpkg manifest #31186

pull hebasto wants to merge 4 commits into bitcoin:master from hebasto:241030-vcpkg-json changing 1 files +43 −25
  1. hebasto commented at 5:42 pm on October 30, 2024: member

    This PR updates the vcpkg manifest baseline from the 2023.08.09 Release to the 2024.09.30 Release, with the following package changes:

    • boost: 1.82.0#2 –> 1.85.0#1,2
    • qt5: 5.15.10#5 -> 5.15.15
    • sqlite3: 3.42.0#1 –> 3.46.1
    • zeromq: 2023-06-20#1 –> 4.3.5#2

    The previous update was made in #28938.

    For additional minor improvements, please refer to the commit messages.

  2. hebasto added the label Windows on Oct 30, 2024
  3. hebasto added the label Build system on Oct 30, 2024
  4. DrahtBot commented at 5:42 pm on October 30, 2024: contributor

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Code Coverage & Benchmarks

    For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/31186.

    Reviews

    See the guideline for information on the review process.

    Type Reviewers
    ACK fanquake

    If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #31173 (cmake: Add FindQRencode module and enable libqrencode package for MSVC by hebasto)
    • #30997 (build: Switch to Qt 6 by hebasto)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  5. hebasto commented at 8:20 pm on October 30, 2024: member
    Friendly ping @sipsorcery @hodlinator ;)
  6. in vcpkg.json:1 in 4f06a3648f outdated


    hodlinator commented at 9:38 pm on October 30, 2024:

    cat vcpkg.json | jq -S results in a different order, seems more lexicographical to me?

     0{
     1  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
     2  "builtin-baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2",
     3  "default-features": [
     4    "wallet",
     5    "zeromq",
     6    "tests",
     7    "qt5"
     8  ],
     9  "dependencies": [
    10    "boost-date-time",
    11    "boost-multi-index",
    12    "boost-signals2",
    13    "libevent"
    14  ],
    15  "features": {
    16    "berkeleydb": {
    17      "dependencies": [
    18        "berkeleydb"
    19      ],
    20      "description": "Enable Berkeley DB wallet support"
    21    },
    22    "qt5": {
    23      "dependencies": [
    24        "qt5-base",
    25        "qt5-tools"
    26      ],
    27      "description": "Build GUI, Qt 5"
    28    },
    29    "sqlite": {
    30      "dependencies": [
    31        "sqlite3"
    32      ],
    33      "description": "Enable SQLite wallet support"
    34    },
    35    "tests": {
    36      "dependencies": [
    37        "boost-test"
    38      ],
    39      "description": "Build test_bitcoin.exe executable"
    40    },
    41    "wallet": {
    42      "dependencies": [
    43        "berkeleydb",
    44        "sqlite3"
    45      ],
    46      "description": "Enable wallet"
    47    },
    48    "zeromq": {
    49      "dependencies": [
    50        "zeromq"
    51      ],
    52      "description": "Enable ZMQ notifications"
    53    }
    54  },
    55  "overrides": [
    56    {
    57      "name": "libevent",
    58      "version": "2.1.12#7"
    59    },
    60    {
    61      "name": "liblzma",
    62      "version": "5.4.1#1"
    63    }
    64  ]
    65}
    

    hebasto commented at 11:12 am on October 31, 2024:
    I’ve dropped mentioning of lexicographical order from the commit message. The goal of the reordering is to minimize diffs for invocations like vcpkg add port libqrencode.
  7. in vcpkg.json:2 in fad685ce54 outdated
    0@@ -1,46 +1,64 @@
    1 {
    2   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
    3-  "builtin-baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2",
    4-  "overrides":[
    5-    {"name": "libevent", "version": "2.1.12#7"},
    6-    {"name": "liblzma", "version": "5.4.1#1"}
    7-  ],
    8+  "$comment": "The builtin-baseline corresponds to 2024.09.30 Release",
    


    hodlinator commented at 9:49 pm on October 30, 2024:
    $comment should appear ordered before $schema, unless the latter must appear first?

    hebasto commented at 10:46 am on October 31, 2024:

    This "$comment" field actually comments the following line

    UPD. Reordered.


    hodlinator commented at 11:04 am on October 31, 2024:
    Saw that, but it mentions it by name so I thought maybe keeping the lexicographical order the first commit tries to introduce would have precedent.
  8. hodlinator commented at 11:41 pm on October 30, 2024: contributor

    Tested on Windows 11 Home:

    0> rmdir /S build
    1> cmake -B build --preset vs2022-static
    2> cmake --build build --config Release -j<X>
    3> build\src\qt\Release\bitcoin-qt.exe (started successfully)
    
  9. Marcolaris approved
  10. build, msvc: Reorder keys in `vcpkg.json`
    This change ensures that any further manipulation of `vcpkg.json` via
    the `vcpkg` command will produce minimal diffs.
    9a0734df5f
  11. build, msvc: Drop no longer needed `liblzma` version pinning
    For historical context, see https://github.com/hebasto/bitcoin/pull/140.
    ec47cd2b50
  12. build, msvc: Document `libevent` version pinning 16e16013bf
  13. build, msvc: Update vcpkg manifest baseline
    The `"$comment"` field is positioned at the top, as it will be
    automatically placed there during any processing of this file by
    `vcpkg.exe`.
    f6577b7174
  14. hebasto force-pushed on Oct 31, 2024
  15. Skate-Cloud approved
  16. fanquake approved
  17. fanquake commented at 4:25 pm on November 5, 2024: member
    ACK f6577b717416191e65ba8221be57f1a48d74e5d7
  18. fanquake merged this on Nov 5, 2024
  19. fanquake closed this on Nov 5, 2024

  20. hebasto deleted the branch on Nov 5, 2024

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-12-21 15:12 UTC

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