build: Fix quick hack for version string in releases

hebasto commented at 6:39 am on March 14, 2020: member

This PR:

fixes the quick hack for version string in releases (#11097) by passing the generated src/obj/build.h to the make dist output
closes #16588
~is based on #18331 (5e6b8b391243016cb06e9e107c2e6a13a744b31e..86d9fae2943ad0d65ced2737f205db33f0bdc324)~ (merged)

fanquake added the label Build system on Mar 14, 2020

hebasto renamed this:
~~build: Fix quick hack for version string in releases~~
[WIP] build: Fix quick hack for version string in releases
on Mar 14, 2020

hebasto force-pushed on Mar 14, 2020

hebasto renamed this:
~~[WIP] build: Fix quick hack for version string in releases~~
build: Fix quick hack for version string in releases
on Mar 14, 2020

hebasto commented at 8:36 pm on March 14, 2020: member

Updated 1b1546c82f97b9da431c4593d3457c5705162231 -> 87845efdc5deef4e01df41826687e6eb24d543d1 (pr18349.01 -> pr18349.02, compare):

rebased with #18331 (dropped “build: Suggest source as zip archive for Windows” commit)
fixed Travis builds

hebasto force-pushed on Mar 15, 2020

hebasto commented at 11:04 am on March 15, 2020: member

Updated 87845efdc5deef4e01df41826687e6eb24d543d1 -> 24d942266c710259fd4f90df6eb80b3afeb12d84 (pr18349.02 -> pr18349.03, compare):

rebased due to conflict with #18331

hebasto force-pushed on Mar 15, 2020

hebasto commented at 5:26 pm on March 15, 2020: member

Updated 24d942266c710259fd4f90df6eb80b3afeb12d84 -> f8fe1f0c941d779daf6a092faf45d74b89b054c6 (pr18349.03 -> pr18349.04, diff):

rebased due to conflict with #18331

build: Drop workaround for version string 80190e7aeb

hebasto force-pushed on Mar 25, 2020

hebasto commented at 5:01 pm on March 25, 2020: member

Rebased f8fe1f0c941d779daf6a092faf45d74b89b054c6 -> 80190e7aeb7e730934271b03918640ec18a56dc5 due to the merging of #18331.

MarcoFalke commented at 5:04 pm on March 25, 2020: member

cc @dongcarl since you opened #16588

in share/genbuild.sh:40 in 80190e7aeb

36@@ -37,6 +37,8 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$
37     # otherwise generate suffix from git, i.e. string like "59887e8-dirty"
38     SUFFIX=$(git rev-parse --short HEAD)
39     git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
40+elif [ -f "$FILE" ]; then

laanwj commented at 5:38 pm on March 25, 2020:

we already have a if [ -f "$FILE" ]; then check above, would it make sense to merge this into that?

hebasto commented at 6:45 pm on March 25, 2020:

This condition handles a special case for gitian builds: with this PR the obj/build.h file is a part of the source tree that is fed to the make, and we do not want genbuild.sh to re-write it with the // No build information available string.

MarcoFalke commented at 12:30 pm on March 30, 2020:

How does it get updated for local build then, if the file already exists?

hebasto commented at 12:46 pm on March 30, 2020:

How does it get updated for local build then, if the file already exists?

For local build the elif condition is not applied as the previous if condition is evaluated to true.

laanwj commented at 10:31 am on April 1, 2020:

Ok, ths logic is kind of tricky to me. Even what it’s supposed to do in what case. Maybe we need a test to make this clearer, enumerate the cases and verify that they still work.

MarcoFalke added the label Needs gitian build on Mar 26, 2020

laanwj added this to the milestone 0.20.0 on Mar 27, 2020

DrahtBot commented at 2:02 am on March 28, 2020: member

Gitian builds

File	commit 7f9dedb22dcd9550ca525c0e35fec38b2d59e029(master)	commit 6a3fdb2a9dc21b396da23f24b558b392eb333b26(master and this pull)
bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz	`8aa34845a916014d...`	`4a36df05dffe2b3e...`
bitcoin-0.19.99-aarch64-linux-gnu.tar.gz	`0fb3dd16db30ea00...`	`3553185c8bf583aa...`
bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz	`797f185a8e62f6fe...`	`f5ddc5e8f221dd35...`
bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz	`871094b510da0ac7...`	`35da0d9145e5d590...`
bitcoin-0.19.99-osx-unsigned.dmg	`a159b1b99b607907...`	`47e528a694248d29...`
bitcoin-0.19.99-osx64.tar.gz	`1fb6370553afcb22...`	`ff3e6095c7bcaf08...`
bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz	`0b86916151aea5a3...`	`6e724946be7bde0d...`
bitcoin-0.19.99-riscv64-linux-gnu.tar.gz	`4efb63771485711b...`	`fae7ca9020f9dd33...`
bitcoin-0.19.99-win64-debug.zip	`dd825e6168d39c90...`	`a4173e1fe79fe3aa...`
bitcoin-0.19.99-win64-setup-unsigned.exe	`d1f790ad8c257da0...`	`cd88ce1150524f63...`
bitcoin-0.19.99-win64.zip	`49dc4119ae2a01c4...`	`f0ed4bfa63013390...`
bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz	`2a144f502390b6e3...`	`90b23159cdd83ed4...`
bitcoin-0.19.99-x86_64-linux-gnu.tar.gz	`af6a5d2d555569a4...`	`601b4637b9c32347...`
bitcoin-0.19.99.tar.gz	`900859565b6ee1fe...`	`fd524a224feae8be...`
bitcoin-core-linux-0.20-res.yml	`70c720b679a19c93...`	`d8b6e2b1e46b714a...`
bitcoin-core-osx-0.20-res.yml	`5766a2f7c8d8547a...`	`846eb26591fb059b...`
bitcoin-core-win-0.20-res.yml	`a95a890f0d0cb882...`	`dff3c2d415b90d84...`
linux-build.log	`8510c43606df6b17...`	`411cb639aa5c4757...`
osx-build.log	`b2fce58471126628...`	`7bd0568c479dc0ff...`
win-build.log	`630e3d23ee0657f4...`	`4c7a28fde557f4c9...`
bitcoin-core-linux-0.20-res.yml.diff		`f9ef5da1fe953b6f...`
bitcoin-core-osx-0.20-res.yml.diff		`3572f99bf005a178...`
bitcoin-core-win-0.20-res.yml.diff		`015ccb9ce0b68e13...`
linux-build.log.diff		`f1b5df0530158a6f...`
osx-build.log.diff		`fc33c8a71921263c...`
win-build.log.diff		`ec0237196b0ea3d7...`

DrahtBot removed the label Needs gitian build on Mar 28, 2020

DrahtBot commented at 9:20 am on March 31, 2020: member

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

No conflicts as of last run.

hebasto commented at 6:02 pm on April 1, 2020: member

@laanwj

Ok, ths logic is kind of tricky to me. Even what it’s supposed to do in what case. Maybe we need a test to make this clearer, enumerate the cases and verify that they still work.

Here are all of the cases:

source location	head	`obj/build.h`	`clientversion.cpp`#L46	resulted version string
git repo root	commit	`#define BUILD_SUFFIX COMMIT_HASH`	—	version v0.19.99.0-COMMIT_HASH
git repo root	tagged commit	`#define BUILD_DESC "TAG"`	—	version TAG
git repo root	not commited changes	`#define BUILD_SUFFIX COMMIT_HASH-dirty`	—	version v0.19.99.0-COMMIT_HASH-dirty
`git archive`	commit	`// No build information available`	`#define GIT_COMMIT_ID "COMMIT_HASH"`	version version v0.19.99.0-gCOMMIT_HASH
`make dist` used in gitian	tagged commit	BEFORE build: `#define BUILD_DESC "TAG"`	`#define GIT_COMMIT_ID "COMMIT_HASH"`	version TAG

In the latter case this PR prevents re-writing over the existing good obj/build.h.

Also these comments could be useful:https://github.com/bitcoin/bitcoin/blob/80190e7aeb7e730934271b03918640ec18a56dc5/src/clientversion.cpp#L23-L37

MarcoFalke commented at 1:34 pm on April 2, 2020: member

Why is this assigned 0.20.0? This is not a bugfix and even has the potential to break stuff.

MarcoFalke removed this from the milestone 0.20.0 on Apr 2, 2020

hebasto commented at 7:20 pm on April 7, 2020: member

Closed in favor of #18556.

hebasto closed this on Apr 7, 2020

fanquake referenced this in commit 65fb3dfc8d on Apr 28, 2020

sidhujag referenced this in commit 3d6b60d09e on Apr 28, 2020

UdjinM6 referenced this in commit 306cb1b47a on Oct 23, 2021

UdjinM6 referenced this in commit ad65a4bed0 on Oct 23, 2021

UdjinM6 referenced this in commit a0d3f37d3a on Dec 4, 2021

DrahtBot locked this on Feb 15, 2022

build: Fix quick hack for version string in releases #18349

Gitian builds

Conflicts