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 'upstreammaster'
[sfa.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index
18f5618
..
9f68e18
100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-11,43
+11,71
@@
from distutils.core import setup
bins = [
'config/sfa-config-tty',
bins = [
'config/sfa-config-tty',
- 'sfa/plc/sfa-import-plc.py',
- 'sfa/plc/sfa-nuke-plc.py',
- 'sfa/server/sfa-server.py',
+ 'config/gen-sfa-cm-config.py',
+ 'sfa/importer/sfa-import-plc.py',
+ 'sfa/importer/sfa-nuke-plc.py',
+ 'sfa/server/sfa-ca.py',
+ 'sfa/server/sfa-start.py',
'sfa/server/sfa-clean-peer-records.py',
'sfa/server/sfa-clean-peer-records.py',
+ 'sfa/server/sfa_component_setup.py',
'sfa/client/sfi.py',
'sfa/client/getNodes.py',
'sfa/client/getRecord.py',
'sfa/client/setRecord.py',
'sfa/client/sfadump.py',
'sfa/client/sfi.py',
'sfa/client/getNodes.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',
+ 'flashpolicy/sfa_flashpolicy.py',
]
package_dirs = [
'sfa',
]
package_dirs = [
'sfa',
- 'sfa/client',
- 'sfa/methods',
- 'sfa/plc',
- 'sfa/server',
'sfa/trust',
'sfa/trust',
+ 'sfa/storage',
'sfa/util',
'sfa/util',
+ 'sfa/client',
+ 'sfa/server',
+ 'sfa/methods',
+ 'sfa/generic',
'sfa/managers',
'sfa/managers',
+ 'sfa/importer',
+ 'sfa/plc',
'sfa/rspecs',
'sfa/rspecs',
- 'sfa/rspecs/aggregates',
- 'sfa/rspecs/aggregates/vini',
+ 'sfa/rspecs/elements',
+ 'sfa/rspecs/elements/versions',
+ 'sfa/rspecs/versions',
'sfatables',
'sfatables/commands',
'sfatables/processors',
]
'sfatables',
'sfatables/commands',
'sfatables/processors',
]
+initscripts = [ 'sfa', 'sfa-cm' ]
+
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',
+ 'config/topology',
+ 'sfa/managers/pl/pl.rng',
+ 'sfa/trust/credential.xsd',
+ 'sfa/trust/top.xsd',
+ 'sfa/trust/sig.xsd',
+ 'sfa/trust/xml.xsd',
+ 'sfa/trust/protogeni-rspec-common.xsd',
+ 'flashpolicy/sfa_flashpolicy_config.xml',
+ ]),
('/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'])]
+ ('/etc/init.d/', [ "init.d/%s"%x for x in initscripts ]),
+ ('/usr/share/sfa/', [ 'sfa/storage/sfa.sql' ] ),
+ ]
# 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)]
@@
-58,15
+86,13
@@
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' ]
-
if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
python_path = sys.path
site_packages_path = [ os.path.join(p,'sfa') for p in python_path if p.endswith('site-packages')]
site_packages_path += [ os.path.join(p,'sfatables') for p in python_path if p.endswith('site-packages')]
remove_dirs = ['/etc/sfa/', '/etc/sfatables'] + site_packages_path
remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in bins ]
if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
python_path = sys.path
site_packages_path = [ os.path.join(p,'sfa') for p in python_path if p.endswith('site-packages')]
site_packages_path += [ os.path.join(p,'sfatables') for p in python_path if p.endswith('site-packages')]
remove_dirs = ['/etc/sfa/', '/etc/sfatables'] + site_packages_path
remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in bins ]
- remove_files = remove_bins +
initscripts
+ remove_files = remove_bins +
[ "/etc/init.d/%s"%x for x in initscripts ]
# remove files
for filepath in remove_files:
# remove files
for filepath in remove_files: