Merge branch 'master' of git://git.onelab.eu/sfa into upmc

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index 4c20cee..77e6658 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,13 +9,11 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-scripts = glob("sfa/clientbin/*.py") + \
+scripts = glob("clientbin/*.py") + \
     [ 
     'config/sfa-config-tty',
+    'config/sfa-config',
     'config/gen-sfa-cm-config.py',
-    'sfa/importer/sfa-import.py', 
-    'sfa/importer/sfa-nuke.py', 
-    'sfa/server/sfa-ca.py', 
     'sfa/server/sfa-start.py', 
     'sfa/server/sfa_component_setup.py', 
     'sfatables/sfatables',
@@ -25,27 +23,30 @@ scripts = glob("sfa/clientbin/*.py") + \
 
 packages = [
     'sfa', 
-    'sfa/openstack',
     '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/versions',
+    'sfa/client',
+    'sfa/planetlab',
+    'sfa/nitos',
+    'sfa/dummy',
+    'sfa/openstack',
+    'sfa/federica',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
     ]
 
-initscripts = [ 'sfa', 'sfa-cm' ]
+initscripts = [ 'functions', 'sfa', 'sfa-cm' ]
 
 data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',