Commit cabd8653 authored by Jens Georg's avatar Jens Georg

build: Enable tagging with rygel-<version>

Fixes #114
parent c49298a9
...@@ -95,10 +95,13 @@ if test -n "$v" ...@@ -95,10 +95,13 @@ if test -n "$v"
then then
: # use $v : # use $v
elif test -d .git \ elif test -d .git \
&& v=`git describe --abbrev=4 --match='${GNOME_TAG_PATTERN}_*' HEAD 2>/dev/null \ && v=`git describe --abbrev=4 --match='${GNOME_TAG_PATTERN}*' HEAD 2>/dev/null \
|| git describe --abbrev=4 HEAD 2>/dev/null` \ || git describe --abbrev=4 HEAD 2>/dev/null` \
&& case $v in && case $v in
${GNOME_TAG_PATTERN}_[0-9]*) ;; ${GNOME_TAG_PATTERN}_[0-9]*) ;;
${GNOME_TAG_PATTERN}-[0-9]*)
v=`echo "$v" | sed "s/-/_/"`;
;;
*) (exit 1) ;; *) (exit 1) ;;
esac esac
then then
...@@ -128,7 +131,7 @@ fi ...@@ -128,7 +131,7 @@ fi
#v=`echo "$v" |sed 's/^v//'` #v=`echo "$v" |sed 's/^v//'`
v=`echo "$v" | sed "s/${GNOME_TAG_PATTERN}_//" | tr _ .` v=`echo "$v" | sed "s/${GNOME_TAG_PATTERN}[_-]//" | tr _- .`
# Don't declare a version "dirty" merely because a time stamp has changed. # Don't declare a version "dirty" merely because a time stamp has changed.
git status > /dev/null 2>&1 git status > /dev/null 2>&1
......
AC_PREREQ([2.64]) AC_PREREQ([2.64])
AC_INIT([Rygel], AC_INIT([Rygel],
[m4_esyscmd(GNOME_TAG_PATTERN=RYGEL build-aux/git-version-gen .tarball-version)], [m4_esyscmd(GNOME_TAG_PATTERN=rygel build-aux/git-version-gen .tarball-version)],
[http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel], [https://gitlab.gnome.org/GNOME/rygel/issues/new],
[rygel], [rygel],
[http://www.rygel-project.org]) [http://www.rygel-project.org])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment