X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=204003a9cf5bd6ede303419ee6afcf3d8cf181c3;hb=02b77e6682d91cec7ddb35fb140720e95a026e29;hp=e36bada8e48eaf8f292e43fb8884c7ad0f1dd782;hpb=623e299bda6c0343246807db3d012e0b2478e43f;p=sfa.git

diff --git a/setup.py b/setup.py
index e36bada8..204003a9 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 """
-Installation script for the geniwrapper module
+Installation script for the sfa module
 """
 
 import sys, os, os.path
@@ -9,42 +9,67 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-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 ]
+scripts = glob("clientbin/*.py") + \
+    [ 
+    'config/sfa-config-tty',
+    'config/sfa-config',
+#    'config/gen-sfa-cm-config.py',
+    'sfa/server/sfa-start.py', 
+    'sfa/server/sfa_component_setup.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/rspecs',
-                 'sfa/rspecs/aggregates',
-                 'sfa/rspecs/aggregates/vini',
-                 'sfatables',
-                 'sfatables/commands',
-                 'sfatables/processors',
-                 ]
+packages = [
+    'sfa', 
+    'sfa/trust',
+    'sfa/storage',
+    'sfa/util', 
+    'sfa/server',
+    'sfa/methods',
+    'sfa/generic',
+    'sfa/managers',
+    'sfa/importer',
+    'sfa/rspecs',
+    'sfa/rspecs/elements',
+    'sfa/rspecs/elements/versions',
+    'sfa/rspecs/versions',
+    'sfa/client',
+    'sfa/planetlab',
+    'sfa/nitos',
+    'sfa/dummy',
+    'sfa/openstack',
+    'sfa/federica',
+    'sfatables',
+    'sfatables/commands',
+    'sfatables/processors',
+    ]
 
-data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
+initscripts = [ 'sfa', 
+#                'sfa-cm',
+                ]
+
+data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
-                              'config/sfa_config',
-                              'config/sfi_config']),
-              ('/etc/sfatables/matches/', glob('sfatables/matches/*')),
-              ('/etc/sfatables/targets/', glob('sfatables/targets/*')),
-              ('/etc/init.d/', ['sfa/init.d/sfa'])]
+                              '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',
+                              'flashpolicy/sfa_flashpolicy_config.xml',
+                            ]),
+               ('/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/migrations', glob('sfa/storage/migrations/*.*') ),
+               ('/usr/share/sfa/migrations/versions', glob('sfa/storage/migrations/versions/*') ),
+               ('/usr/share/sfa/examples/', glob('sfa/examples/*' ) + [ 'cron.d/sfa.cron' ] ),
+              ]
 
 # add sfatables processors as data_files
 processor_files = [f for f in glob('sfatables/processors/*') if os.path.isfile(f)]
@@ -55,13 +80,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' ]
-
 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
-    remove_files = remove_bins + 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 scripts ]
+    remove_files = remove_bins + [ "/etc/init.d/%s"%x for x in initscripts ]
 
     # remove files   
     for filepath in remove_files:
@@ -80,9 +105,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)