X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=c3285ebd46ae24f33c133c0e416cce7f66ea7c23;hb=81ec6a0c9ab0e8907af3a8d59fcb6f941aca400b;hp=538d25182def0813d1a2d744aafd13bf8e8df5c6;hpb=69a9288dc4682da5fe8cd08cc3e8984d912da4f1;p=sfa.git

diff --git a/setup.py b/setup.py
index 538d2518..c3285ebd 100755
--- a/setup.py
+++ b/setup.py
@@ -12,9 +12,10 @@ from distutils.core import setup
 bins = [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',
-    'sfa/plc/sfa-import-plc.py', 
-    'sfa/plc/sfa-nuke-plc.py', 
-    'sfa/server/sfa-server.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_component_setup.py', 
     'sfa/client/sfi.py', 
@@ -22,33 +23,56 @@ bins = [
     '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',
+    'keyconvert/keyconvert.py',
+    'flashpolicy/sfa_flashpolicy.py',
     ]
 
 package_dirs = [
     'sfa', 
-    'sfa/client',
-    'sfa/methods',
-    'sfa/plc',
-    'sfa/server',
     'sfa/trust',
     'sfa/util', 
+    'sfa/client',
+    'sfa/server',
+    'sfa/methods',
+    'sfa/generic',
     'sfa/managers',
+    'sfa/importer',
+    'sfa/plc',
+    'sfa/senslab',
     'sfa/rspecs',
-    'sfa/rspecs/aggregates',
+    'sfa/rspecs/elements',
+    'sfa/rspecs/elements/versions',
+    'sfa/rspecs/versions',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
+    'flashpolicy',
     ]
 
 
 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/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)]
@@ -59,7 +83,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))
 
-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