X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=97309e3bc588c3a3d5bf0095c0ab2ff429c30b9c;hb=46d88522f413cd62c60b081b296634444564813e;hp=90f852a92bba885cf03a9c49025053e5823d4912;hpb=095175cc564520e0b53593343e61b85a38697b21;p=sfa.git

diff --git a/setup.py b/setup.py
index 90f852a9..97309e3b 100755
--- a/setup.py
+++ b/setup.py
@@ -4,80 +4,71 @@
 Installation script for the geniwrapper module
 """
 
-from distutils.core import setup, Extension
-import os, sys
+import sys, os, os.path
+import shutil
+from distutils.core import setup
 
-version = '0.2'
-scripts = ['geni/gimport.py', 'geni/plc.py', 'cmdline/sfi.py']
-package_dirs = ['geni', 'geni/util', 'geni/methods']
-data_files = [('/etc/geni/', ['geni/aggregates.xml', 'geni/registries.xml', 'geni/util/geni_config', 'cmdline/configSfi.sh'])]
+bins = [ 'config/sfa-config-tty',
+            'sfa/plc/sfa-import-plc.py', 
+            'sfa/plc/sfa-nuke-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',
+            ]
+remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in bins ]
 
-def list_dir(directory):
-    # list the files in this directory
-    try:
-        files = os.listdir(directory)
-        add_directory_path = lambda path: directory + os.sep + path
-        # add absolute path to files
-        files = map(add_directory_path, files)
-        # separate files from directories
-        files_only = lambda path: os.path.isfile(path)
-        directories_only = lambda path: os.path.isdir(path)
-        directories = filter(directories_only, files)
-        files = filter(files_only, files)
-        for d in directories:
-            try:
-                (fs, ds) = list_dir(d)
-                files.extend(fs)
-            except: 
-                print "Error listing", d
-        return (files, directories)
-    except:
-        return ([], [])
+package_dirs = [ 'sfa', 
+                 'sfa/client',
+                 'sfa/methods',
+                 'sfa/plc',
+                 'sfa/server',
+                 'sfa/trust',
+                 'sfa/util', 
+                 'sfa/rspecs',
+                 'sfa/rspecs/aggregates',
+                 'sfa/rspecs/aggregates/vini'
+                 ]
+data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml', 
+                               'config/registries.xml', 
+                               'config/sfa_config', 
+                               'config/sfi_config',
+                               ]),
+               ('/etc/init.d/', ['sfa/init.d/sfa']),
+               ]
+initscripts = [ '/etc/init.d/sfa' ]
         
-        
-if sys.argv[1] in ['uninstall', 'remove', 'delete']:
+if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     python_path = sys.path
-    site_packages_only = lambda path: path.endswith('site-packages') 
-    site_packages_path = filter(site_packages_only, python_path)
-    add_geni_path = lambda path: path + os.sep + 'geni'
-    site_packages_path = map(add_geni_path, site_packages_path) 
-    remove_dirs = ['/etc/geni/'] + site_packages_path
-    remove_files = ['/usr/bin/gimport.py', '/usr/bin/plc.py', '/usr/bin/sfi.py']
-    # update list of files/directories to remove
-    for directory in remove_dirs:
-        files, dirs = list_dir(directory)
-        remove_files.extend(list(set(files)))
-        remove_dirs.extend(dirs)
-        remove_dirs.reverse()
-
+    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
+    
     # remove files   
     for filepath in remove_files:
-        print "removing", filepath, " ... ",
+        print "removing", filepath, "...",
         try: 
             os.remove(filepath)
             print "success"
         except: print "failed"
     # remove directories 
     for directory in remove_dirs: 
-        print "removing", directory, " ... ",
+        print "removing", directory, "...",
         try: 
-            os.rmdir(directory)
+            shutil.rmtree(directory)
             print "success"
         except: print "failed"
  
 else:
-    setup(name='geniwrapper', 
-      version = version,
-      packages = package_dirs, 
-      data_files = data_files,
-      ext_modules = [],
-      py_modules = [],
-      scripts = scripts,   
-      url = 'http://svn.planet-lab.org/svn/geniwrapper/',
-      description = "Geni api",      
-      long_description = """\
-Geniwrapper implements the Geni interface which serves 
-as a layer between the existing PlanetLab interfaces 
-and the Geni API.
-                    """,
-      license = 'GPL')
+    
+    # avoid repeating what's in the specfile already
+    setup(name='sfa',
+          packages = package_dirs, 
+          data_files = data_files,
+          ext_modules = [],
+          py_modules = [],
+          scripts = bins,   
+          )
+