X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=Makefile;h=71425c6cf3c35f3da449f216917aff5898feaf8a;hp=2c7255b3245bcc2a28fb94c6b51f5fa5be8cd296;hb=d40e5512e979654e90b190711c4d3ff14b6a878b;hpb=cf1826b8466193d53981fe6c61d78e9746b816f1

diff --git a/Makefile b/Makefile
index 2c7255b3..71425c6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,28 @@
 SHELL := /bin/bash
-all: pip deb
+all: package install
 
+clean_deb:
+	rm -rf .build
+
+clean:
+	rm -rf build
+	find osm_ro -name '*.pyc' -delete
+	find osm_ro -name '*.pyo' -delete
 prepare:
+	pip install 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/RO_VERSION
 	cp MANIFEST.in build/
 	cp requirements.txt build/
 	cp README.rst build/
 	cp setup.py build/
+	cp stdeb.cfg build/
 	cp -r osm_ro build/
 	cp openmano build/
 	cp openmanod build/
-	cp openmanod.cfg build/
-	cp osm-ro.service build/
 	cp -r vnfs build/osm_ro
 	cp -r scenarios build/osm_ro
 	cp -r instance-scenarios build/osm_ro
@@ -25,35 +36,43 @@ connectors: prepare
 	python build/osm_ro/openmanolinkervimconn.py
 	rm -f build/osm_ro/openmanolinkervimconn.py
 
-build: connectors prepare
+build: clean connectors prepare
 	python -m py_compile build/osm_ro/*.py
 
 pip: prepare
 	cd build && ./setup.py sdist
-	cd build && ./setup.py bdist_wheel
 
-deb: prepare
-	echo "Nothing to be done"
-	#cd build; ./setup.py --command-packages=stdeb.command bdist_deb
-	#fpm -s python -t deb build/setup.py
+package: clean clean_deb prepare
+	#apt-get install -y python-stdeb
+	cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True
+	cd build && cp osm_ro/scripts/python-osm-ro.postinst deb_dist/osm-ro*/debian/
+	cd build/deb_dist/osm-ro* && dpkg-buildpackage -rfakeroot -uc -us
+	mkdir -p .build
+	cp build/deb_dist/python-*.deb ./build/
 
 snap:
 	echo "Nothing to be done yet"
 
 install:
-	cd build && pip install dist/*.tar.gz
+	DEBIAN_FRONTEND=noninteractive apt-get update && \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip && \
+	pip install --upgrade pip && \
+	dpkg -i .build/*.deb
 
 develop: prepare
+	#pip install -r requirements.txt
 	cd build && ./setup.py develop
 
-sync:
-	#cp build/dist/* /root/artifacts/...
-
 test:
 	./test/basictest.sh --force --insert-bashrc --install-openvim --init-openvim
 
-clean:
-	rm -rf build
-	#find build -name '*.pyc' -delete
-	#find build -name '*.pyo' -delete
+build-docker-from-source:
+	docker build -t osm/openmano -f docker/Dockerfile-local .
+
+run-docker:
+	docker-compose -f docker/openmano-compose.yml up
+
+stop-docker:
+	docker-compose -f docker/openmano-compose.yml down
+