diff --git a/debian/rules b/debian/rules index 8b67190c..e07e58ff 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,9 @@ endif DPKG_EXPORT_BUILDFLAGS = 1 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +NYMEA_DPKG_VERSION := $(shell dpkg-parsechangelog -SVersion) +QMAKE_ADDITIONAL_ARGS += NYMEA_VERSION=$(NYMEA_DPKG_VERSION) + include /usr/share/dpkg/buildflags.mk PREPROCESS_FILES := $(wildcard debian/*.in) @@ -34,7 +37,7 @@ $(PREPROCESS_FILES:.in=): %: %.in sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@ override_dh_auto_configure: - dh_auto_configure -- "$(QMAKE_ADDITIONAL_ARGS)" + dh_auto_configure -- $(QMAKE_ADDITIONAL_ARGS) override_dh_auto_build: make -j$(DEB_PARALLEL_JOBS) $(MAKE_TARGETS) diff --git a/nymea.pro b/nymea.pro index 3b0c70c1..bb1d03bf 100644 --- a/nymea.pro +++ b/nymea.pro @@ -1,7 +1,13 @@ include(nymea.pri) # Parse and export NYMEA_VERSION_STRING -NYMEA_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') +isEmpty(NYMEA_VERSION) { + NYMEA_VERSION_STRING='development' + message("The variable NYMEA_VERSION is unset. Using \"$${NYMEA_VERSION_STRING}\" as default version.") +} else { + # qmake NYMEA_VERSION=1.x.x-custom + NYMEA_VERSION_STRING="$${NYMEA_VERSION}" +} # define protocol versions JSON_PROTOCOL_VERSION_MAJOR=8 @@ -14,7 +20,6 @@ LIBNYMEA_API_VERSION="$${LIBNYMEA_API_VERSION_MAJOR}.$${LIBNYMEA_API_VERSION_MIN QMAKE_SUBSTITUTES += version.h.in - TEMPLATE=subdirs piconly {