-
Notifications
You must be signed in to change notification settings - Fork 38.7k
build: Parse version information in msvc-autogen.py #23198
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.
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
Conversation
|
Sorry for the second pull request, I tried to squash the commits but something went wrong and it ended up with a lot of other commits. This is the fixed version now, hope this works. |
|
In future, please don't open new Pull Requests for the same change. You should be able to recover your branch. Please combine the change from #23195 into this PR. You'll also need to sqaush your commits here, and write a more cohesive commit message. See the update PR description for an example. |
|
@CallMeMisterOwl thx for the PR. Am I correct that its purpose is to update the version fields in the |
|
Please squash your commits according to https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#squashing-commits |
Got it
Done |
|
The instructions to squash don't work when there are merge commit. You can use something like this instead: |
0310bd9 to
82ba8f8
Compare
|
Did it work ? |
|
No, you'll need to rebase on latest master now. Also, you can remove the "Fixes #..." prefix from the commit message and put it into the GitHub pull request description. |
|
Again, a rebase it not possible with merge commits in between (I think), you'll have to repeat the steps of #23198 (comment) with the commit hash of the latest master. |
0d36a83 to
8be91af
Compare
sipsorcery
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works correctly for me.
|
The change in this PR works correctly and makes sense. But... I'm 50-50 on the concept of the Python pre-build script for the msvc build. The original goal of the msvc build was to provide a quick and easy way for Windows devs to build and debug Bitcoin Core, adding the build to the CI was an added benefit. The dilemna is as the Python pre-build script is slowly morphing into a mini build system. It causes me a vague sesne of unease to see the script grow. That concern noted, I've can only recall seeing two issues over nearly 4 years with devs griping about running the script so it doesn't seem to have translated into a pain point so far. This PR removes a manual step in the Bitcoin Core release process and therefore is a good idea. tACK 8be91af6315b1d8b09a80fa35154ff453fbc9595. |
|
Concept ACK. Seems ok to simplify the release process without complicating other steps. |
|
@laanwj As you opened the issue, do you think this is ready for merge? |
I would agree in general. We definitely don't want to invent yet another meta-build system. But for this specifically it's quite an annoyance for every release to have to update these things manually. The reason it's not forgotten more often is because I wrote another python script (https://github.com/bitcoin-core/bitcoin-maintainer-tools/blob/master/make-tag.py) to check everything before making a tag. Most of that script can go after this, so I definitely see this as progress. |
cffc379 to
1876c69
Compare
1876c69 to
410f99f
Compare
|
Code review and lightly tested ACK 410f99f |
Pleasure contributing to this beautiful project 😉 |
The MSVC check is no longer necessary as of bitcoin/bitcoin#23198, which generates the version information by parsing `configure.ac`. (we like want to backport that 22.1 as well, before the next minor release there, to avoid needing three variants of the make-tag script)
e4ba90f make-tag: Remove MSVC check (laanwj) Pull request description: The MSVC check is no longer necessary as of bitcoin/bitcoin#23198, which generates the version information by parsing `configure.ac`. (we likely want to backport that to 22.1 as well, to avoid needing three variants of the make-tag script) Top commit has no ACKs. Tree-SHA512: 408e3cad8da718b9c57f68756183c7cfb38883b266402d13d25abc8da8b18e849d84b1dcf4ae45b4c5e2ae66fca4aa288a0e1c3f7439b75a8205adbaf8648263
Added a function that parses version information from
configure.acintobuild_msvc/bitcoin_config.h. This is done by default inmsvc-autogen.py, so manual changing ofbuild_msvc/bitcoin_config.his no longer required.In addition to that I updated the Release Process doc.
Following values are updated:
-CLIENT_VERSION_BUILD
-CLIENT_VERSION_IS_RELEASE
-CLIENT_VERSION_MAJOR
-CLIENT_VERSION_MINOR
-COPYRIGHT_YEAR
-PACKAGE_STRING
-PACKAGE_VERSION
fixes #23073