Add devflow version for xseg

diff --git a/devflow.conf b/devflow.conf
index c500292..8947c2c 100644 (file)
--- a/devflow.conf
+++ b/devflow.conf
@@ -1,5 +1,7 @@
 [ packages ]
   [[ archipelago_tools ]]
     version_file = "xseg/tools/archipelago/archipelago/version.py"
+  [[ python_xseg ]]
+    version_file = "xseg/sys/user/python/xseg/version.py"
   [[ archipelago ]]
     version_file = ""

diff --git a/xseg/sys/user/python/Makefile b/xseg/sys/user/python/Makefile
index 2519a40..a59977f 100644 (file)
--- a/xseg/sys/user/python/Makefile
+++ b/xseg/sys/user/python/Makefile
@@ -47,6 +47,10 @@ XML2PY = xml2py
 default: all
 
 all: xseg/xseg_api.py xseg/xprotocol.py
+       if [ ! -e xseg/version.py ] ; then \
+               echo '__version__ = "'`devflow-version python`'"' > xseg/version.py ; \
+       fi
+       python setup.py build
 
 $(BASE)/sys/user/libxseg.so:
        make -C $(BASE)/sys/user libxseg.so
@@ -72,8 +76,9 @@ xseg/xprotocol.py: xprotocol.xml
        $(XML2PY) -d -k defst -c $< -o $@
 
 install:
-#      mkdir p $(DESTDIR)$(pythondir)
-#      cp -r xseg $(DESTDIR)$(pythondir)
+       if [ ! -e xseg/version.py ] ; then \
+               echo '__version__ = "'`devflow-version python`'"' > xseg/version.py ; \
+       fi
        python setup.py install --install-layout=deb --root=$(DESTDIR)
 
 install-src:
@@ -87,4 +92,8 @@ install-src:
 
 
 clean:
-       rm -f xseg.xml xprotocol.xml xseg/xseg_api.py xseg/xseg_api.pyc xseg/xprotocol.py xseg/xprotocol.pyc xseg/__init__.pyc
+       rm -rf build/
+       rm -rf python_xseg.egg-info/
+       rm -f xseg.xml xprotocol.xml xseg/xseg_api.py xseg/xseg_api.pyc \
+               xseg/xprotocol.py xseg/xprotocol.pyc xseg/__init__.pyc  \
+               xseg/version.py

diff --git a/xseg/sys/user/python/setup.py b/xseg/sys/user/python/setup.py
index 3d278dc..3a74183 100644 (file)
--- a/xseg/sys/user/python/setup.py
+++ b/xseg/sys/user/python/setup.py
@@ -47,7 +47,8 @@ DEBIANDIR = os.path.join(TOPDIR, 'debian');
 DEBIANDIR = os.path.normpath(DEBIANDIR)
 
 
-VERSION = os.environ['VERSION']
+from xseg.version import __version__
+VERSION = __version__
 # Package info
 if os.path.isdir(DEBIANDIR):
     README = open(os.path.join(DEBIANDIR, 'README')).read()

diff --git a/xseg/tools/archipelago/Makefile b/xseg/tools/archipelago/Makefile
index 5a1f63b..175eb93 100644 (file)
--- a/xseg/tools/archipelago/Makefile
+++ b/xseg/tools/archipelago/Makefile
@@ -49,6 +49,9 @@ default:
 clean:
        rm -r build/
        rm -r python_archipelago.egg-info/
+       rm archipelago/version.py rm distribute_setup.pyc \
+               archipelago/__init__.pyc archipelago/archipelago.pyc \
+               archipelago/version.pyc
 
 install:
        if [ ! -e archipelago/version.py ] ; then \