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

diff --git a/setup.py b/setup.py
index b63cffe2..6af937b5 100755
--- a/setup.py
+++ b/setup.py
@@ -4,27 +4,47 @@
 Installation script for the geniwrapper module
 """
 
-from distutils.core import setup, Extension
 import os, sys
 import shutil
+from distutils.core import setup
 
-version = '0.2'
-scripts = ['geni/gimport.py', 'geni/plc.py', 'cmdline/sfi.py', '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']),
-              ('/etc/init.d/', ['geni/geniwrapper'])]
-symlinks = ['/usr/share/geniwrapper']
-initscripts = ['/etc/init.d/geniwrapper']
+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',
+            ]
+package_dirs = [ 'geni', 
+                 'geni/util', 
+                 'geni/methods',
+                 ]
+data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml', 
+                               'config/registries.xml', 
+                               'config/sfa_config', 
+                               'config/sfi_config',
+                               ]),
+               ('/etc/init.d/', ['geni/init.d/sfa']),
+               ('/var/www/html/wsdl', [ 'wsdl/sfa.wsdl' ] ),
+               ]
+symlinks = [ '/usr/share/geniwrapper' ]
+initscripts = [ '/etc/init.d/geni' ]
         
 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', '/usr/bin/geni-config-tty'] + \
-                    symlinks + initscripts
+    site_packages_path = [ path + os.sep + 'geni' 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/sfi.py', 
+                     '/usr/bin/getNodes.py',
+                     '/usr/bin/getRecord.py',
+                     '/usr/bin/setRecord.py',
+                     '/usr/bin/genidump.py',
+                    ] + symlinks + initscripts
     
     # remove files   
     for filepath in remove_files:
@@ -42,30 +62,21 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
         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='geni',
+          packages = package_dirs, 
+          data_files = data_files,
+          ext_modules = [],
+          py_modules = [],
+          scripts = scripts,   
+          )
 
     # 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) 
+    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