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
fix component_name in rspecs
[sfa.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index
28f7ec9
..
162d057
100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-9,25
+9,29
@@
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
+# while cleaning up we might not have this..
+try:
+ from sfa.util.version import version_tag
+except:
+ version_tag='cleaningup'
scripts = glob("clientbin/*.py") + \
scripts = glob("clientbin/*.py") + \
- [
+ [
'config/sfa-config-tty',
'config/sfa-config',
# 'config/gen-sfa-cm-config.py',
'config/sfa-config-tty',
'config/sfa-config',
# 'config/gen-sfa-cm-config.py',
- 'sfa/server/sfa-start.py',
-# 'sfa/server/sfa_component_setup.py',
+ 'sfa/server/sfa-start.py',
+# 'sfa/server/sfa_component_setup.py',
'sfatables/sfatables',
'keyconvert/keyconvert.py',
'flashpolicy/sfa_flashpolicy.py',
]
packages = [
'sfatables/sfatables',
'keyconvert/keyconvert.py',
'flashpolicy/sfa_flashpolicy.py',
]
packages = [
- 'sfa',
+ 'sfa',
'sfa/trust',
'sfa/storage',
'sfa/trust',
'sfa/storage',
- 'sfa/util',
+ 'sfa/util',
'sfa/server',
'sfa/methods',
'sfa/generic',
'sfa/server',
'sfa/methods',
'sfa/generic',
@@
-36,6
+40,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',
@@
-43,7
+48,7
@@
packages = [
'sfa/dummy',
'sfa/openstack',
'sfa/federica',
'sfa/dummy',
'sfa/openstack',
'sfa/federica',
- 'sfa/
sens
lab',
+ 'sfa/
iot
lab',
'sfatables',
'sfatables/commands',
'sfatables/processors',
'sfatables',
'sfatables/commands',
'sfatables/processors',
@@
-91,24
+96,24
@@
if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in scripts ]
remove_files = remove_bins + [ "/etc/init.d/%s"%x for x in initscripts ]
remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in scripts ]
remove_files = remove_bins + [ "/etc/init.d/%s"%x for x in initscripts ]
- # remove files
+ # remove files
for filepath in remove_files:
print "removing", filepath, "...",
for filepath in remove_files:
print "removing", filepath, "...",
- try:
+ try:
os.remove(filepath)
print "success"
except: print "failed"
os.remove(filepath)
print "success"
except: print "failed"
- # remove directories
- for directory in remove_dirs:
+ # remove directories
+ for directory in remove_dirs:
print "removing", directory, "...",
print "removing", directory, "...",
- try:
+ try:
shutil.rmtree(directory)
print "success"
except: print "failed"
else:
# avoid repeating what's in the specfile already
setup(name='sfa',
shutil.rmtree(directory)
print "success"
except: print "failed"
else:
# avoid repeating what's in the specfile already
setup(name='sfa',
- packages = packages,
+ packages = packages,
data_files = data_files,
scripts = scripts,
url="http://svn.planet-lab.org/wiki/SFATutorial",
data_files = data_files,
scripts = scripts,
url="http://svn.planet-lab.org/wiki/SFATutorial",