X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=4bd45834bc3377537514690e3d36a2125758a86c;hb=5af967b32b6ebbbc6a3ce439144eb0d69be5aece;hp=65d4fed95e632a3bea3724704e6c18d7672b6376;hpb=5f5f29e2bc00befe5b7b601806ef5a7e44349b75;p=sfa.git

diff --git a/setup.py b/setup.py
index 65d4fed9..4bd45834 100755
--- a/setup.py
+++ b/setup.py
@@ -4,44 +4,43 @@
 Installation script for the sfa module
 """
 
+# as fas as pushing onto pypi, I have been using this page
+# http://peterdowns.com/posts/first-time-with-pypi.html
+# for setting up the whole business
+
 import sys, os, os.path
 from glob import glob
 import shutil
 from distutils.core import setup
 
-from sfa.util.version import version_tag
+# while cleaning up we might not have this..
+try:
+    from sfa.util.version import version_tag
+except:
+    version_tag='cleaningup'
 
 scripts = glob("clientbin/*.py") + \
-    [ 
+    [
     'config/sfa-config-tty',
     'config/sfa-config',
 #    'config/gen-sfa-cm-config.py',
-    'sfa/server/sfa-start.py', 
-#    'sfa/server/sfa_component_setup.py', 
+    'sfa/server/sfa-start.py',
+#    'sfa/server/sfa_component_setup.py',
     'sfatables/sfatables',
     'keyconvert/keyconvert.py',
     'flashpolicy/sfa_flashpolicy.py',
     ]
 
 packages = [
-    'sfa', 
+    'sfa',
     'sfa/trust',
     'sfa/storage',
-    'sfa/util', 
+    'sfa/util',
     'sfa/server',
     'sfa/methods',
     'sfa/generic',
     'sfa/managers',
     'sfa/importer',
-
-
-
-    'sfa/senslab',
-
-
-
-
-
     'sfa/rspecs',
     'sfa/rspecs/elements',
     'sfa/rspecs/elements/versions',
@@ -52,6 +51,8 @@ packages = [
     'sfa/dummy',
     'sfa/openstack',
     'sfa/federica',
+    'sfa/iotlab',
+    'sfa/cortexlab',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
@@ -63,6 +64,7 @@ if not os.path.isfile('/etc/redhat-release'): initscripts.append('functions.sfa'
 data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
                               'config/default_config.xml',
+                              'config/api_versions.xml',
                               'config/sfi_config',
                               'config/topology',
                               'sfa/managers/pl/pl.rng',
@@ -98,28 +100,31 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in scripts ]
     remove_files = remove_bins + [ "/etc/init.d/%s"%x for x in initscripts ]
 
-    # remove files   
+    # remove files
     for filepath in remove_files:
         print "removing", filepath, "...",
-        try: 
+        try:
             os.remove(filepath)
             print "success"
         except: print "failed"
-    # remove directories 
-    for directory in remove_dirs: 
+    # remove directories
+    for directory in remove_dirs:
         print "removing", directory, "...",
-        try: 
+        try:
             shutil.rmtree(directory)
             print "success"
         except: print "failed"
 else:
     # avoid repeating what's in the specfile already
     setup(name='sfa',
-          packages = packages, 
+          packages = packages,
           data_files = data_files,
-          scripts = scripts,
+          version=version_tag,
+          keywords = ['federation','testbeds','SFA','SfaWrap'],
           url="http://svn.planet-lab.org/wiki/SFATutorial",
           author="Thierry Parmentelat, Tony Mack, Scott Baker",
           author_email="thierry.parmentelat@inria.fr, tmack@princeton.cs.edu, smbaker@gmail.com",
-          version=version_tag)
+          download_url = "http://build.onelab.eu/sfa/{v}/sfa-{v}.tar.gz".format(v=version_tag),
+          scripts = scripts,
+)