Skip to content

Commit

Permalink
Fix build time when building from tarball (now really)
Browse files Browse the repository at this point in the history
Don't define BUILD_DATE at all when no git version information
is available. `version.cpp` will then define it for us correctly
to the last commit date.

This has been fixed and broken many times over 0.9 history
(21cc8bd, ef1e984), please don't touch this code unless you plan
on testing all possible scenarios including gitian builds.

Fixes #3570.
  • Loading branch information
laanwj committed Jan 30, 2014
1 parent 39d4eee commit 2df5e34
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions share/genbuild.sh
Expand Up @@ -13,8 +13,8 @@ else
exit 1
fi

TIME=$(date '+%F %T %z')

DESC=""
LAST_COMMIT_DATE=""
if [ -e "$(which git)" -a -d ".git" ]; then
# clean 'dirty' status of touched files that haven't been modified
git diff >/dev/null 2>/dev/null
Expand All @@ -23,7 +23,7 @@ if [ -e "$(which git)" -a -d ".git" ]; then
DESC="$(git describe --dirty 2>/dev/null)"

# get a string like "2012-04-10 16:27:19 +0200"
TIME="$(git log -n 1 --format="%ci")"
LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"
fi

if [ -n "$DESC" ]; then
Expand All @@ -35,5 +35,7 @@ fi
# only update build.h if necessary
if [ "$INFO" != "$NEWINFO" ]; then
echo "$NEWINFO" >"$FILE"
echo "#define BUILD_DATE \"$TIME\"" >>"$FILE"
if [ -n "$LAST_COMMIT_DATE" ]; then
echo "#define BUILD_DATE \"$LAST_COMMIT_DATE\"" >> "$FILE"
fi
fi

0 comments on commit 2df5e34

Please sign in to comment.