From 0c6d42b1114eef8672a1c6311f04aa626bd1829f Mon Sep 17 00:00:00 2001
From: Filippos Giannakos <philipgian@grnet.gr>
Date: Tue, 5 Feb 2013 18:41:26 +0200
Subject: [PATCH] Add archipelago devflow version
---
.gitignore | 1 +
devflow.conf | 2 ++
xseg/tools/Makefile | 2 ++
xseg/tools/archipelago/Makefile | 10 ++++++++--
xseg/tools/archipelago/setup.py | 15 ++++++++-------
5 files changed, 21 insertions(+), 9 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..63c845c0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xseg/tools/archipelago/archipelago/version.py
diff --git a/devflow.conf b/devflow.conf
index 3fff7edd..c500292c 100644
--- a/devflow.conf
+++ b/devflow.conf
@@ -1,3 +1,5 @@
[ packages ]
+ [[ archipelago_tools ]]
+ version_file = "xseg/tools/archipelago/archipelago/version.py"
[[ archipelago ]]
version_file = ""
diff --git a/xseg/tools/Makefile b/xseg/tools/Makefile
index fb8d6767..da39bf45 100644
--- a/xseg/tools/Makefile
+++ b/xseg/tools/Makefile
@@ -11,6 +11,8 @@ EFILES+="xseg-domain-targets"
SUBDIR:=$(subst $(XSEG_HOME),,$(CURDIR))
default:
+ make -C archipelago
+ make -C ext_scripts
clean:
make -C archipelago clean
diff --git a/xseg/tools/archipelago/Makefile b/xseg/tools/archipelago/Makefile
index f105ac80..5a1f63b9 100644
--- a/xseg/tools/archipelago/Makefile
+++ b/xseg/tools/archipelago/Makefile
@@ -41,14 +41,19 @@ FILES+=$(shell ls *.py)
SUBDIR:=$(subst $(XSEG_HOME),,$(CURDIR))
default:
+ if [ ! -e archipelago/version.py ] ; then \
+ echo '__version__ = "'`devflow-version python`'"' > archipelago/version.py ; \
+ fi
+ python setup.py build
clean:
rm -r build/
rm -r python_archipelago.egg-info/
install:
-# mkdir p $(DESTDIR)$(pythondir)
-# cp -r xseg $(DESTDIR)$(pythondir)
+ if [ ! -e archipelago/version.py ] ; then \
+ echo '__version__ = "'`devflow-version python`'"' > archipelago/version.py ; \
+ fi
python setup.py install --install-layout=deb --root=$(DESTDIR)
install-src:
@@ -60,5 +65,6 @@ install-src:
install -o 0 -g 0 -m 644 -t $(DESTDIR)$(srcdir)$(SUBDIR)/archipelago archipelago/__init__.py ;
install -o 0 -g 0 -m 644 -t $(DESTDIR)$(srcdir)$(SUBDIR)/archipelago archipelago/archipelago.py ;
install -o 0 -g 0 -m 644 -t $(DESTDIR)$(srcdir)$(SUBDIR)/archipelago archipelago/vlmc.py ;
+ install -o 0 -g 0 -m 644 -t $(DESTDIR)$(srcdir)$(SUBDIR)/archipelago archipelago/version.py ;
diff --git a/xseg/tools/archipelago/setup.py b/xseg/tools/archipelago/setup.py
index a38bd8f0..9afab312 100644
--- a/xseg/tools/archipelago/setup.py
+++ b/xseg/tools/archipelago/setup.py
@@ -41,12 +41,13 @@ from distutils.util import convert_path
from fnmatch import fnmatchcase
from setuptools import setup, find_packages
-HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-DEBIANDIR = os.path.join(HERE, '../../../../debian');
+#HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
+TOPDIR = os.environ['TOPDIR']
+DEBIANDIR = os.path.join(TOPDIR, 'debian');
DEBIANDIR = os.path.normpath(DEBIANDIR)
-
-VERSION = os.environ['VERSION']
+from archipelago.version import __version__
+VERSION = __version__
# Package info
if os.path.isdir(DEBIANDIR):
README = open(os.path.join(DEBIANDIR, 'README')).read()
@@ -64,7 +65,7 @@ PACKAGES = find_packages(PACKAGES_ROOT)
CLASSIFIERS = []
# Package requirements
-INSTALL_REQUIRES = ['xseg'
+INSTALL_REQUIRES = ['python-xseg'
]
EXTRAS_REQUIRES = {
@@ -193,8 +194,8 @@ setup(
entry_points = {
'console_scripts': [
- 'archipelago = archipelago.cli',
- 'vlmc = archipelago.cli',
+ 'archipelago = archipelago.archipelago:cli',
+ 'vlmc = archipelago.archipelago:cli',
],
}
)
--
GitLab