X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Makefile;h=70785973aa5357b9080a90e58356ada3354dcad7;hb=9cead2a0262deabadc900d580ef312fbc468efc0;hp=3f9feffd8621fd479b895e01b52d56f26739697a;hpb=9f6571090b203922cabb0382226be0fa48d6e046;p=osm%2Fopenvim.git

diff --git a/Makefile b/Makefile
index 3f9feff..7078597 100644
--- a/Makefile
+++ b/Makefile
@@ -1,71 +1,116 @@
 #!/usr/bin/env bash
+.PHONY: all test clean
+
 SHELL := /bin/bash
 
-all: clean build pip install
-lite: clean build_lite pip_lite install_lite
+all:
+	$(MAKE) clean_build build
+	$(MAKE) clean_build openvim
+	$(MAKE) clean_build build_lite
+	$(MAKE) clean_build lite
+
+openvim: package_openvim
+
+lite: package_lib_openvim
 
-clean:
+clean: clean_build
+	rm -rf .build
+
+clean_build:
 	rm -rf build
+	find osm_openvim -name '*.pyc' -delete
+	find osm_openvim -name '*.pyo' -delete
 
 prepare_lite:
+	#pip install --user --upgrade setuptools
 	mkdir -p build
-	cp -r  osm_openvim/ build/lib_osm_openvim
+	#VER1=$(shell git describe --match v*| sed -e 's/^v//' |cut -d- -f1); \
+	#VER2=$(shell git describe --match v*| cut -d- -f2); \
+	#VER3=$(shell git describe --match v*| cut -d- -f3); \
+	#echo "$$VER1.dev$$VER2+$$VER3" > build/OVIM_VERSION
+	cp tox.ini build/
+	cp MANIFEST.in build/
+	#sed -i "s/include OPENVIM_VERSION/include OVIM_VERSION/g" build/MANIFEST.in
+	sed -i "s/recursive-include osm_openvim/recursive-include lib_osm_openvim/g" build/MANIFEST.in
+	sed -i "s/include openflow/include openflow-lib/g" build/MANIFEST.in
+	sed -i '/include openvimd/d' build/MANIFEST.in
+	sed -i '/include openvim/d' build/MANIFEST.in
+	cp README_lite.rst build/README.rst
+	cp setup_lite.py build/setup.py
+	cp stdeb_lite.cfg build/stdeb.cfg
+	cp -r osm_openvim/ build/lib_osm_openvim
 	rm build/lib_osm_openvim/httpserver.py
 	rm build/lib_osm_openvim/openvimd.cfg
 	cp -r database_utils build/lib_osm_openvim/
 	cp -r scripts build/lib_osm_openvim/
-	cp MANIFEST.in build/
-	cp setup_lite.py build/setup.py
-	cp openflow build/
-	sed -i "s/from osm_openvim/from lib_osm_openvim/g" build/openflow
-	sed -i "s/import osm_openvim/import lib_osm_openvim/g" build/openflow
-	sed -i "s/import osm_openvim; print osm_openvim.__path__[0]/import lib_osm_openvim; print lib_osm_openvim.__path__[0]/g" build/lib_osm_openvim/database_utils/migrate_vim_db.sh
-	sed -i "s/recursive-include osm_openvim */recursive-include lib_osm_openvim */g" build/MANIFEST.in
-	sed '/include openvimd/d' build/MANIFEST.in
-	sed '/include openvim/d' build/MANIFEST.in
+	cp openflow build/openflow-lib
+	sed -i "s/from osm_openvim/from lib_osm_openvim/g" build/openflow-lib
+	sed -i "s/import osm_openvim/import lib_osm_openvim/g" build/openflow-lib
+	sed -i "s/__import__(\"osm_openvim\.\"/__import__(\"lib_osm_openvim\.\"/g" build/openflow-lib
+	sed -i "s/import osm_openvim; print osm_openvim\.__path__\[0\]/import lib_osm_openvim; print lib_osm_openvim\.__path__\[0\]/g" build/lib_osm_openvim/database_utils/migrate_vim_db.sh
+	sed -i "s/__import__(\"osm_openvim\.\"/__import__(\"lib_osm_openvim\.\"/g" build/lib_osm_openvim/ovim.py
 
 prepare:
+	#pip install --user --upgrade setuptools
 	mkdir -p build
+	#VER1=$(shell git describe --match v*| sed -e 's/^v//' |cut -d- -f1); \
+	#VER2=$(shell git describe --match v*| cut -d- -f2); \
+	#VER3=$(shell git describe --match v*| cut -d- -f3); \
+	#echo "$$VER1.dev$$VER2+$$VER3" > build/OPENVIM_VERSION
+	cp tox.ini build/
+	cp MANIFEST.in build/
+	cp README.rst build/
+	cp setup.py build/
+	cp stdeb.cfg build/
 	cp -r osm_openvim/  build/
 	cp -r scripts build/osm_openvim/
 	cp -r database_utils build/osm_openvim/
 	cp -r templates build/osm_openvim/
 	cp -r test build/osm_openvim/
 	cp -r charm build/osm_openvim/
-	cp MANIFEST.in build/
-	cp setup.py build/
 	cp openflow build/
 	cp openvim build/
 	cp openvimd build/
 
 build: prepare
 	python -m py_compile build/osm_openvim/*.py
+	#cd build && tox -e flake8
 
 build_lite: prepare_lite
 	python -m py_compile build/lib_osm_openvim/*.py
+	#cd build && tox -e flake8
 
-#deb:
-#	cd build && python setup.py --command-packages=stdeb.command bdist_deb
-#
-#debianize:
-#	cd build && python setup.py --command-packages=stdeb.command debianize
-
-pip: clean build
-	cd build; ./setup.py sdist
-
-pip_lite: clean build_lite
-	cd build; ./setup.py sdist
-
-install: clean build
-	cd build/dist; pip  install osm_openvim*
-
-install_lite: clean build_lite
-	cd build/dist; pip  install  lib_osm_openvim-*
+pip: build
+	cd build && ./setup.py sdist
 
+pip_lite: build_lite
+	cd build && ./setup.py sdist
 
+package_openvim: 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_openvim/scripts/python-osm-openvim.postinst deb_dist/osm-openvim*/debian/
+	cd build/deb_dist/osm-openvim* && dpkg-buildpackage -rfakeroot -uc -us
+	mkdir -p .build
+	cp build/deb_dist/python-*.deb .build/
 
+package_lib_openvim: prepare_lite
+	#apt-get install -y python-stdeb
+	#cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True
+	#cd build/deb_dist/lib-osm-openvim* && dpkg-buildpackage -rfakeroot -uc -us
+	cd build && python setup.py --command-packages=stdeb.command bdist_deb
+	mkdir -p .build
+	cp build/deb_dist/python-*.deb .build/
 
+snap:
+	echo "Nothing to be done yet"
 
+install: clean build
+	#cd build/dist; pip install --user osm_openvim*
+	cd build/dist; pip install osm_openvim*
 
+install_lite: clean build_lite
+	#cd build/dist; pip install --user lib_osm_openvim-*
+	cd build/dist; pip install lib_osm_openvim-*