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

diff --git a/setup.py b/setup.py
index 6af937b5..3f4e729b 100755
--- a/setup.py
+++ b/setup.py
@@ -9,36 +9,40 @@ 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',
+            'sfa/plc/sfa-import-plc.py', 
+            'sfa/server/sfa-server.py', 
+            'sfa/client/sfi.py', 
+            'sfa/client/getNodes.py',
+            'sfa/client/getRecord.py',
+            'sfa/client/setRecord.py',
+            'sfa/client/genidump.py',
             ]
-package_dirs = [ 'geni', 
-                 'geni/util', 
-                 'geni/methods',
+package_dirs = [ 'sfa', 
+                 'sfa/client',
+                 'sfa/methods',
+                 'sfa/plc',
+                 'sfa/server',
+                 'sfa/trust',
+                 'sfa/util', 
                  ]
 data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml', 
                                'config/registries.xml', 
                                'config/sfa_config', 
                                'config/sfi_config',
                                ]),
-               ('/etc/init.d/', ['geni/init.d/sfa']),
+               ('/etc/init.d/', ['sfa/init.d/sfa']),
                ('/var/www/html/wsdl', [ 'wsdl/sfa.wsdl' ] ),
                ]
-symlinks = [ '/usr/share/geniwrapper' ]
-initscripts = [ '/etc/init.d/geni' ]
+symlinks = [ '/usr/share/sfa' ]
+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')]
+    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 = [ '/usr/bin/sfa-config-tty',
                      '/usr/bin/sfa-import-plc.py', 
-                     '/usr/bin/sfa-plc.py', 
+                     '/usr/bin/sfa-server.py', 
                      '/usr/bin/sfi.py', 
                      '/usr/bin/getNodes.py',
                      '/usr/bin/getRecord.py',
@@ -64,7 +68,7 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
 else:
     
     # avoid repeating what's in the specfile already
-    setup(name='geni',
+    setup(name='sfa',
           packages = package_dirs, 
           data_files = data_files,
           ext_modules = [],
@@ -74,7 +78,7 @@ else:
 
     # 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')]
+    site_packages_path = [ path + os.sep + 'sfa' 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]