From: velandy <rajesh.velandy@riftio.com>
Date: Fri, 10 Feb 2017 22:30:47 +0000 (+0000)
Subject: Merge branch 'v1.1'
X-Git-Tag: v2.0.0~60
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=3f1ff0e426e6838e5b089805582dfd4a396e4b7e;hp=14e0c96e69157a14183ba2093175cd6682b00807;p=osm%2FSO.git

Merge branch 'v1.1'
---

diff --git a/BUILD.sh b/BUILD.sh
index 788f9d14..54e8d96f 100755
--- a/BUILD.sh
+++ b/BUILD.sh
@@ -195,20 +195,45 @@ if [[ $PLATFORM == ub16 ]]; then
     
     if $installSO; then
 	sudo apt-get install -y \
-	     rw.core.mc-\*=${PLATFORM_VERSION}
+	     rw.core.mano-rwcal_yang_ylib-1.0 \
+	     rw.core.mano-rwconfig_agent_yang_ylib-1.0 \
+	     rw.core.mano-rwlaunchpad_yang_ylib-1.0 \
+	     rw.core.mano-mano_yang_ylib-1.0 \
+	     rw.core.mano-common-1.0 \
+	     rw.core.mano-rwsdn_yang_ylib-1.0 \
+	     rw.core.mano-mano-types_yang_ylib-1.0 \
+	     rw.core.mano-rwcal-cloudsim-1.0 \
+	     rw.core.mano-rwcal-1.0 \
+	     rw.core.mano-rw_conman_yang_ylib-1.0 \
+	     rw.core.mano-rwcalproxytasklet-1.0 \
+	     rw.core.mano-rwlaunchpad-1.0 \
+	     rw.core.mano-rwcal-openmano-vimconnector-1.0 \
+	     rw.core.mano-rwcal-propcloud1-1.0 \
+	     rw.core.mano-lpmocklet_yang_ylib-1.0 \
+	     rw.core.mano-rwmon-1.0 \
+	     rw.core.mano-rwcloud_yang_ylib-1.0 \
+	     rw.core.mano-rwcal-openstack-1.0 \
+	     rw.core.mano-rw.core.mano_foss \
+	     rw.core.mano-rwmon_yang_ylib-1.0 \
+	     rw.core.mano-rwcm-1.0 \
+	     rw.core.mano-rwcal-mock-1.0 \
+	     rw.core.mano-rwmano_examples-1.0 \
+	     rw.core.mano-rwcal-cloudsimproxy-1.0 \
+	     rw.core.mano-models-1.0 \
+	     rw.core.mano-rwcal-aws-1.0
     fi
     
     if $installUI; then
 	sudo apt-get install -y \
-	     rw.ui-about=${PLATFORM_VERSION} \
-	     rw.ui-logging=${PLATFORM_VERSION} \
-	     rw.ui-skyquake=${PLATFORM_VERSION} \
-	     rw.ui-accounts=${PLATFORM_VERSION} \
-	     rw.ui-composer=${PLATFORM_VERSION} \
-	     rw.ui-launchpad=${PLATFORM_VERSION} \
-	     rw.ui-debug=${PLATFORM_VERSION} \
-	     rw.ui-config=${PLATFORM_VERSION} \
-	     rw.ui-dummy_component=${PLATFORM_VERSION}
+	     rw.ui-about \
+	     rw.ui-logging \
+	     rw.ui-skyquake \
+	     rw.ui-accounts \
+	     rw.ui-composer \
+	     rw.ui-launchpad \
+	     rw.ui-debug \
+	     rw.ui-config \
+	     rw.ui-dummy_component
     fi
 elif [[ $PLATFORM == fc20 ]]; then
     
diff --git a/Makefile b/Makefile
index c83dd165..8a1789fd 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,8 @@ 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) --standalone-submodule $(TOP_SRC_PATH) --
+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 +46,13 @@ 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)
+	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)
 
 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