X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Makefile;h=226bcb4111daf04a1a8cd3dbf390eb6d5bdd296d;hb=refs%2Fchanges%2F79%2F1579%2F1;hp=b5e6960f3b499073afcab9b7cc9fa95e7d94ebb5;hpb=06e6c396413630640cafae3488442a0869f1642d;p=osm%2FRO.git

diff --git a/Makefile b/Makefile
index b5e6960f..226bcb41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,68 @@
 SHELL := /bin/bash
-all: pypackage debpackage
+all: pip deb
 
 prepare:
-	mkdir -p build
-	cp *.py build/
-	#cd build; mv openmanod.py openmanod
-	cp openmano build/
-	cp openmanod.cfg build/
+	pip install setuptools
+	#pip install -r requirements.txt
+	mkdir -p build/
+	cp MANIFEST.in build/
 	cp requirements.txt build/
 	cp README.rst build/
-	cp openmano.service build/
-	cp -r vnfs build/
-	cp -r scenarios build/
-	cp -r instance-scenarios build/
-	cp -r scripts build/
-	cd build/scripts; mv service-openmano.sh service-openmano; mv openmano-report.sh openmano-report
-	cp -r database_utils build/
+	cp setup.py 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
+	cp -r scripts build/osm_ro
+	cp -r database_utils build/osm_ro
 
 connectors: prepare
 	# python-novaclient is required for that
-	rm -f build/openmanolinkervimconn.py
-	cd build; for i in `ls vimconn_*.py |sed "s/\.py//"` ; do echo "import $$i" >> openmanolinkervimconn.py; done
-	python build/openmanolinkervimconn.py
-	rm -f build/openmanolinkervimconn.py
+	rm -f build/osm_ro/openmanolinkervimconn.py
+	cd build/osm_ro; for i in `ls vimconn_*.py |sed "s/\.py//"` ; do echo "import $$i" >> openmanolinkervimconn.py; done
+	python build/osm_ro/openmanolinkervimconn.py
+	rm -f build/osm_ro/openmanolinkervimconn.py
 
-build: prepare
-	python -m py_compile build/*.py
+build: connectors prepare
+	python -m py_compile build/osm_ro/*.py
 
-pypackage: build
-	cd build; ./setup.py sdist
-	#cp build/dist/* /root/artifacts/...
+pip: prepare
+	cd build && ./setup.py sdist
+	cd build && ./setup.py bdist_wheel
 
-debpackage: build
-	echo "Nothing to be done yet"
+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
 
-snappackage:
+snap:
 	echo "Nothing to be done yet"
 
+install:
+	cd build && pip install dist/*.tar.gz
+
+develop: prepare
+	cd build && ./setup.py develop
+
+sync:
+	#cp build/dist/* /root/artifacts/...
+
 test:
 	./test/basictest.sh --force --insert-bashrc --install-openvim --init-openvim
 
+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
+
 clean:
 	rm -rf build
 	#find build -name '*.pyc' -delete