From: Jeremy Mordkoff Date: Wed, 26 Apr 2017 21:23:09 +0000 (+0000) Subject: enable package builds X-Git-Tag: v2.0.1~25^2 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=15c9f9506466c01813690b29d6a529289817751f;p=osm%2FSO.git enable package builds Signed-off-by: Jeremy Mordkoff --- diff --git a/Makefile b/Makefile index 8a1789fd..e5f5597f 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ BUILD_NUMBER = $(shell git describe | cut -d. -f2-) CONFD = XML_ONLY BUILD_TYPE = Debug -NOT_DEVELOPER_TYPE = FALSE +NOT_DEVELOPER_BUILD ?= FALSE COVERAGE_BUILD = FALSE RIFT_AGENT_BUILD = $(CONFD) PROJECT_TOP_DIR = $(TOP_ROOT_PATH) @@ -46,7 +46,7 @@ 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=$(TOP_SRC_PATH) -DRIFT_PACKAGE_GENERATOR=DEB -DRELEASE_NUMBER=$(RELEASE_NUMBER) -DBUILD_NUMBER=$(BUILD_NUMBER) + 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_BUILD) -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=$(TOP_SRC_PATH) -DRIFT_PACKAGE_GENERATOR=DEB -DRELEASE_NUMBER=$(RELEASE_NUMBER) -DBUILD_NUMBER=$(BUILD_NUMBER) rw: cmake $(RIFT_SHELL_EXE) $(MAKE) -C $(RIFT_BUILD)