Commit 0c6d42b1 authored by Filippos Giannakos's avatar Filippos Giannakos

Add archipelago devflow version

parent 51886667
xseg/tools/archipelago/archipelago/version.py
[ packages ] [ packages ]
[[ archipelago_tools ]]
version_file = "xseg/tools/archipelago/archipelago/version.py"
[[ archipelago ]] [[ archipelago ]]
version_file = "" version_file = ""
...@@ -11,6 +11,8 @@ EFILES+="xseg-domain-targets" ...@@ -11,6 +11,8 @@ EFILES+="xseg-domain-targets"
SUBDIR:=$(subst $(XSEG_HOME),,$(CURDIR)) SUBDIR:=$(subst $(XSEG_HOME),,$(CURDIR))
default: default:
make -C archipelago
make -C ext_scripts
clean: clean:
make -C archipelago clean make -C archipelago clean
......
...@@ -41,14 +41,19 @@ FILES+=$(shell ls *.py) ...@@ -41,14 +41,19 @@ FILES+=$(shell ls *.py)
SUBDIR:=$(subst $(XSEG_HOME),,$(CURDIR)) SUBDIR:=$(subst $(XSEG_HOME),,$(CURDIR))
default: default:
if [ ! -e archipelago/version.py ] ; then \
echo '__version__ = "'`devflow-version python`'"' > archipelago/version.py ; \
fi
python setup.py build
clean: clean:
rm -r build/ rm -r build/
rm -r python_archipelago.egg-info/ rm -r python_archipelago.egg-info/
install: install:
# mkdir p $(DESTDIR)$(pythondir) if [ ! -e archipelago/version.py ] ; then \
# cp -r xseg $(DESTDIR)$(pythondir) echo '__version__ = "'`devflow-version python`'"' > archipelago/version.py ; \
fi
python setup.py install --install-layout=deb --root=$(DESTDIR) python setup.py install --install-layout=deb --root=$(DESTDIR)
install-src: install-src:
...@@ -60,5 +65,6 @@ 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/__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/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/vlmc.py ;
install -o 0 -g 0 -m 644 -t $(DESTDIR)$(srcdir)$(SUBDIR)/archipelago archipelago/version.py ;
...@@ -41,12 +41,13 @@ from distutils.util import convert_path ...@@ -41,12 +41,13 @@ from distutils.util import convert_path
from fnmatch import fnmatchcase from fnmatch import fnmatchcase
from setuptools import setup, find_packages from setuptools import setup, find_packages
HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__))) #HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
DEBIANDIR = os.path.join(HERE, '../../../../debian'); TOPDIR = os.environ['TOPDIR']
DEBIANDIR = os.path.join(TOPDIR, 'debian');
DEBIANDIR = os.path.normpath(DEBIANDIR) DEBIANDIR = os.path.normpath(DEBIANDIR)
from archipelago.version import __version__
VERSION = os.environ['VERSION'] VERSION = __version__
# Package info # Package info
if os.path.isdir(DEBIANDIR): if os.path.isdir(DEBIANDIR):
README = open(os.path.join(DEBIANDIR, 'README')).read() README = open(os.path.join(DEBIANDIR, 'README')).read()
...@@ -64,7 +65,7 @@ PACKAGES = find_packages(PACKAGES_ROOT) ...@@ -64,7 +65,7 @@ PACKAGES = find_packages(PACKAGES_ROOT)
CLASSIFIERS = [] CLASSIFIERS = []
# Package requirements # Package requirements
INSTALL_REQUIRES = ['xseg' INSTALL_REQUIRES = ['python-xseg'
] ]
EXTRAS_REQUIRES = { EXTRAS_REQUIRES = {
...@@ -193,8 +194,8 @@ setup( ...@@ -193,8 +194,8 @@ setup(
entry_points = { entry_points = {
'console_scripts': [ 'console_scripts': [
'archipelago = archipelago.cli', 'archipelago = archipelago.archipelago:cli',
'vlmc = archipelago.cli', 'vlmc = archipelago.archipelago:cli',
], ],
} }
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment