git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Master in geni-v3 conflict resolution
[sfa.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index
43d4786
..
8ce7dba
100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-9,6
+9,8
@@
from glob import glob
import shutil
from distutils.core import setup
import shutil
from distutils.core import setup
+from sfa.util.version import version_tag
+
scripts = glob("clientbin/*.py") + \
[
'config/sfa-config-tty',
scripts = glob("clientbin/*.py") + \
[
'config/sfa-config-tty',
@@
-34,6
+36,7
@@
packages = [
'sfa/rspecs',
'sfa/rspecs/elements',
'sfa/rspecs/elements/versions',
'sfa/rspecs',
'sfa/rspecs/elements',
'sfa/rspecs/elements/versions',
+ 'sfa/rspecs/elements/v3',
'sfa/rspecs/versions',
'sfa/client',
'sfa/planetlab',
'sfa/rspecs/versions',
'sfa/client',
'sfa/planetlab',
@@
-41,18
+44,19
@@
packages = [
'sfa/dummy',
'sfa/openstack',
'sfa/federica',
'sfa/dummy',
'sfa/openstack',
'sfa/federica',
+ 'sfa/senslab',
'sfatables',
'sfatables/commands',
'sfatables/processors',
]
'sfatables',
'sfatables/commands',
'sfatables/processors',
]
-initscripts = [ 'sfa',
-# 'sfa-cm',
- ]
+initscripts = [ 'sfa' ]
+if not os.path.isfile('/etc/redhat-release'): initscripts.append('functions.sfa')
data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
'config/registries.xml',
'config/default_config.xml',
data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
'config/registries.xml',
'config/default_config.xml',
+ 'config/api_versions.xml',
'config/sfi_config',
'config/topology',
'sfa/managers/pl/pl.rng',
'config/sfi_config',
'config/topology',
'sfa/managers/pl/pl.rng',
@@
-107,5
+111,9
@@
else:
setup(name='sfa',
packages = packages,
data_files = data_files,
setup(name='sfa',
packages = packages,
data_files = data_files,
- scripts = scripts)
+ scripts = scripts,
+ url="http://svn.planet-lab.org/wiki/SFATutorial",
+ author="Thierry Parmentelat, Tony Mack, Scott Baker",
+ author_email="thierry.parmentelat@inria.fr, tmack@princeton.cs.edu, smbaker@gmail.com",
+ version=version_tag)