Skip to content

Commit d415998

Browse files
author
MarcoFalke
committed
Merge #20223: build: Drop the leading 0 from the version number
8f7b930 Drop the leading 0 from the version number (Andrew Chow) Pull request description: Removes the leading 0 from the version number. The minor version, which we had been using as the major version, is now the major version. The revision, which we had been using as the minor version, is now the minor version. The revision number is dropped. The build number is promoted to being part of the version number. This also avoids issues where it was accidentally not included in the version number. The CLIENT_VERSION remains the same format as previous as previously, as the Major version was 0 so it never actually got included in it. The user agent string formatter is updated to follow this new versioning. *** Honestly I'm just tired of all of the people asking for "1.0" that maybe this'll shut them up. Skip the whole 1.0 thing and go straight to version 22.0! Also, this means that the terminology we commonly use lines up with how the variables are named. So major versions are actually bumping the major version number, etc. ACKs for top commit: jnewbery: Code review ACK 8f7b930 MarcoFalke: review ACK 8f7b930 🎻 Tree-SHA512: b5c3fae14d4c0a9c0ab3b1db7c949ecc0ac3537646306b13d98dd0efc17c489cdd16d43f0a24aaa28e9c4a92ea360500e05480a335b03f9fb308010cdd93a436
2 parents ea46029 + 8f7b930 commit d415998

17 files changed

+37
-47
lines changed

‎build_msvc/bitcoin_config.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
#define CLIENT_VERSION_IS_RELEASE false
1616

1717
/* Major version */
18-
#define CLIENT_VERSION_MAJOR 0
18+
#define CLIENT_VERSION_MAJOR 21
1919

2020
/* Minor version */
21-
#define CLIENT_VERSION_MINOR 21
22-
23-
/* Build revision */
24-
#define CLIENT_VERSION_REVISION 99
21+
#define CLIENT_VERSION_MINOR 99
2522

2623
/* Copyright holder(s) before %s replacement */
2724
#define COPYRIGHT_HOLDERS "The %s developers"
@@ -253,7 +250,7 @@
253250
#define PACKAGE_NAME "Bitcoin Core"
254251

255252
/* Define to the full name and version of this package. */
256-
#define PACKAGE_STRING "Bitcoin Core 0.21.99"
253+
#define PACKAGE_STRING "Bitcoin Core 21.99.0"
257254

258255
/* Define to the one symbol short name of this package. */
259256
#define PACKAGE_TARNAME "bitcoin"
@@ -262,7 +259,7 @@
262259
#define PACKAGE_URL "https://bitcoincore.org/"
263260

264261
/* Define to the version of this package. */
265-
#define PACKAGE_VERSION "0.21.99"
262+
#define PACKAGE_VERSION "21.99.0"
266263

267264
/* Define to necessary symbol if this constant uses a non-standard name on
268265
your system. */

‎configure.ac

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
AC_PREREQ([2.69])
2-
define(_CLIENT_VERSION_MAJOR, 0)
3-
define(_CLIENT_VERSION_MINOR, 21)
4-
define(_CLIENT_VERSION_REVISION, 99)
2+
define(_CLIENT_VERSION_MAJOR, 21)
3+
define(_CLIENT_VERSION_MINOR, 99)
54
define(_CLIENT_VERSION_BUILD, 0)
65
define(_CLIENT_VERSION_RC, 0)
76
define(_CLIENT_VERSION_IS_RELEASE, false)
87
define(_COPYRIGHT_YEAR, 2020)
98
define(_COPYRIGHT_HOLDERS,[The %s developers])
109
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
11-
AC_INIT([Bitcoin Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
10+
AC_INIT([Bitcoin Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
1211
AC_CONFIG_SRCDIR([src/validation.cpp])
1312
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
1413
AC_CONFIG_AUX_DIR([build-aux])
@@ -1612,7 +1611,6 @@ AM_CONDITIONAL([WORDS_BIGENDIAN],[test x$ac_cv_c_bigendian = xyes])
16121611

16131612
AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
16141613
AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
1615-
AC_DEFINE(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION, [Build revision])
16161614
AC_DEFINE(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD, [Version Build])
16171615
AC_DEFINE(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE, [Version is release])
16181616
AC_DEFINE(COPYRIGHT_YEAR, _COPYRIGHT_YEAR, [Copyright year])
@@ -1622,7 +1620,6 @@ define(_COPYRIGHT_HOLDERS_FINAL, [patsubst(_COPYRIGHT_HOLDERS, [%s], [_COPYRIGHT
16221620
AC_DEFINE(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL", [Copyright holder(s)])
16231621
AC_SUBST(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR)
16241622
AC_SUBST(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR)
1625-
AC_SUBST(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION)
16261623
AC_SUBST(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD)
16271624
AC_SUBST(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE)
16281625
AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)

‎contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-core-linux-0.22"
2+
name: "bitcoin-core-linux-22"
33
enable_cache: true
44
distro: "ubuntu"
55
suites:

‎contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-core-osx-0.22"
2+
name: "bitcoin-core-osx-22"
33
enable_cache: true
44
distro: "ubuntu"
55
suites:

‎contrib/gitian-descriptors/gitian-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-core-win-0.22"
2+
name: "bitcoin-core-win-22"
33
enable_cache: true
44
distro: "ubuntu"
55
suites:

‎doc/release-process.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ Release Process
1818
### Before every major release
1919

2020
* On both the master branch and the new release branch:
21-
- update `CLIENT_VERSION_MINOR` in [`configure.ac`](../configure.ac)
22-
- update `CLIENT_VERSION_MINOR`, `PACKAGE_VERSION`, and `PACKAGE_STRING` in [`build_msvc/bitcoin_config.h`](/build_msvc/bitcoin_config.h)
21+
- update `CLIENT_VERSION_MAJOR` in [`configure.ac`](../configure.ac)
22+
- update `CLIENT_VERSION_MAJOR`, `PACKAGE_VERSION`, and `PACKAGE_STRING` in [`build_msvc/bitcoin_config.h`](/build_msvc/bitcoin_config.h)
2323
* 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)):
24-
- set `CLIENT_VERSION_REVISION` to `0`
24+
- set `CLIENT_VERSION_MINOR` to `0`
25+
- set `CLIENT_VERSION_BUILD` to `0`
2526
- set `CLIENT_VERSION_IS_RELEASE` to `true`
2627

2728
#### Before branch-off

‎share/qt/Info.plist.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
<string>APPL</string>
1818

1919
<key>NSHumanReadableCopyright</key>
20-
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>
20+
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>
2121

2222
<key>CFBundleShortVersionString</key>
23-
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>
23+
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@</string>
2424

2525
<key>CFBundleVersion</key>
26-
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>
26+
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@</string>
2727

2828
<key>CFBundleSignature</key>
2929
<string>????</string>

‎share/setup.nsi.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ CRCCheck on
5656
XPStyle on
5757
BrandingText " "
5858
ShowInstDetails show
59-
VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@
59+
VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@.@CLIENT_VERSION_BUILD@
6060
VIAddVersionKey ProductName "@PACKAGE_NAME@"
6161
VIAddVersionKey ProductVersion "@PACKAGE_VERSION@"
6262
VIAddVersionKey CompanyName "${COMPANY}"

‎src/bitcoin-cli-res.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <windows.h> // needed for VERSIONINFO
22
#include "clientversion.h" // holds the needed client version information
33

4-
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
5-
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
4+
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
5+
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
66
#define VER_FILEVERSION VER_PRODUCTVERSION
77
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
88

‎src/bitcoin-tx-res.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <windows.h> // needed for VERSIONINFO
22
#include "clientversion.h" // holds the needed client version information
33

4-
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
5-
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
4+
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
5+
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
66
#define VER_FILEVERSION VER_PRODUCTVERSION
77
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
88

0 commit comments

Comments
 (0)