aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorW. J. van der Laan <laanwj@protonmail.com>2021-11-15 14:54:56 +0100
committerW. J. van der Laan <laanwj@protonmail.com>2021-11-15 15:11:44 +0100
commit2efc8c0999a4b99cfe3076f7312806e83e778261 (patch)
tree6738be0b09c2de4cf690b1a7daf6e63aacbf3ab1 /doc
parent41a1b5f58ca59d2177dcadf834efd187fa3fba52 (diff)
parent410f99faed47e27fca77531a864383b6119e7b0b (diff)
Merge bitcoin/bitcoin#23198: build: Parse version information in msvc-autogen.py
410f99faed47e27fca77531a864383b6119e7b0b build_msvc/bitcoin_config.h is generated using build_msvc/msvc-autogen.py (CallMeMisterOwl) Pull request description: Added a function that parses version information from `configure.ac` into `build_msvc/bitcoin_config.h`. This is done by default in `msvc-autogen.py`, so manual changing of `build_msvc/bitcoin_config.h` is 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 ACKs for top commit: laanwj: Code review and lightly tested ACK 410f99faed47e27fca77531a864383b6119e7b0b Tree-SHA512: 6b324ec8680b70c405c46a0fcd61836d1b57bb3eaef2cc36bb1e9856890f0423c201a8fdddc95ca0fb5b3dade71ff6d4d14351c606b3351eef2faa0c70bca38a
Diffstat (limited to 'doc')
-rw-r--r--doc/release-process.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/release-process.md b/doc/release-process.md
index 14567d4f15..f786b345b1 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -19,8 +19,7 @@ Release Process
* On both the master branch and the new release branch:
- update `CLIENT_VERSION_MAJOR` in [`configure.ac`](../configure.ac)
- - update `CLIENT_VERSION_MAJOR`, `PACKAGE_VERSION`, and `PACKAGE_STRING` in [`build_msvc/bitcoin_config.h`](/build_msvc/bitcoin_config.h)
-* On the new release branch in [`configure.ac`](../configure.ac) and [`build_msvc/bitcoin_config.h`](/build_msvc/bitcoin_config.h) (see [this commit](https://github.com/bitcoin/bitcoin/commit/742f7dd)):
+* On the new release branch in [`configure.ac`](../configure.ac)(see [this commit](https://github.com/bitcoin/bitcoin/commit/742f7dd)):
- set `CLIENT_VERSION_MINOR` to `0`
- set `CLIENT_VERSION_BUILD` to `0`
- set `CLIENT_VERSION_IS_RELEASE` to `true`