Bug 1106 : Kill processes still running after join call timeout reached, also timeout...

[osm/MON.git] / Makefile

diff --git a/Makefile b/Makefile
index af9afa7..902909a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-# Copyright 2017 Intel Research and Development Ireland Limited
+# Copyright 2018 Whitestack, LLC
 # *************************************************************
 
 # This file is part of OSM Monitoring module
-# All Rights Reserved to Intel Corporation
+# All Rights Reserved to Whitestack, LLC
 
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -15,74 +15,16 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
 # For those usages not covered by the Apache License, Version 2.0 please
-# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com
-
-#__author__ = "Prithiv Mohan"
-#__date__   = "14/Sep/2017"
-
-SHELL := /bin/bash
-all: package install
+# contact: bdiaz@whitestack.com or glavado@whitestack.com
+##
 
-clean_deb:
-        rm -rf .build
+all: clean package
 
 clean:
-        rm -rf build
-
-prepare:
-        pip install --upgrade setuptools
-        mkdir -p build/
-        VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \
-        VER2=$(shell git describe | cut -d- -f2); \
-        VER3=$(shell git describe | cut -d- -f3); \
-        cp MANIFEST.in build/
-        cp requirements.txt build/
-        cp README.rst build/
-        cp stdeb.cfg build/
-        cp kafkad build/
-        cp -r core build/
-        cp -r plugins build/
-        cp -r devops_stages build/
-        cp -r test build/
-        cp setup.py build/
-
-build: clean openstack_plugins prepare
-        python -m py_compile build/plugins/OpenStack/*.py
-
-build: clean vrops_plugins prepare
-        python -m py_compile build/plugins/vRealiseOps/*.py
-
-build: clean cloudwatch_plugins prepare
-        python -m py_compile build/plugins/CloudWatch/*.py
-
-build: clean core prepare
-        python -m py_compile build/core/message_bus/*.py
-
-pip: prepare
-        cd build ./setup.py sdist
-        cd build ./plugin_setup.py sdist
-
-package: clean clean_deb prepare
-        apt-get --yes install python-software-properties \
-        python-pip \
-        python-stdeb \
-        libmysqlclient-dev \
-        libxml2 \
-        python-dev
-        cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True
-        cd build/deb_dist/* && dpkg-buildpackage -rfakeroot -uc -us
-        mkdir -p .build
-        cp build/deb_dist/python-*.deb .build/
-        pip install -r build/requirements.txt
-
-install:
-        DEBIAN_FRONTEND=noninteractive apt-get update && \
-        DEBIAN_FRONTEND=noninteractive apt-get install --yes python-pip && \
-        pip install --upgrade pip
-        #dpkg -i build/deb_dist/*.deb
+       rm -rf dist deb_dist osm_mon-*.tar.gz osm_mon.egg-info .eggs
 
-develop: prepare
-        pip install -r requirements.txt
-        cd build && ./setup.py develop
+package:
+       python3 setup.py --command-packages=stdeb.command sdist_dsc
+       cp debian/python3-osm-mon.postinst deb_dist/osm-mon*/debian
+       cd deb_dist/osm-mon*/  && dpkg-buildpackage -rfakeroot -uc -us
\ No newline at end of file