X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Makefile;h=41b265a7e65a5a5310d3a60c6b6e32421faac2c4;hb=6e8b5a844f5f2e73d0f2079a127b4b41d52955b9;hp=5bde339b2ee3bbf073043b7ef91802e9b6769213;hpb=e5ef517abec7db86ce2ee7cba628548ce4b5a6fd;p=osm%2FRO.git

diff --git a/Makefile b/Makefile
index 5bde339b..41b265a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,20 @@
 SHELL := /bin/bash
 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
+	pip install --user --upgrade setuptools
 	mkdir -p build/
-	#git describe | sed -e 's/^v//' > build/RO_VERSION
-	echo "1.1.5" > build/RO_VERSION
+	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/
@@ -27,16 +36,19 @@ 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
 
-package: prepare
+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"
@@ -45,7 +57,7 @@ install:
 	DEBIAN_FRONTEND=noninteractive apt-get update && \
 	DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip && \
 	pip install --upgrade pip && \
-	dpkg -i build/deb_dist/*.deb
+	dpkg -i .build/*.deb
 
 develop: prepare
 	#pip install -r requirements.txt
@@ -63,8 +75,4 @@ run-docker:
 stop-docker:
 	docker-compose -f docker/openmano-compose.yml down
 
-clean:
-	rm -rf build
-	#find build -name '*.pyc' -delete
-	#find build -name '*.pyo' -delete