X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=b18f13a1e5e0753d3cd63b1075dbde6a62f5ce86;hb=c6884b76347be620a7b2aed427291a2e49b53850;hp=0c02f323106128fcc0051bd6b5175b9bf4186ec0;hpb=0abc272f4c11fd140fc5596984d6006081a36078;p=sfa.git

diff --git a/setup.py b/setup.py
index 0c02f323..b18f13a1 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,8 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-bins = [ 
+scripts = glob("sfa/clientbin/*.py") + \
+    [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',
     'sfa/importer/sfa-import-plc.py', 
@@ -18,25 +19,15 @@ bins = [
     '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',
     'flashpolicy/sfa_flashpolicy.py',
     ]
 
-package_dirs = [
+packages = [
     'sfa', 
     'sfa/trust',
+    'sfa/storage',
     'sfa/util', 
     'sfa/client',
     'sfa/server',
@@ -54,8 +45,9 @@ package_dirs = [
     'sfatables/processors',
     ]
 
+initscripts = [ 'sfa', 'sfa-cm' ]
 
-data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
+data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
                               'config/default_config.xml',
                               'config/sfi_config',
@@ -68,9 +60,12 @@ data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                               '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/sfatables/matches/', glob('sfatables/matches/*.xml')),
+               ('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),
+               ('/etc/init.d/', [ "init.d/%s"%x for x in initscripts ]),
+               ('/usr/share/sfa/', [ 'sfa/storage/sfa.sql' ] ),
+               ('/usr/share/sfa/examples/', glob('sfa/examples/*' ) ),
+              ]
 
 # add sfatables processors as data_files
 processor_files = [f for f in glob('sfatables/processors/*') if os.path.isfile(f)]
@@ -81,15 +76,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_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   
     for filepath in remove_files:
@@ -108,9 +101,7 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
 else:
     # avoid repeating what's in the specfile already
     setup(name='sfa',
-          packages = package_dirs, 
+          packages = packages, 
           data_files = data_files,
-          ext_modules = [],
-          py_modules = [],
-          scripts = bins)
+          scripts = scripts)