build: Deduplicate version numbers #10155

pull laanwj wants to merge 4 commits into bitcoin:master from laanwj:2017_03_version_bump changing 6 files +14 −44

laanwj commented at 7:49 AM on April 5, 2017: member

Release process streamlining: This removes all the duplicate version numbers from the build and makes bumping the version number a matter of changing one place instead of five (e.g. https://github.com/bitcoin/bitcoin/commit/47d24c85b71b854939522238f8e44c891d8674af).

If it is preferred to keep the version information in the README's then those could be generated from .in as well. My reason for not having done this is because people might want to read those before running the build system.

doc: Remove version numbers from READMEs

If we want to keep these numbers, could generate them using autoconf.
But this seems unnecessary.

b67eb8dde8

doc: Make build system insert version in Doxyfile 168a7034f5
laanwj assigned theuni on Apr 5, 2017
fanquake added the label Docs and Output on Apr 5, 2017
fanquake added the label Refactoring on Apr 5, 2017
MarcoFalke commented at 7:59 AM on April 5, 2017: member

utACK 8b9911fe0181d07683ca37bf011d0feec9137ab3
in src/clientversion.h:13 in e8eead11a4 outdated
```
  25 | -/**
  26 | - * Copyright year (2009-this)
  27 | - * Todo: update this when changing our copyright comments in the source
  28 | - */
  29 | -#define COPYRIGHT_YEAR 2017
  30 | +#if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_REVISION) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR)
```
laanwj commented at 9:13 AM on April 5, 2017:

It might make sense to factor this out of the HAVE_CONFIG_H else, as to catch the case where config.h (for some reason) doesn't define the full set of client version information.

JeremyRubin commented at 2:06 PM on April 5, 2017:

Yes I think that would be useful in case a builder modifies their config inappropriately.

theuni commented at 5:38 PM on April 6, 2017:

Agreed.
in doc/release-process.md:27 in 8b9911fe01 outdated
```
  23 | @@ -24,6 +24,7 @@ Before every major release:
  24 |  * Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/bitcoin/bitcoin/pull/7415) for an example.
  25 |  * Update [`BLOCK_CHAIN_SIZE`](/src/qt/intro.cpp) to the current size plus some overhead.
  26 |  * Update `src/chainparams.cpp` chainTxData with statistics about the transaction count and rate.
  27 | +* Update version of `contrib/gitian-descriptors/*.yml`: usually one'd want to do this on master after branching off the release - but be sure to at least do it before a new major release
```
JeremyRubin commented at 2:09 PM on April 5, 2017:

Possible to update this text while you're editing it for less ambiguity? (maybe this should be a separate PR) suggestion:

Update version of contrib/gitian-descriptors/*.yml on master after branching off the release before any new major release. Updating for minor releases is optional

laanwj commented at 8:39 AM on April 6, 2017:

Thanks for trying to improve the wording. That's not correct, though. It should only be done for major releases, it's just that there is flexibility in the exact point in the cycle at which it is done.
JeremyRubin approved
JeremyRubin commented at 2:13 PM on April 5, 2017: contributor

utAck 8b9911f

build: Remove duplicate version information from src/clientversion.h

Fail when the version information is not defined otherwise when
HAVE_CONFIG_H is not set.

08d9aee3eb

doc: Update release process for simplified version bumping 9ff781884a
theuni approved
theuni commented at 5:43 PM on April 6, 2017: member

utACK 8b9911fe0181d07683ca37bf011d0feec9137ab3, or with the change suggested in e8eead11a48e6367fc1aad4fcd4c73ecccc2c49f. Having the doxyfile autogen'd seems helpful by itself.
fanquake commented at 5:32 AM on April 7, 2017: member

utACK 8b9911f
laanwj force-pushed on Apr 7, 2017
laanwj commented at 12:50 PM on April 7, 2017: member

Factored out the version information check in clientversion.h, and squashed.
laanwj merged this on Apr 7, 2017
laanwj closed this on Apr 7, 2017
laanwj referenced this in commit 928695bee6 on Apr 7, 2017
PastaPastaPasta referenced this in commit 0d8ce68a4a on May 31, 2019
PastaPastaPasta referenced this in commit ad34f0cb83 on May 31, 2019
PastaPastaPasta referenced this in commit 170155f6df on Jun 10, 2019
PastaPastaPasta referenced this in commit 9064932d2e on Jun 10, 2019
PastaPastaPasta referenced this in commit 35d08bd77c on Jun 11, 2019
PastaPastaPasta referenced this in commit 9439eec510 on Jun 11, 2019
PastaPastaPasta referenced this in commit 0b6865a81e on Jun 12, 2019
PastaPastaPasta referenced this in commit 1dde64aaa0 on Jun 14, 2019
PastaPastaPasta referenced this in commit e30c3d0ec8 on Jun 15, 2019
PastaPastaPasta referenced this in commit 7190b9820c on Jun 19, 2019
barrystyle referenced this in commit af80836ae8 on Jan 22, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#10166 Ignore Doxyfile generated from Doxyfile.in template.#10168 Fix build warning from #error text