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

diff --git a/setup.py b/setup.py
index 90f852a9..ed2c7571 100755
--- a/setup.py
+++ b/setup.py
@@ -6,62 +6,38 @@ Installation script for the geniwrapper module
 
 from distutils.core import setup, Extension
 import os, sys
+import shutil
 
 version = '0.2'
-scripts = ['geni/gimport.py', 'geni/plc.py', 'cmdline/sfi.py']
+scripts = ['geni/gimport.py', 'geni/plc.py', 'cmdline/sfi.py', 'config/geni-config-tty']
 package_dirs = ['geni', 'geni/util', 'geni/methods']
-data_files = [('/etc/geni/', ['geni/aggregates.xml', 'geni/registries.xml', 'geni/util/geni_config', 'cmdline/configSfi.sh'])]
-
-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 ([], [])
-        
+data_files = [('/etc/geni/', ['config/aggregates.xml', 'config/registries.xml', 'config/geni_config', 'config/config_sfi']),
+              ('/etc/init.d/', ['geni/geniwrapper'])]
+symlinks = ['/usr/share/geniwrapper']
+initscripts = ['/etc/init.d/geniwrapper']
         
-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()
-
+    remove_files = ['/usr/bin/gimport.py', '/usr/bin/plc.py', '/usr/bin/sfi.py', '/usr/bin/geni-config-tty'] + \
+                    symlinks + 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"
  
@@ -74,10 +50,30 @@ else:
       py_modules = [],
       scripts = scripts,   
       url = 'http://svn.planet-lab.org/svn/geniwrapper/',
-      description = "Geni api",      
+      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')
+
+    # create symlink to geniwrapper source in /usr/share
+    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)
+    # python path usualy has /urs/local/lib/ path , filter this out
+    site_packages_path = filter(lambda x: 'local' not in x, site_packages_path) 
+
+    # 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)