From: Laurence Maultsby Date: Thu, 16 Feb 2017 18:53:01 +0000 (-0500) Subject: Merge branch 'v1.1' X-Git-Tag: v2.0.0~48 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=625a4c2118c4d095daf2a264643798eddf4d0491;hp=80c1612af17d44cda42732f6a13fd87e6f28966e Merge branch 'v1.1' Signed-off-by: Laurence Maultsby --- diff --git a/Makefile b/Makefile index 5c9d8648b..db2cda964 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,9 @@ RIFT_BUILD = $(TOP_SRC_PATH)/.build RIFT_ARTIFACTS = $(TOP_ROOT_PATH)/artifacts RIFT_INSTALL = $(TOP_ROOT_PATH) RIFT_SHELL_EXE = $(TOP_ROOT_PATH)/rift-shell -b $(RIFT_BUILD) -i $(RIFT_INSTALL) -a $(RIFT_ARTIFACTS) -- +RELEASE_NUMBER = $(shell git describe | cut -d. -f1 | sed -e 's/^v//') +BUILD_NUMBER = $(shell git describe | cut -d. -f2-) + CONFD = XML_ONLY @@ -44,11 +47,14 @@ cmake:: mkdir -p $(RIFT_BUILD) mkdir -p $(RIFT_ARTIFACTS) mkdir -p $(RIFT_INSTALL) - cd $(RIFT_BUILD) && $(RIFT_SHELL_EXE) cmake $(TOP_SRC_PATH) -DCMAKE_INSTALL_PREFIX=$(TOP_ROOT_PATH) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DNOT_DEVELOPER_BUILD=$(NOT_DEVELOPER_TYPE) -DCOVERAGE_BUILD=$(COVERAGE_TYPE) -DRIFT_AGENT_BUILD=$(RIFT_AGENT_BUILD) -DPROJECT_TOP_DIR=$(PROJECT_TOP_DIR) -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} -DRIFT_SUBMODULE_NAME=$(PROJECT_TOP_DIR) + cd $(RIFT_BUILD) && $(RIFT_SHELL_EXE) cmake $(TOP_SRC_PATH) -DCMAKE_INSTALL_PREFIX=$(TOP_ROOT_PATH) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DNOT_DEVELOPER_BUILD=$(NOT_DEVELOPER_TYPE) -DCOVERAGE_BUILD=$(COVERAGE_TYPE) -DRIFT_AGENT_BUILD=$(RIFT_AGENT_BUILD) -DPROJECT_TOP_DIR=$(PROJECT_TOP_DIR) -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} -DRIFT_SUBMODULE_NAME=$(PROJECT_TOP_DIR) -DRIFT_PACKAGE_GENERATOR=DEB -DRELEASE_NUMBER=$(RELEASE_NUMBER) -DBUILD_NUMBER=$(BUILD_NUMBER) rw: cmake $(RIFT_SHELL_EXE) $(MAKE) -C $(RIFT_BUILD) +package: rw + $(RIFT_SHELL_EXE) $(MAKE) -C $(RIFT_BUILD) rw.package + install: $(RIFT_SHELL_EXE) $(MAKE) -C $(RIFT_BUILD) install