build: Include tag name in release tarball for build.h

This commit is contained in:
Luke Dashjr 2020-05-07 01:46:47 +00:00
parent 7bbfd6bc60
commit dc42010387
2 changed files with 8 additions and 1 deletions

View File

@ -14,6 +14,11 @@ GIT_ARCHIVE="$1"
DISTNAME="$2" DISTNAME="$2"
git archive --prefix="${DISTNAME}/" HEAD | tar -xp git archive --prefix="${DISTNAME}/" HEAD | tar -xp
# Generate correct build info file from git, before we lose git
GIT_BUILD_INFO="$(share/genbuild.sh /dev/stdout)"
sed 's/\/\/ No build information available/'"${GIT_BUILD_INFO}"'/' -i "${DISTNAME}/share/genbuild.sh"
cd "${DISTNAME}" cd "${DISTNAME}"
./autogen.sh ./autogen.sh

View File

@ -45,7 +45,9 @@ if [ -n "$GIT_TAG" ]; then
elif [ -n "$GIT_COMMIT" ]; then elif [ -n "$GIT_COMMIT" ]; then
NEWINFO="#define BUILD_GIT_COMMIT \"$GIT_COMMIT\"" NEWINFO="#define BUILD_GIT_COMMIT \"$GIT_COMMIT\""
else else
NEWINFO="// No build information available" # NOTE: The NEWINFO line below this comment gets replaced by a string-match in contrib/guix/libexec/make_release_tarball.sh
# If changing it, update the script too!
NEWINFO='// No build information available'
fi fi
# only update build.h if necessary # only update build.h if necessary