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 branch 'master' of ssh://git.planet-lab.org/git/sfa
[sfa.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index
538d251
..
f0f89a4
100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-14,6
+14,7
@@
bins = [
'config/gen-sfa-cm-config.py',
'sfa/plc/sfa-import-plc.py',
'sfa/plc/sfa-nuke-plc.py',
'config/gen-sfa-cm-config.py',
'sfa/plc/sfa-import-plc.py',
'sfa/plc/sfa-nuke-plc.py',
+ 'sfa/server/sfa-ca.py',
'sfa/server/sfa-server.py',
'sfa/server/sfa-clean-peer-records.py',
'sfa/server/sfa_component_setup.py',
'sfa/server/sfa-server.py',
'sfa/server/sfa-clean-peer-records.py',
'sfa/server/sfa_component_setup.py',
@@
-22,7
+23,14
@@
bins = [
'sfa/client/getRecord.py',
'sfa/client/setRecord.py',
'sfa/client/sfadump.py',
'sfa/client/getRecord.py',
'sfa/client/setRecord.py',
'sfa/client/sfadump.py',
+ 'sfa/client/sfiListNodes.py',
+ 'sfa/client/sfiListSlivers.py',
+ 'sfa/client/sfiAddSliver.py',
+ 'sfa/client/sfiDeleteSliver.py',
+ 'sfa/client/sfiAddAttribute.py',
+ 'sfa/client/sfiDeleteAttribute.py',
'sfatables/sfatables',
'sfatables/sfatables',
+ 'keyconvert/keyconvert.py'
]
package_dirs = [
]
package_dirs = [
@@
-45,10
+53,11
@@
package_dirs = [
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/sfi_config']),
+ 'config/sfi_config',
+ 'sfa/managers/pl/pl.rng']),
('/etc/sfatables/matches/', glob('sfatables/matches/*.xml')),
('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),
('/etc/sfatables/matches/', glob('sfatables/matches/*.xml')),
('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),
- ('/etc/init.d/', ['sfa/init.d/sfa', 'sfa/init.d/sfa
_
cm'])]
+ ('/etc/init.d/', ['sfa/init.d/sfa', 'sfa/init.d/sfa
-
cm'])]
# add sfatables processors as data_files
processor_files = [f for f in glob('sfatables/processors/*') if os.path.isfile(f)]
# add sfatables processors as data_files
processor_files = [f for f in glob('sfatables/processors/*') if os.path.isfile(f)]
@@
-59,7
+68,7
@@
for d in processor_subdirs:
d_files = [f for f in glob(d + '/*') if os.path.isfile(f)]
data_files.append((etc_dir, processor_files))
d_files = [f for f in glob(d + '/*') if os.path.isfile(f)]
data_files.append((etc_dir, processor_files))
-initscripts = [ '/etc/init.d/sfa', '/etc/init.d/sfa
_
cm' ]
+initscripts = [ '/etc/init.d/sfa', '/etc/init.d/sfa
-
cm' ]
if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
python_path = sys.path
if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
python_path = sys.path