From 35c50bce833fd7de75f5536286beba9387c3111f Mon Sep 17 00:00:00 2001 From: Vasilis Tsiligiannis Date: Wed, 11 Sep 2019 01:47:41 +0300 Subject: [PATCH] debian: Pass Git count and hash to CMake Signed-off-by: Vasilis Tsiligiannis --- .gitlab-ci.yml | 2 +- debian/rules | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3e0f16..88c920f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ debian: script: - mk-build-deps -i -r -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" - PACKAGE_VERSION="${CI_COMMIT_TAG#v}" - - PACKAGE_VERSION="${PACKAGE_VERSION:-$(git describe 2>/dev/null | tr '-' '+' | cut -c '2-' || true)}" + - PACKAGE_VERSION="${PACKAGE_VERSION:-$(git describe --abbrev=8 2>/dev/null | tr '-' '+' | cut -c '2-' || true)}" - | [ -z "$PACKAGE_VERSION" ] || { dch -b -M -v "${PACKAGE_VERSION}-1" "Bump to version '${PACKAGE_VERSION}-1'" diff --git a/debian/rules b/debian/rules index 26425cc..cf214be 100755 --- a/debian/rules +++ b/debian/rules @@ -4,13 +4,14 @@ export DEB_HOST_MULTIARCH DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST))) VER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \ | sed -rne 's,^Version: ([^-]+).*,\1,p') -GITREV=$(shell echo $(VER) | sed -rne 's,^[0-9]{8}\.([0-f]{7})$$,\1,p' -e 's,^([0-9]+\.[0-9]+.*)$$,v\1,p') +GITREV=$(shell echo $(VER) | sed -rne 's,^[0-9]+\.[0-9]+.*\+[0-9]+\+g([0-f]{8})$$,\1,p' -e 's,^([0-9]+\.[0-9]+(\.[0-9]+)?)$$,v\1,p') +GITCOUNT=$(shell echo $(VER) | sed -rne 's,^[0-9]+\.[0-9]+.*\+([0-9]+)\+g[0-f]{8}$$,\1,p') %: dh $@ --with python2 --parallel override_dh_auto_configure: - dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DPythonLibs_FIND_VERSION:STRING="2.7" -DPYTHON_EXECUTABLE:STRING="/usr/bin/python" + dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DPythonLibs_FIND_VERSION:STRING="2.7" -DPYTHON_EXECUTABLE:STRING="/usr/bin/python" -DGR_GIT_COUNT="$(GITCOUNT)" -DGR_GIT_HASH="$(GITREV)" override_dh_auto_install: dh_auto_install