Use only 3 levels for defining the version
ClosedPublic
Actions

Authored by Fabien on Sep 24 2019, 16:01.

Details

Reviewers

deadalnix

Group Reviewers

Restricted Project

Commits

rSTAGING8f09215cbe73: Use only 3 levels for defining the version
rABC8f09215cbe73: Use only 3 levels for defining the version

Summary

The version is defined with 3 levels: major.minor.rev (e.g. 0.20.2).
There is an additional 4th leve defined as the build version wich is
always set to zero in our releases.
This diff removes the extra level in the version number.

Test Plan

Build on all platforms, then:

bitcoind -version
bitcoinqt -version
bitcoin-cli -version
bitcoin-tx -help

Run the gitian builds on all platforms.
Generate the man pages and check the version number has 3 levels.

Diff Detail

Repository

rABC Bitcoin ABC

Branch

cmake_short_version

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 7607
Build 13254: Bitcoin ABC Buildbot (legacy)
Build 13253: arc lint + arc unit

Event Timeline

Fabien created this revision.Sep 24 2019, 16:01

Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 24 2019, 16:01

Herald added a reviewer: deadalnix. · View Herald Transcript

Build Bitcoin-ABC / Diffs / Diff Testing started.

Fabien added inline comments.Sep 24 2019, 16:07

share/setup.nsi.in
61 ↗	(On Diff #13119)	Note to reviewers: The format for windows is fixed: `a.b.c.d` where `a, b, c, and d` are 16-bit integers. The 4th digit is forced-set to 0 for compatibility.

Fabien edited the test plan for this revision. (Show Details)Sep 24 2019, 16:10

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7573: Diff 13119.Sep 24 2019, 16:14

Fabien added inline comments.Sep 24 2019, 17:21

share/setup.nsi.in
61 ↗	(On Diff #13119)	From stackoverflow, this variable is used to set the `VS_FIXEDFILEINFO` structure: https://docs.microsoft.com/fr-fr/windows/win32/api/verrsrc/ns-verrsrc-vs_fixedfileinfo?redirectedfrom=MSDN

deadalnix accepted this revision.Sep 27 2019, 12:55

deadalnix added inline comments.

src/clientversion.h
17 ↗	(On Diff #13119)	This would probably benefit from a relayout.

This revision is now accepted and ready to land.Sep 27 2019, 12:55

Rebase and address feedback.

Build Bitcoin-ABC / Diffs / Diff Testing started.

Fabien added inline comments.Sep 27 2019, 13:28

src/clientversion.h
17 ↗	(On Diff #13119)	Moving `!defined(CLIENT_VERSION_IS_RELEASE)` would have make the line 81 character long, so I moved `!defined(COPYRIGHT_YEAR)` instead.