Also adds ability to disable check with BITCOIN_GENBUILD_NO_GIT=1 in the environment @theuni @Flowdalic @laanwj
I believe this addresses all the possible use cases correctly.
(This commit is based on branch-0.10, so should merge cleanly into 0.10, 0.11, 0.12, and master branches.)
Also adds ability to disable check with BITCOIN_GENBUILD_NO_GIT=1 in the environment
To save others the digging:
This verifies that share/genbuild.sh exists at the git root. If it exists at a path that isn’t at the git root, the check fails. For out-of-tree builds, that’s fine because share/genbuild.sh would only exist in the source, not in the build dir.
However, this breaks for nested builds where the source is copied into a subdir, because share/genbuild.sh does end up existing there. We currently build that way for Gitian and Travis because out-of-tree builds don’t work. Which is why the Gitian descriptors needed to be changed.
So.. ACK, but I would very much prefer to get the out-of-tree build changes merged first, and Gitian/Travis fixed up accordingly.
Well, specifically it makes sure the script itself (genbuild.sh) is part of the git repository it’s about to get information from.
If the source is simply copied into a subdir, it shouldn’t be using git (by default), so the “breaks” @theuni mentions is in fact a bug fix. The Gitian descriptor change tells git to basically use the git repo even for the differing source dir.
So.. ACK, but I would very much prefer to get the out-of-tree build changes merged first,
Huray :)
The out-of-tree build changes have been merged a while ago.
Anything left to do here?
100@@ -101,6 +101,7 @@ script: |
101 export PATH=${WRAP_DIR}:${PATH}
102
103 # Create the release tarball using (arbitrarily) the first host
104+ export GIT_DIR="$PWD/.git"
Since we build from the exported tarball, this is needed if we want the build system to use git to create the versioninfo. Otherwise, it will detect it is built from the tarball and not from git.
This seems backwards. Though since it’s strictly an improvement, utACK for now.
I think we should strive to make sure that building from the tarball results in the correct version string with no need for git, but I’ll work on that separately.
Labels
Build system