mirror of
https://github.com/mpv-player/mpv
synced 2025-04-19 21:56:40 +00:00
version.sh: integrate the release tag in output
This is basically reconstructed from 46b218c
. Since we now have proper
release tags, we want this again.
Add --tags to the git describe call, because the github release system
creates light-weight tags only, and we're too lazy to create annitated
tags (or is that bad practice?).
Add --long, so that the git commit hash is part of the output even if
the tag matches.
This commit is contained in:
parent
d8922361d1
commit
b27f65a758
@ -7,13 +7,13 @@ test "$1" && extra="-$1"
|
|||||||
# Extract revision number from file used by daily tarball snapshots
|
# Extract revision number from file used by daily tarball snapshots
|
||||||
# or from "git describe" output
|
# or from "git describe" output
|
||||||
git_revision=$(cat snapshot_version 2> /dev/null)
|
git_revision=$(cat snapshot_version 2> /dev/null)
|
||||||
test $git_revision || test ! -e .git || git_revision=`git rev-parse --short HEAD`
|
test $git_revision || test ! -e .git || git_revision=`git describe --match "v[0-9]*" --always --tags --long`
|
||||||
git_revision=$(expr "$git_revision" : v*'\(.*\)')
|
git_revision=$(expr "$git_revision" : v*'\(.*\)')
|
||||||
test $git_revision || git_revision=UNKNOWN
|
test $git_revision || git_revision=UNKNOWN
|
||||||
|
|
||||||
# releases extract the version number from the VERSION file
|
# releases extract the version number from the VERSION file
|
||||||
version=$(cat VERSION 2> /dev/null)
|
version=$(cat VERSION 2> /dev/null)
|
||||||
test $version || version=git-$git_revision
|
test $version || version=$git_revision
|
||||||
|
|
||||||
NEW_REVISION="#define VERSION \"${version}${extra}\""
|
NEW_REVISION="#define VERSION \"${version}${extra}\""
|
||||||
OLD_REVISION=$(head -n 1 version.h 2> /dev/null)
|
OLD_REVISION=$(head -n 1 version.h 2> /dev/null)
|
||||||
|
Loading…
Reference in New Issue
Block a user