X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=18f5618c787591c15fea16b6ca393525791fd725;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=6af937b538dead263ad42ed0430ab0e7fe958159;hpb=3833476b299fc4ce3cc303361365ac28eae9a8f7;p=sfa.git

diff --git a/setup.py b/setup.py
index 6af937b5..18f5618c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,51 +1,73 @@
 #!/usr/bin/python
 
 """
-Installation script for the geniwrapper module
+Installation script for the sfa module
 """
 
-import os, sys
+import sys, os, os.path
+from glob import glob
 import shutil
 from distutils.core import setup
 
-scripts = [ 'config/sfa-config-tty',
-            'geni/sfa-import-plc.py', 
-            'geni/sfa-plc.py', 
-            'cmdline/sfi.py', 
-            'cmdline/getNodes.py',
-            'cmdline/getRecord.py',
-            'cmdline/setRecord.py',
-            'cmdline/genidump.py',
-            ]
-package_dirs = [ 'geni', 
-                 'geni/util', 
-                 'geni/methods',
-                 ]
-data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml', 
-                               'config/registries.xml', 
-                               'config/sfa_config', 
-                               'config/sfi_config',
-                               ]),
-               ('/etc/init.d/', ['geni/init.d/sfa']),
-               ('/var/www/html/wsdl', [ 'wsdl/sfa.wsdl' ] ),
-               ]
-symlinks = [ '/usr/share/geniwrapper' ]
-initscripts = [ '/etc/init.d/geni' ]
-        
+bins = [ 
+    'config/sfa-config-tty',
+    'sfa/plc/sfa-import-plc.py', 
+    'sfa/plc/sfa-nuke-plc.py', 
+    'sfa/server/sfa-server.py', 
+    'sfa/server/sfa-clean-peer-records.py', 
+    'sfa/client/sfi.py', 
+    'sfa/client/getNodes.py',
+    'sfa/client/getRecord.py',
+    'sfa/client/setRecord.py',
+    'sfa/client/sfadump.py',
+    'sfatables/sfatables',
+    ]
+
+package_dirs = [
+    'sfa', 
+    'sfa/client',
+    'sfa/methods',
+    'sfa/plc',
+    'sfa/server',
+    'sfa/trust',
+    'sfa/util', 
+    'sfa/managers',
+    'sfa/rspecs',
+    'sfa/rspecs/aggregates',
+    'sfa/rspecs/aggregates/vini',
+    'sfatables',
+    'sfatables/commands',
+    'sfatables/processors',
+    ]
+
+
+data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
+                              'config/registries.xml',
+                              'config/default_config.xml',
+                              'config/sfi_config']),
+              ('/etc/sfatables/matches/', glob('sfatables/matches/*.xml')),
+              ('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),
+              ('/etc/init.d/', ['sfa/init.d/sfa'])]
+
+# add sfatables processors as data_files
+processor_files = [f for f in glob('sfatables/processors/*') if os.path.isfile(f)]
+data_files.append(('/etc/sfatables/processors/', processor_files))
+processor_subdirs = [d for d in glob('sfatables/processors/*') if os.path.isdir(d)]
+for d in processor_subdirs:
+    etc_dir = os.path.join("/etc/sfatables/processors", os.path.basename(d))
+    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 = [ path + os.sep + 'geni' for path in python_path if path.endswith('site-packages')]
-    remove_dirs = ['/etc/sfa/'] + site_packages_path
-    remove_files = [ '/usr/bin/sfa-config-tty',
-                     '/usr/bin/sfa-import-plc.py', 
-                     '/usr/bin/sfa-plc.py', 
-                     '/usr/bin/sfi.py', 
-                     '/usr/bin/getNodes.py',
-                     '/usr/bin/getRecord.py',
-                     '/usr/bin/setRecord.py',
-                     '/usr/bin/genidump.py',
-                    ] + symlinks + initscripts
-    
+    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   
     for filepath in remove_files:
         print "removing", filepath, "...",
@@ -60,31 +82,12 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
             shutil.rmtree(directory)
             print "success"
         except: print "failed"
- 
 else:
-    
     # avoid repeating what's in the specfile already
-    setup(name='geni',
+    setup(name='sfa',
           packages = package_dirs, 
           data_files = data_files,
           ext_modules = [],
           py_modules = [],
-          scripts = scripts,   
-          )
-
-    # create symlink to geniwrapper source in /usr/share
-    python_path = sys.path
-    site_packages_path = [ path + os.sep + 'geni' for path in python_path if path.endswith('site-packages')]
-    # python path usualy has /usr/local/lib/ path , filter this out
-    site_packages_path = [x for x in site_packages_path if 'local' not in x]
+          scripts = bins)
 
-    # we can not do this here as installation root might change paths
-    # - baris
-    #
-    # for src in site_packages_path:
-    #     for dst in symlinks:
-    #         try: 
-    #             os.symlink(src, dst)
-    #         except: pass
-    # for initscript in initscripts:
-    #     os.chmod(initscript, 00744)