From 3ee28c506d846b525afc1cbb7b77e7c5d7228955 Mon Sep 17 00:00:00 2001 From: Jon Atack Date: Thu, 23 May 2019 13:06:19 +0200 Subject: [PATCH 1/2] build: bump bitcoin_config.h packages to v0.18 Follow-up to 48ed65b. --- build_msvc/bitcoin_config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_msvc/bitcoin_config.h b/build_msvc/bitcoin_config.h index b5a05e2629e..ab13f73539a 100644 --- a/build_msvc/bitcoin_config.h +++ b/build_msvc/bitcoin_config.h @@ -346,7 +346,7 @@ #define PACKAGE_NAME "Bitcoin Core" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Bitcoin Core 0.17.99" +#define PACKAGE_STRING "Bitcoin Core 0.18.99" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "bitcoin" @@ -355,7 +355,7 @@ #define PACKAGE_URL "https://bitcoincore.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.17.99" +#define PACKAGE_VERSION "0.18.99" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ From 8afca323e371a7a191d874928046d6bf2fbbe072 Mon Sep 17 00:00:00 2001 From: Jon Atack Date: Thu, 23 May 2019 17:54:29 +0200 Subject: [PATCH 2/2] doc: add bitcoin_config.h PACKAGE updates to release process and reorganise the section and add relative url links. Follow-up to e47dc4f. --- doc/release-process.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/release-process.md b/doc/release-process.md index 9b796fa8169..e9c6d5bf0d6 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -27,10 +27,10 @@ Release Process * Update [`src/chainparams.cpp`](/src/chainparams.cpp) m_assumed_blockchain_size and m_assumed_chain_state_size with the current size plus some overhead. * Update `src/chainparams.cpp` chainTxData with statistics about the transaction count and rate. Use the output of the RPC `getchaintxstats`, see [this pull request](https://github.com/bitcoin/bitcoin/pull/12270) for an example. Reviewers can verify the results by running `getchaintxstats ` with the `window_block_count` and `window_last_block_hash` from your output. -* In `configure.ac` and `build_msvc/bitcoin_config.h` on _the master branch_: - - update `CLIENT_VERSION_MINOR` version -* In `configure.ac` and `build_msvc/bitcoin_config.h` on _a new release branch_ (see [this commit](https://github.com/bitcoin/bitcoin/commit/742f7dd972fca3dd4a33cfff90bf901b71a687e7)): - - update `CLIENT_VERSION_MINOR` version +* On both the master branch and the new release branch: + - update `CLIENT_VERSION_MINOR` in [`configure.ac`](../configure.ac) + - update `CLIENT_VERSION_MINOR`, `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)): - set `CLIENT_VERSION_REVISION` to `0` - set `CLIENT_VERSION_IS_RELEASE` to `true`