diff options
| author | Jens Georg <mail@jensge.org> | 2018-09-04 22:19:41 +0200 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2018-09-04 22:19:43 +0200 |
| commit | cabd8653305207dc85552d7461e68ac4985f16c1 (patch) | |
| tree | a84d169e5423178b1d439dc15cbfadc288f1f798 | |
| parent | c49298a9d390231d86f5788639018b9da8ff38ca (diff) | |
| download | rygel-cabd8653305207dc85552d7461e68ac4985f16c1.tar.gz | |
build: Enable tagging with rygel-<version>
Fixes #114
| -rwxr-xr-x | build-aux/git-version-gen | 7 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 463ad730..885dafb4 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -95,10 +95,13 @@ if test -n "$v" then : # use $v 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` \ && case $v in ${GNOME_TAG_PATTERN}_[0-9]*) ;; + ${GNOME_TAG_PATTERN}-[0-9]*) + v=`echo "$v" | sed "s/-/_/"`; + ;; *) (exit 1) ;; esac then @@ -128,7 +131,7 @@ fi #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. git status > /dev/null 2>&1 diff --git a/configure.ac b/configure.ac index 1c2313f4..9912de97 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) AC_INIT([Rygel], - [m4_esyscmd(GNOME_TAG_PATTERN=RYGEL build-aux/git-version-gen .tarball-version)], - [http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel], + [m4_esyscmd(GNOME_TAG_PATTERN=rygel build-aux/git-version-gen .tarball-version)], + [https://gitlab.gnome.org/GNOME/rygel/issues/new], [rygel], [http://www.rygel-project.org]) AC_CONFIG_AUX_DIR([build-aux]) |