Fixes bugs for integration with MON module

[osm/MON.git] / Makefile

diff --git a/Makefile b/Makefile
index 52c10c3..a881380 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,55 +26,58 @@ SHELL := /bin/bash
 all: package install
 
 clean_deb:
-    rm -rf .build
+       rm -rf .build
 
 clean:
-    rm -rf build
+       rm -rf build
+       rm -rf .build
+       find . -name '*.pyc' -delete
 
 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); \
-    echo "$$VER1.dev$$VER2+$$VER3" > build/MON_VERSION
-    cp MANIFEST.in build/
-    cp requirements.txt build/
-    cp README.rst build/
-    cp -r core build/
-    cp -r plugins build/
-    cp -r devops_stages build/
-    cp -r test build/
+       #apt-get --yes install python-stdeb python-pip libmysqlclient-dev debhelper
+       #pip install --upgrade setuptools
+       mkdir -p build/
+       cp tox.ini build/
+       cp MANIFEST.in build/
+       cp requirements.txt build/
+       cp test-requirements.txt build/
+       cp README.rst build/
+       cp setup.py build/
+       cp kafkad build/
+       cp -r osm_mon build/
+       cp -r devops-stages build/
+       cp -r scripts build/
+       #pip install -r requirements.txt
+       #pip install -r test-requirements.txt
 
 build: clean openstack_plugins prepare
-    python -m py_compile build/plugins/OpenStack/*.py
+       python -m py_compile build/osm_mon/plugins/OpenStack/*.py
 
 build: clean vrops_plugins prepare
-    python -m py_compile build/plugins/vRealiseOps/*.py
+       python -m py_compile build/osm_mon/plugins/vRealiseOps/*.py
 
-build clean cloudwatch_plugins prepare
-    python -m py_compile build/plugins/CloudWatch/*.py
+build: clean cloudwatch_plugins prepare
+       python -m py_compile build/osm_mon/plugins/CloudWatch/*.py
 
-build clean core prepare
-    python -m py_compile build/core/message_bus/*.py
+build: clean core prepare
+       python -m py_compile build/osm_mon/core/message_bus/*.py
 
 pip: prepare
-    cd build ./setup.py sdist
+       cd build ./setup.py sdist
 
 package: clean clean_deb prepare
-    apt-get --yes install python-software-properties \
-    python-pip \
-    python-stdeb
-    cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True
-    mkdir -p build
-    cp build/deb_dist/python-*.deb .build/
+       cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True --with-python3=False bdist_deb
+       mkdir -p .build
+       cp build/deb_dist/python-*.deb .build/
+
+develop: prepare
+       cd build && ./setup.py develop
 
 install:
-        DEBIAN_FRONTEND=noninteractive apt-get update && \
-        DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip && \
-        pip install --upgrade pip && \
-        dpkg -i .build/*.deb
+       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
 
-develop: prepare
-    pip install -r requirements.txt
-    cd build && ./setup.py develop 
+build-docker-from-source:
+       docker build -t osm:MON -f docker/Dockerfile