diff options
| -rwxr-xr-x | gen-version.sh | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/gen-version.sh b/gen-version.sh index 80cf49a..b493cf5 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -3,10 +3,24 @@ # Get version-info specified in Makefile V=$1 -# Use `git describe` to get current version if we're inside a git repo +# When building from a git repository, derive the version from the most recent +# release tag instead. The result follows Semantic Versioning 2.0.0, using the +# number of commits made since that tag as build metadata, so seven commits +# after the v1.3.1 tag gives "v1.3.1+7", while a build of the tag itself gives +# plain "v1.3.1". Release tags are expected to be named vMAJOR.MINOR.PATCH. if test "$(git rev-parse --git-dir 2>/dev/null)" = '.git' then - V=$(git describe --abbrev=4 HEAD 2>/dev/null) + tag=$(git describe --abbrev=0 --match 'v[0-9]*' HEAD 2>/dev/null) + if test -n "$tag" + then + ahead=$(git rev-list --count "$tag..HEAD" 2>/dev/null) + if test -n "$ahead" && test "$ahead" -gt 0 + then + V="$tag+$ahead" + else + V="$tag" + fi + fi fi new="CGIT_VERSION = $V" |