X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=8ce7dbaebc659e6e91e00244048d671ef03d494d;hb=1cc8e9613cab8b5b22478de369f259e591c54e6d;hp=47a131403413ebed7bdeea0d092c3e880240fece;hpb=fe253f25bf3ec2a34edbd9ebee7783c3a0bbddd4;p=sfa.git

diff --git a/setup.py b/setup.py
index 47a13140..8ce7dbae 100755
--- a/setup.py
+++ b/setup.py
@@ -9,57 +9,54 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-bins = [ 
+from sfa.util.version import version_tag
+
+scripts = glob("clientbin/*.py") + \
+    [ 
     'config/sfa-config-tty',
-    'config/gen-sfa-cm-config.py',
-    'sfa/importer/sfa-import-plc.py', 
-    'sfa/importer/sfa-nuke-plc.py', 
-    'sfa/server/sfa-ca.py', 
+    'config/sfa-config',
+#    'config/gen-sfa-cm-config.py',
     'sfa/server/sfa-start.py', 
-    'sfa/server/sfa-clean-peer-records.py', 
-    'sfa/server/sfa_component_setup.py', 
-    'sfa/client/sfi.py', 
-    'sfa/client/getNodes.py',
-    'sfa/client/getRecord.py',
-    'sfa/client/setRecord.py',
-    'sfa/client/sfadump.py',
-    'sfa/client/sfiListNodes.py',
-    'sfa/client/sfiListSlivers.py',
-    'sfa/client/sfiAddSliver.py',
-    'sfa/client/sfiDeleteSliver.py',
-    'sfa/client/sfiAddAttribute.py',
-    'sfa/client/sfiDeleteAttribute.py',
+#    'sfa/server/sfa_component_setup.py', 
     'sfatables/sfatables',
     'keyconvert/keyconvert.py',
     'flashpolicy/sfa_flashpolicy.py',
     ]
 
-package_dirs = [
+packages = [
     'sfa', 
     'sfa/trust',
+    'sfa/storage',
     'sfa/util', 
-    'sfa/client',
     'sfa/server',
     'sfa/methods',
     'sfa/generic',
     'sfa/managers',
     'sfa/importer',
-    'sfa/plc',
     'sfa/rspecs',
     'sfa/rspecs/elements',
     'sfa/rspecs/elements/versions',
+    'sfa/rspecs/elements/v3',
     'sfa/rspecs/versions',
+    'sfa/client',
+    'sfa/planetlab',
+    'sfa/nitos',
+    'sfa/dummy',
+    'sfa/openstack',
+    'sfa/federica',
+    'sfa/senslab',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
     ]
 
+initscripts = [ 'sfa' ]
+if not os.path.isfile('/etc/redhat-release'): initscripts.append('functions.sfa')
 
-initscripts = [ 'sfa', 'sfa-cm' ]
-
-data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
+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',
@@ -70,9 +67,13 @@ data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                               'sfa/trust/protogeni-rspec-common.xsd',
                               'flashpolicy/sfa_flashpolicy_config.xml',
                             ]),
-              ('/etc/sfatables/matches/', glob('sfatables/matches/*.xml')),
-              ('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),
-              ('/etc/init.d/', [ "sfa/init.d/%s"%x for x in initscripts ])]
+               ('/etc/sfatables/matches/', glob('sfatables/matches/*.xml')),
+               ('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),
+               ('/etc/init.d/', [ "init.d/%s"%x for x in initscripts ]),
+               ('/usr/share/sfa/migrations', glob('sfa/storage/migrations/*.*') ),
+               ('/usr/share/sfa/migrations/versions', glob('sfa/storage/migrations/versions/*') ),
+               ('/usr/share/sfa/examples/', glob('sfa/examples/*' ) + [ 'cron.d/sfa.cron' ] ),
+              ]
 
 # add sfatables processors as data_files
 processor_files = [f for f in glob('sfatables/processors/*') if os.path.isfile(f)]
@@ -88,7 +89,7 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     site_packages_path = [ os.path.join(p,'sfa') for p in python_path if p.endswith('site-packages')]
     site_packages_path += [ os.path.join(p,'sfatables') for p in python_path if p.endswith('site-packages')]
     remove_dirs = ['/etc/sfa/', '/etc/sfatables'] + site_packages_path
-    remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in bins ]
+    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   
@@ -108,9 +109,11 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
 else:
     # avoid repeating what's in the specfile already
     setup(name='sfa',
-          packages = package_dirs, 
+          packages = packages, 
           data_files = data_files,
-          ext_modules = [],
-          py_modules = [],
-          scripts = bins)
+          scripts = scripts,
+          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)