miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use full hash as version if no tags

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-05-05 13:17:55 +00:00
parent 841c2afed0
commit ee9ed7e3a6
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -4,7 +4,6 @@ AC_INIT([glorytun],
[https://github.com/angt/glorytun/issues], [https://github.com/angt/glorytun/issues],
[glorytun], [glorytun],
[https://github.com/angt/glorytun]) [https://github.com/angt/glorytun])
AC_DEFINE_UNQUOTED([VERSION_MAJOR], [m4_esyscmd([./version.sh major])])
AC_CONFIG_SRCDIR([src/common.h]) AC_CONFIG_SRCDIR([src/common.h])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

13
version.sh
View File

@@ -1,13 +1,12 @@
#!/bin/sh #!/bin/sh
[ -z "${VERSION}" ] && VERSION=`git describe --tags --match='v[0-9].*' 2>/dev/null` \ [ -z "${VERSION}" ] && VERSION="$(git describe --tags --match='v[0-9].*' 2>/dev/null)" \
&& VERSION=${VERSION#v} && VERSION="${VERSION#v}"
[ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null` [ -z "${VERSION}" ] && VERSION="$(git rev-parse HEAD 2>/dev/null)"
[ -z "${VERSION}" ] && VERSION=0.0.0 [ -z "${VERSION}" ] && VERSION="$(cat VERSION 2>/dev/null)"
[ "$1" = "major" ] && printf ${VERSION%%.*} \ [ -z "${VERSION}" ] && VERSION="0.0.0"
&& exit 0
printf ${VERSION} | tee VERSION printf "%s" "${VERSION}" | tee VERSION