bunch of cleanups & fixes all over the place

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index a429f6e..ef545cd 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -6,32 +6,48 @@ Installation script for the geniwrapper module
 
 import os, sys
 import shutil
-from distutils.core import setup, Extension
+from distutils.core import setup
 
-scripts = [ 'geni/gimport.py', 
-            'geni/plc.py', 
-            'config/geni-config-tty',
-            'cmdline/sfi.py', 
-            'cmdline/getNodes.py',
-            'cmdline/getRecord.py',
-            'cmdline/setRecord.py',
-            'cmdline/genidump.py',
+scripts = [ 'config/sfa-config-tty',
+            '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']
-data_files = [ ('/etc/geni/', ['config/aggregates.xml', 'config/registries.xml', 
-                               'config/geni_config', 'config/sfi_config']),
-               ('/etc/init.d/', ['geni/init.d/geni']),
-               ('/var/www/html/wsdl', [ 'wsdl/sfa.wsdl' ] ),
+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/', ['sfa/init.d/sfa']),
                ]
-symlinks = ['/usr/share/geniwrapper']
-initscripts = ['/etc/init.d/geni']
+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/geni/'] + site_packages_path
-    remove_files = ['/usr/bin/gimport.py', '/usr/bin/plc.py', '/usr/bin/sfi.py', '/usr/bin/geni-config-tty'] + \
-                    symlinks + initscripts
+    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-nuke-plc.py', 
+                     '/usr/bin/sfa-server.py', 
+                     '/usr/bin/sfi.py', 
+                     '/usr/bin/getNodes.py',
+                     '/usr/bin/getRecord.py',
+                     '/usr/bin/setRecord.py',
+                     '/usr/bin/genidump.py',
+                    ] + initscripts
     
     # remove files   
     for filepath in remove_files:
@@ -51,7 +67,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 = [],
@@ -59,19 +75,3 @@ else:
           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]
-
-    # 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)