Merge #10155: build: Deduplicate version numbers
9ff7818 doc: Update release process for simplified version bumping (Wladimir J. van der Laan) 08d9aee build: Remove duplicate version information from src/clientversion.h (Wladimir J. van der Laan) 168a703 doc: Make build system insert version in Doxyfile (Wladimir J. van der Laan) b67eb8d doc: Remove version numbers from READMEs (Wladimir J. van der Laan) Tree-SHA512: 531e44282b1c1383a382847a5605177917dfbf78acfaa754d1cbadd2e165c7e34ddbd01790f87615083fac359571708c2551ad24b712aab1f84a2068360c3a17
This commit is contained in:
parent
34a1e93ca2
commit
1dde64aaa0
@ -1206,6 +1206,7 @@ AC_SUBST(QR_LIBS)
|
||||
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/functional/config.ini])
|
||||
AC_CONFIG_FILES([test/util/buildenv.py],[chmod +x test/util/buildenv.py])
|
||||
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
|
||||
AC_CONFIG_FILES([doc/Doxyfile])
|
||||
AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py])
|
||||
AC_CONFIG_LINKS([test/util/bitcoin-util-test.py:test/util/bitcoin-util-test.py])
|
||||
AC_CONFIG_LINKS([test/util/bctest.py:test/util/bctest.py])
|
||||
|
@ -41,7 +41,7 @@ PROJECT_NAME = "Dash Core"
|
||||
# could be handy for archiving the generated documentation or if some version
|
||||
# control system is used.
|
||||
|
||||
PROJECT_NUMBER = 0.14.1.0
|
||||
PROJECT_NUMBER = @PACKAGE_VERSION@
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewer a
|
@ -1,5 +1,5 @@
|
||||
Dash Core 0.14.1
|
||||
=====================
|
||||
Dash Core
|
||||
==========
|
||||
|
||||
This is the official reference wallet for Dash digital currency and comprises the backbone of the Dash peer-to-peer network. You can [download Dash Core](https://www.dash.org/downloads/) or [build it yourself](#building) using the guides below.
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
Dash Core 0.14.1
|
||||
=====================
|
||||
Dash Core
|
||||
==========
|
||||
|
||||
Intro
|
||||
-----
|
||||
|
@ -8,7 +8,7 @@ Release Process
|
||||
Before every minor and major release:
|
||||
|
||||
* Update [bips.md](bips.md) to account for changes since the last release.
|
||||
* Update version in sources (see below)
|
||||
* Update version in `configure.ac` (don't forget to set `CLIENT_VERSION_IS_RELEASE` to `true`)
|
||||
* Write release notes (see below)
|
||||
* Update `src/chainparams.cpp` nMinimumChainWork with information from the getblockchaininfo rpc.
|
||||
* Update `src/chainparams.cpp` defaultAssumeValid with information from the getblockhash rpc.
|
||||
@ -22,6 +22,7 @@ Before every major release:
|
||||
* Update hardcoded [seeds](/contrib/seeds/README.md). TODO: Give example PR for Dash
|
||||
* Update [`BLOCK_CHAIN_SIZE`](/src/qt/intro.cpp) to the current size plus some overhead.
|
||||
* Update `src/chainparams.cpp` chainTxData with statistics about the transaction count and rate.
|
||||
* 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
|
||||
|
||||
### First time / New builders
|
||||
|
||||
@ -35,21 +36,7 @@ Check out the source code in the following directory hierarchy.
|
||||
git clone https://github.com/devrandom/gitian-builder.git
|
||||
git clone https://github.com/dashpay/dash.git
|
||||
|
||||
### Dash Core maintainers/release engineers, update (commit) version in sources
|
||||
|
||||
- `configure.ac`:
|
||||
- `_CLIENT_VERSION_MAJOR`
|
||||
- `_CLIENT_VERSION_MINOR`
|
||||
- `_CLIENT_VERSION_REVISION`
|
||||
- Don't forget to set `_CLIENT_VERSION_IS_RELEASE` to `true`
|
||||
- `src/clientversion.h`: (this mirrors `configure.ac` - see issue #3539)
|
||||
- `CLIENT_VERSION_MAJOR`
|
||||
- `CLIENT_VERSION_MINOR`
|
||||
- `CLIENT_VERSION_REVISION`
|
||||
- Don't forget to set `CLIENT_VERSION_IS_RELEASE` to `true`
|
||||
- `doc/README.md` and `doc/README_windows.txt`
|
||||
- `doc/Doxyfile`: `PROJECT_NUMBER` contains the full version
|
||||
- `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
|
||||
### Dash Core maintainers/release engineers, suggestion for writing release notes
|
||||
|
||||
Write release notes. git shortlog helps a lot, for example:
|
||||
|
||||
|
@ -7,29 +7,13 @@
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "config/dash-config.h"
|
||||
#else
|
||||
|
||||
/**
|
||||
* client versioning and copyright year
|
||||
*/
|
||||
|
||||
//! These need to be macros, as clientversion.cpp's and dash*-res.rc's voodoo requires it
|
||||
#define CLIENT_VERSION_MAJOR 0
|
||||
#define CLIENT_VERSION_MINOR 14
|
||||
#define CLIENT_VERSION_REVISION 1
|
||||
#define CLIENT_VERSION_BUILD 0
|
||||
|
||||
//! Set to true for release, false for prerelease or test build
|
||||
#define CLIENT_VERSION_IS_RELEASE false
|
||||
|
||||
/**
|
||||
* Copyright year (2009-this)
|
||||
* Todo: update this when changing our copyright comments in the source
|
||||
*/
|
||||
#define COPYRIGHT_YEAR 2018
|
||||
|
||||
#endif //HAVE_CONFIG_H
|
||||
|
||||
// Check that required client information is defined
|
||||
#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)
|
||||
#error Client version information missing: wasn't defined by dash-config.h nor defined any other way
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Converts the parameter X to a string after macro replacement on X has been performed.
|
||||
* Don't merge these into one macro!
|
||||
|
Loading…
Reference in New Issue
Block a user