X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=cad5436cb28f1e17461a00c3c4a82208c63dfeee;hb=c03f386095ce337626738f3dbde790a7266f40a0;hp=87a45297d2d9ddfb949009cf7665f632c6eb6d44;hpb=3c9b4d0e434d536c471d225e01723a61af544cb1;p=sfa.git

diff --git a/setup.py b/setup.py
index 87a45297..cad5436c 100755
--- a/setup.py
+++ b/setup.py
@@ -9,64 +9,62 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-bins = [ 
+bins = glob("sfa/clientbin/*.py") + \
+    [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',
-    'sfa/plc/sfa-import-plc.py', 
-    'sfa/plc/sfa-nuke-plc.py', 
+    'sfa/importer/sfa-import-plc.py', 
+    'sfa/importer/sfa-nuke-plc.py', 
     'sfa/server/sfa-ca.py', 
-    'sfa/server/sfa-server.py', 
+    'sfa/server/sfa-start.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/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'
+    'keyconvert/keyconvert.py',
     'flashpolicy/sfa_flashpolicy.py',
     ]
 
 package_dirs = [
     'sfa', 
-    'sfa/client',
-    'sfa/methods',
-    'sfa/plc',
-    'sfa/server',
     'sfa/trust',
+    'sfa/storage',
     'sfa/util', 
+    'sfa/client',
+    'sfa/server',
+    'sfa/methods',
+    'sfa/generic',
     'sfa/managers',
+    'sfa/importer',
+    'sfa/plc',
     'sfa/rspecs',
-    'sfa/rspecs/aggregates',
+    'sfa/rspecs/elements',
+    'sfa/rspecs/elements/versions',
+    'sfa/rspecs/versions',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
-    'flashpolicy',
     ]
 
+initscripts = [ 'sfa', 'sfa-cm' ]
 
 data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
                               'config/default_config.xml',
                               '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',
-                              'flash_policy/flashpolicy_config.xml',
+                              '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/', [ "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)]
@@ -77,15 +75,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))
 
-initscripts = [ '/etc/init.d/sfa', '/etc/init.d/sfa-cm' ]
-
 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: