Modify openvim code structure, improve py package
- Move python code to osm_openvim folder
- Python package install the code in a folder called osm_openvim
Change-Id: I09f1cdac84418a6a34ceaec9a69c2315e10296a7
Signed-off-by: mirabal <leonardo.mirabal@altran.com>
diff --git a/Makefile b/Makefile
index 03b2f8b..3f9feff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,69 @@
#!/usr/bin/env bash
SHELL := /bin/bash
-all: clean build pip install
-lite: clean build pip install_lite
-
-prepare:
- mkdir -p build
- cp *.py build/
- cp MANIFEST.in build/
- cp openvimd.py openvimd; cp openvimd build/openvimd
- cp ovim.py ovim; cp ovim build/ovim
- cp openvim build/
- cp openflow build/
- cp openvimd.cfg build/
- cp -r scripts build/
- cp -r database_utils build/
-
-build: prepare
- python -m py_compile build/*.py
+all: clean build pip install
+lite: clean build_lite pip_lite install_lite
clean:
rm -rf build
- rm -rf openvimd ovim
-pip:
+prepare_lite:
+ mkdir -p build
+ 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
+
+prepare:
+ mkdir -p 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
+
+build_lite: prepare_lite
+ python -m py_compile build/lib_osm_openvim/*.py
+
+#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
-install:
- cd build/dist; pip install lib*
+pip_lite: clean build_lite
+ cd build; ./setup.py sdist
-install_lite:
- cd build/dist; pip install lib*
+install: clean build
+ cd build/dist; pip install osm_openvim*
+
+install_lite: clean build_lite
+ cd build/dist; pip install lib_osm_openvim-*
+
+
+