From 4d9b8f81b4331dea1f8186e1245a1210be3bf767 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 8 Nov 2018 15:25:47 +0100 Subject: Packaging: Set project version using command-line When packaging, the build environment doesn't clone the git repository but instead use an archive and so we lose the git repository's information. This is a workaround to set the project version using the packaging system. Change-Id: I3e8edc197a12f455f4f1cc24bc452feb146bab6c Signed-off-by: Romain Forlot --- conf.d/packaging/deb/debian.rules | 3 ++- conf.d/packaging/rpm/agl-app-afb-test.spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules index 4637103..8209cd9 100644 --- a/conf.d/packaging/deb/debian.rules +++ b/conf.d/packaging/deb/debian.rules @@ -2,13 +2,14 @@ # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export VERSION=$(shell grep -E "^Version" ../*dsc | sed -r 's/^.*: (.*)-.*/\1/') %: bash /etc/profile.d/AGL-app-framework-binder.sh dh $@ override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/AGL -DCMAKE_INSTALL_LIBDIR:PATH=lib/${DEB_HOST_MULTIARCH} + dh_auto_configure -- -DVERSION=${VERSION} -DCMAKE_INSTALL_PREFIX=/opt/AGL -DCMAKE_INSTALL_LIBDIR:PATH=lib/${DEB_HOST_MULTIARCH} override_dh_auto_install: dh_auto_install --destdir=/usr/src/packages/BUILD/debian/tmp diff --git a/conf.d/packaging/rpm/agl-app-afb-test.spec b/conf.d/packaging/rpm/agl-app-afb-test.spec index c1df845..408751a 100644 --- a/conf.d/packaging/rpm/agl-app-afb-test.spec +++ b/conf.d/packaging/rpm/agl-app-afb-test.spec @@ -47,7 +47,7 @@ afb-test is a test framework made to test other binding. export PKG_CONFIG_PATH=%{_libdir}/pkgconfig [ ! -d build ] && mkdir build cd build -cmake -DCMAKE_BUILD_TYPE=DEBUG .. +cmake -DCMAKE_BUILD_TYPE=DEBUG -DVERSION=%{version} .. %__make %{?_smp_mflags} %install -- cgit 1.2.3-korg