X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=10c40c2bbc3af7d24dd2432c3e416249126f55c8;hb=1f96bfc77a793cc88422c967e12102211523e459;hp=f989b68a9dbec97bac5163b9d90e908273f6ae15;hpb=c4c62593be68afb2431a4cae5fd17c2ab4636881;p=sfa.git diff --git a/setup.py b/setup.py index f989b68a..10c40c2b 100755 --- a/setup.py +++ b/setup.py @@ -5,6 +5,7 @@ Installation script for the geniwrapper module """ import sys, os, os.path +from glob import glob import shutil from distutils.core import setup @@ -12,13 +13,14 @@ 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/genidump.py', + 'sfatables/sfatables', ] -remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in bins ] package_dirs = [ 'sfa', 'sfa/client', @@ -27,22 +29,42 @@ package_dirs = [ 'sfa', 'sfa/server', 'sfa/trust', 'sfa/util', + '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/sfa_config', - 'config/sfi_config', - ]), - ('/etc/init.d/', ['sfa/init.d/sfa']), - ] + + +data_files = [('/etc/sfa/', [ 'config/aggregates.xml', + 'config/registries.xml', + 'config/sfa_config', + '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 + 'sfa' for path in python_path if path.endswith('site-packages')] - remove_dirs = ['/etc/sfa/'] + site_packages_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 for filepath in remove_files: print "removing", filepath, "...", @@ -57,15 +79,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='sfa', packages = package_dirs, data_files = data_files, ext_modules = [], py_modules = [], - scripts = bins, - ) + scripts = bins)