Fix some issues with the setup.py script:

1) Distutils doesn't like abs paths when creating source
   distributions (setup.py sdist). So use only relative
   paths.

2) Put an appropriate maintainer name and email, as
   well as a proper URL

Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
---
 cli/setup.py       | 53 ++++++++++++++++++++-----------
 client/setup.py    | 92 +++++++++++++++++++++++++++++++++--------------------
 database/setup.py  | 41 +++++++++++++++++-------
 frontend/setup.py  | 90 ++++++++++++++++++++++++++++++++--------------------
 mirror/setup.py    | 29 +++++++++++++----
 scheduler/setup.py | 44 ++++++++++++++++++--------
 server/setup.py    | 64 +++++++++++++++++++++++++------------
 setup.py           | 93 ++++++++++++++++++++++++++++++++++++++++++++++++------
 tko/setup.py       | 75 +++++++++++++++++++++++++------------------
 utils/setup.py     | 51 +++++++++++++++++++-----------
 10 files changed, 436 insertions(+), 196 deletions(-)

diff --git a/cli/setup.py b/cli/setup.py
index b0c3ebd..b5e00e7 100644
--- a/cli/setup.py
+++ b/cli/setup.py
@@ -1,5 +1,5 @@
 from distutils.core import setup
-import os, sys
+import os
 
 try:
     import autotest.common as common
@@ -9,27 +9,44 @@ except ImportError:
 from autotest.client.shared import version
 
 # Mostly needed when called one level up
-cli_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
-autotest_dir = os.path.abspath(os.path.join(cli_dir, ".."))
+if os.path.isdir('cli'):
+    cli_dir = 'cli'
+else:
+    cli_dir = '.'
+
+def get_package_dir():
+    return {'autotest.cli': cli_dir}
+
+
+def get_package_data():
+    return {'autotest.cli': ['contrib/*' ]}
+
+
+def get_packages():
+    return ['autotest.cli']
+
+
+def get_scripts():
+    return [cli_dir + '/autotest-rpc-client',
+            cli_dir + '/autotest-rpc-change-protection-level',
+            cli_dir + '/autotest-rpc-compose-query',
+            cli_dir + '/autotest-rpc-migrate-host',
+            cli_dir + '/autotest-rpc-query-keyvals',
+            cli_dir + '/autotest-rpc-query-results']
+
 
 def run():
     setup(name='autotest',
-          description='Autotest framework - cli interface to rpc server',
-          author='Autotest Team',
-          author_email='[email protected]',
+          description='Autotest framework - CLI interface to the RPC server',
+          maintainer='Lucas Meneghel Rodrigues',
+          maintainer_email='[email protected]',
           version=version.get_version(),
-          url='autotest.kernel.org',
-          package_dir={'autotest.cli': cli_dir },
-          package_data={'autotest.cli' : ['contrib/*' ] },
-          packages=['autotest.cli' ],
-          scripts=[cli_dir + '/autotest-rpc-client',
-                   cli_dir + '/autotest-rpc-change-protection-level',
-                   cli_dir + '/autotest-rpc-compose-query',
-                   cli_dir + '/autotest-rpc-migrate-host',
-                   cli_dir + '/autotest-rpc-query-keyvals',
-                   cli_dir + '/autotest-rpc-query-results',
-                  ],
-    )
+          url='http://autotest.github.com',
+          package_dir=get_package_dir(),
+          package_data=get_package_data(),
+          packages=get_packages(),
+          scripts=get_scripts())
+
 
 if __name__ == '__main__':
     run()
diff --git a/client/setup.py b/client/setup.py
index 050613e..a579584 100644
--- a/client/setup.py
+++ b/client/setup.py
@@ -1,5 +1,5 @@
 from distutils.core import setup
-import os, sys
+import os
 
 try:
     import autotest.common as common
@@ -9,10 +9,15 @@ except ImportError:
 from autotest.client.shared import version
 
 # Mostly needed when called one level up
-client_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
-autotest_dir = os.path.abspath(os.path.join(client_dir, ".."))
+if os.path.isdir('client'):
+    client_dir = 'client'
+else:
+    client_dir = '.'
 
-def get_data_files(path):
+autotest_dir = os.path.join(client_dir, "..")
+
+
+def _get_files(path):
     '''
     Given a path, return all the files in there to package
     '''
@@ -23,42 +28,59 @@ def get_data_files(path):
             flist.append(fullname)
     return flist
 
-pd_filelist=['config/*' ]
-pd_filelist.extend(get_data_files(os.path.join(client_dir, 'profilers')))
-pd_filelist.extend(get_data_files(os.path.join(client_dir, 'tests')))
-pd_filelist.extend(get_data_files(os.path.join(client_dir, 'tools')))
+
+def get_filelist():
+    pd_filelist=['config/*' ]
+    pd_filelist.extend(_get_files(os.path.join(client_dir, 'profilers')))
+    pd_filelist.extend(_get_files(os.path.join(client_dir, 'tests')))
+    pd_filelist.extend(_get_files(os.path.join(client_dir, 'tools')))
+    return pd_filelist
+
+
+def get_packages():
+    return ['autotest.client.shared',
+            'autotest.client.shared.hosts',
+            'autotest.client.shared.test_utils',
+            'autotest.client.net',
+            'autotest.client.tools',
+            'autotest.client.profilers',
+            'autotest.client',
+            'autotest']
+
+
+def get_scripts():
+    return [os.path.join(client_dir, 'autotest-local'),
+            os.path.join(client_dir, 'autotest-local-streamhandler'),
+            os.path.join(client_dir, 'autotest-daemon'),
+            os.path.join(client_dir, 'autotest-daemon-monitor')]
+
+
+def get_data_files():
+    return [('/etc/autotest', [autotest_dir + '/global_config.ini',
+                               autotest_dir + '/shadow_config.ini',]),]
+
+
+def get_package_dir():
+    return {'autotest.client': client_dir, 'autotest' : autotest_dir}
+
+
+def get_package_data():
+    return {'autotest.client' : get_filelist()}
+
 
 def run():
     setup(name='autotest',
           description='Autotest test framework - local module',
-          author='Autotest Team',
-          author_email='[email protected]',
+          maintainer='Lucas Meneghel Rodrigues',
+          author_email='[email protected]',
           version=version.get_version(),
-          url='autotest.kernel.org',
-          package_dir={'autotest.client': client_dir,
-                       'autotest' : autotest_dir,
-                      },
-          package_data={'autotest.client' : pd_filelist },
-          packages=['autotest.client.shared',
-                    'autotest.client.shared.hosts',
-                    'autotest.client.shared.test_utils',
-                    'autotest.client.net',
-                    'autotest.client.tools',
-                    'autotest.client.profilers',
-                    'autotest.client.tests',
-                    'autotest.client.site_tests',
-                    'autotest.client',
-                    'autotest',
-                   ],
-          scripts=[os.path.join(client_dir, 'autotest-local'),
-                   os.path.join(client_dir, 'autotest-local-streamhandler'),
-                   os.path.join(client_dir, 'autotest-daemon'),
-                   os.path.join(client_dir, 'autotest-daemon-monitor')],
-          data_files=[('/etc/autotest', [autotest_dir + '/global_config.ini',
-                                         autotest_dir + '/shadow_config.ini',
-                                       ]),
-                     ],
-    )
+          url='http://autotest.github.com',
+          package_dir=get_package_dir(),
+          package_data=get_package_data(),
+          packages= get_packages(),
+          scripts=get_scripts(),
+          data_files=get_data_files())
+
 
 if __name__ == '__main__':
     run()
diff --git a/database/setup.py b/database/setup.py
index dbe5fa3..ce4ce74 100644
--- a/database/setup.py
+++ b/database/setup.py
@@ -1,5 +1,5 @@
 from distutils.core import setup
-import os, sys
+import os
 
 try:
     import autotest.common as common
@@ -9,21 +9,40 @@ except ImportError:
 from autotest.client.shared import version
 
 # Mostly needed when called one level up
-db_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
-autotest_dir = os.path.abspath(os.path.join(db_dir, ".."))
+if os.path.isdir('database'):
+    db_dir = 'database'
+else:
+    db_dir = '.'
+
+
+def get_package_dir():
+    return {'autotest.database': db_dir}
+
+
+def get_package_data():
+    return {'autotest.database' : ['*.sql' ]}
+
+
+def get_packages():
+    return ['autotest.database']
+
+
+def get_scripts():
+    return [db_dir + '/autotest-upgrade-db']
+
 
 def run():
     setup(name='autotest',
           description='Autotest test framework - results database module',
-          author='Autotest Team',
-          author_email='[email protected]',
+          maintainer='Lucas Meneghel Rodrigues',
+          maintainer_email='[email protected]',
           version=version.get_version(),
-          url='autotest.kernel.org',
-          package_dir={'autotest.database': db_dir },
-          package_data={'autotest.database' : ['*.sql' ] },
-          packages=['autotest.database' ],
-          scripts=[db_dir + '/autotest-upgrade-db'],
-    )
+          url='http://autotest.github.com',
+          package_dir=get_package_dir(),
+          package_data=get_package_data(),
+          packages=get_packages(),
+          scripts=get_scripts())
+
 
 if __name__ == '__main__':
     run()
diff --git a/frontend/setup.py b/frontend/setup.py
index b89db7d..acd77c8 100644
--- a/frontend/setup.py
+++ b/frontend/setup.py
@@ -1,5 +1,5 @@
 from distutils.core import setup
-import os, sys
+import os
 
 try:
     import autotest.common as common
@@ -9,10 +9,13 @@ except ImportError:
 from autotest.client.shared import version
 
 # Mostly needed when called one level up
-fe_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
+if os.path.isdir('frontend'):
+    fe_dir = 'frontend'
+else:
+    fe_dir = '.'
 
 # TODO: handle the client directory
-def get_data_files(path):
+def _get_files(path):
     '''
     Given a path, return all the files in there to package
     '''
@@ -23,41 +26,60 @@ def get_data_files(path):
             flist.append(fullname)
     return flist
 
-# Some stuff is too hard to package. just grab every file in these directories
-# and call it a day.  we can clean up some other time
-pd_filelist=[]
-pd_filelist.extend(get_data_files(os.path.join(fe_dir, 'client')))
-pd_filelist.extend(get_data_files(os.path.join(fe_dir, 'afe', 'doctests')))
-pd_filelist.extend(get_data_files(os.path.join(fe_dir, 'afe', 'fixtures')))
-pd_filelist.extend(get_data_files(os.path.join(fe_dir, 'afe', 'templates')))
-pd_filelist.extend(get_data_files(os.path.join(fe_dir, 'static')))
-pd_filelist.extend(get_data_files(os.path.join(fe_dir, 'templates')))
-pd_filelist.extend(get_data_files(os.path.join(fe_dir, 'tko', 'preconfigs')))
-pd_filelist.extend([os.path.join(fe_dir, 'frontend.wsgi')])
+
+def get_file_list():
+    # Some stuff is too hard to package. just grab every file in these 
directories
+    # and call it a day.  we can clean up some other time
+    pd_filelist=[]
+    pd_filelist.extend(_get_files(os.path.join(fe_dir, 'client')))
+    pd_filelist.extend(_get_files(os.path.join(fe_dir, 'afe', 'doctests')))
+    pd_filelist.extend(_get_files(os.path.join(fe_dir, 'afe', 'fixtures')))
+    pd_filelist.extend(_get_files(os.path.join(fe_dir, 'afe', 'templates')))
+    pd_filelist.extend(_get_files(os.path.join(fe_dir, 'static')))
+    pd_filelist.extend(_get_files(os.path.join(fe_dir, 'templates')))
+    pd_filelist.extend(_get_files(os.path.join(fe_dir, 'tko', 'preconfigs')))
+    pd_filelist.extend([os.path.join(fe_dir, 'frontend.wsgi')])
+    return pd_filelist
+
+
+def get_package_dir():
+    return {'autotest.frontend': fe_dir}
+
+
+def get_package_data():
+    return {'autotest.frontend' : get_file_list()}
+
+
+def get_scripts():
+    return [os.path.join(fe_dir, 'autotest-manage-rpc-server')]
+
+
+def get_packages():
+    return ['autotest.frontend.afe',
+            'autotest.frontend.afe.feeds',
+            'autotest.frontend.afe.json_rpc',
+            'autotest.frontend.db',
+            'autotest.frontend.db.backends',
+            'autotest.frontend.db.backends.afe',
+            'autotest.frontend.db.backends.afe_sqlite',
+            'autotest.frontend.migrations',
+            'autotest.frontend.shared',
+            'autotest.frontend.tko',
+            'autotest.frontend']
+
 
 def run():
     setup(name='autotest',
-          description='Autotest test framework - rpc server',
-          author='Autotest Team',
-          author_email='[email protected]',
+          description='Autotest test framework - RPC server',
+          maintainer='Lucas Meneghel Rodrigues',
+          author_email='[email protected]',
           version=version.get_version(),
-          url='autotest.kernel.org',
-          package_dir={'autotest.frontend': fe_dir },
-          package_data={'autotest.frontend' : pd_filelist },
-          packages=['autotest.frontend.afe',
-                    'autotest.frontend.afe.feeds',
-                    'autotest.frontend.afe.json_rpc',
-                    'autotest.frontend.db',
-                    'autotest.frontend.db.backends',
-                    'autotest.frontend.db.backends.afe',
-                    'autotest.frontend.db.backends.afe_sqlite',
-                    'autotest.frontend.migrations',
-                    'autotest.frontend.shared',
-                    'autotest.frontend.tko',
-                    'autotest.frontend',
-                   ],
-          scripts=[os.path.join(fe_dir, 'autotest-manage-rpc-server')],
-    )
+          url='http://autotest.github.com',
+          package_dir=get_package_dir(),
+          package_data=get_package_data(),
+          packages=get_packages(),
+          scripts=get_scripts())
+
 
 if __name__ == '__main__':
     run()
diff --git a/mirror/setup.py b/mirror/setup.py
index f21c197..f8b29c7 100644
--- a/mirror/setup.py
+++ b/mirror/setup.py
@@ -1,5 +1,5 @@
 from distutils.core import setup
-import os, sys
+import os
 
 try:
     import autotest.common as common
@@ -9,8 +9,23 @@ except ImportError:
 from autotest.client.shared import version
 
 # Mostly needed when called one level up
-mirror_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
-autotest_dir = os.path.abspath(os.path.join(mirror_dir, ".."))
+if os.path.isdir('mirror'):
+    mirror_dir = 'mirror'
+else:
+    mirror_dir = '.'
+
+
+def get_package_dir():
+    return {'autotest.mirror': mirror_dir}
+
+
+def get_packages():
+    return ['autotest.mirror']
+
+
+def get_data_files():
+    return [('share/autotest/mirror', [ mirror_dir + '/mirror' ])]
+
 
 def run():
     setup(name='autotest',
@@ -19,10 +34,10 @@ def run():
           author_email='[email protected]',
           version=version.get_version(),
           url='autotest.kernel.org',
-          package_dir={'autotest.mirror': mirror_dir },
-          packages=['autotest.mirror' ],
-          data_files=[('share/autotest/mirror', [ mirror_dir + '/mirror' ])],
-    )
+          package_dir=get_package_dir(),
+          packages=get_packages(),
+          data_files=get_data_files())
+
 
 if __name__ == '__main__':
     run()
diff --git a/scheduler/setup.py b/scheduler/setup.py
index 548e702..e147f1f 100644
--- a/scheduler/setup.py
+++ b/scheduler/setup.py
@@ -1,5 +1,5 @@
 from distutils.core import setup
-import os, sys
+import os
 
 try:
     import autotest.common as common
@@ -9,23 +9,41 @@ except ImportError:
 from autotest.client.shared import version
 
 #mostly needed when called one level up
-scheduler_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
-autotest_dir = os.path.abspath(os.path.join(scheduler_dir, ".."))
+if os.path.isdir('scheduler'):
+    scheduler_dir = 'scheduler'
+else:
+    scheduler_dir = '.'
+
+
+def get_package_dir():
+    return {'autotest.scheduler': scheduler_dir}
+
+
+def get_package_data():
+    return {'autotest.scheduler': ['archive_results.control.srv']}
+
+
+def get_packages():
+    return ['autotest.scheduler']
+
+
+def get_scripts():
+    return [scheduler_dir + '/autotest-scheduler',
+            scheduler_dir + '/autotest-scheduler-watcher']
+
 
 def run():
     setup(name='autotest',
           description='Autotest testing framework - scheduler module',
-          author='Autotest Team',
-          author_email='[email protected]',
+          maintainer='Lucas Meneghel Rodrigues',
+          maintainer_email='[email protected]',
           version=version.get_version(),
-          url='autotest.kernel.org',
-          package_dir={'autotest.scheduler': scheduler_dir },
-          package_data={'autotest.scheduler': ['archive_results.control.srv']},
-          packages=['autotest.scheduler' ],
-          scripts=[scheduler_dir + '/autotest-scheduler',
-                   scheduler_dir + '/autotest-scheduler-watcher',
-                   ],
-    )
+          url='http://autotest.github.com',
+          package_dir=get_package_dir(),
+          package_data=get_package_data(),
+          packages=get_packages(),
+          scripts=get_scripts())
+
 
 if __name__ == "__main__":
     run()
diff --git a/server/setup.py b/server/setup.py
index 57adf9e..a18419e 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -1,5 +1,5 @@
 from distutils.core import setup
-import os, sys
+import os
 
 try:
     import autotest.common as common
@@ -9,9 +9,13 @@ except ImportError:
 from autotest.client.shared import version
 
 # Mostly needed when called one level up
-server_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
+if os.path.isdir('server'):
+    server_dir = 'server'
+else:
+    server_dir = '.'
 
-def get_data_files(path):
+
+def _get_files(path):
     '''
     Given a path, return all the files in there to package
     '''
@@ -22,29 +26,47 @@ def get_data_files(path):
             flist.append(fullname)
     return flist
 
-# Some stuff is too hard to package. just grab every file in these directories
-# and call it a day.  we can clean up some other time
-pd_filelist=[]
-pd_filelist.extend(get_data_files(os.path.join(server_dir, 
'control_segments')))
-pd_filelist.extend(get_data_files(os.path.join(server_dir, 'hosts', 
'monitors')))
-pd_filelist.extend(get_data_files(os.path.join(server_dir, 'tests')))
+
+def get_file_list():
+    # Some stuff is too hard to package. just grab every file in these 
directories
+    # and call it a day.  we can clean up some other time
+    pd_filelist=[]
+    pd_filelist.extend(_get_files(os.path.join(server_dir, 
'control_segments')))
+    pd_filelist.extend(_get_files(os.path.join(server_dir, 'hosts', 
'monitors')))
+    pd_filelist.extend(_get_files(os.path.join(server_dir, 'tests')))
+    return pd_filelist
+
+
+def get_package_dir():
+    return {'autotest.server': server_dir}
+
+
+def get_package_data():
+    return {'autotest.server' : get_file_list()}
+
+
+def get_packages():
+    return ['autotest.server.hosts',
+            'autotest.server.hosts.monitors',
+            'autotest.server']
+
+
+def get_scripts():
+    return [server_dir + '/autotest-remote']
+
 
 def run():
     setup(name='autotest',
           description='Autotest testing framework - remote module',
-          author='Autotest Team',
-          author_email='[email protected]',
+          maintainer='Lucas Meneghel Rodrigues',
+          author_email='[email protected]',
           version=version.get_version(),
-          url='autotest.kernel.org',
-          package_dir={'autotest.server': server_dir },
-          package_data={'autotest.server' : pd_filelist },
-          packages=['autotest.server.hosts',
-                    'autotest.server.hosts.monitors',
-                    'autotest.server',
-                    ],
-          scripts=[server_dir + '/autotest-remote',
-                   ],
-    )
+          url='http://autotest.github.com',
+          package_dir=get_package_dir(),
+          package_data=get_package_data(),
+          packages=get_packages(),
+          scripts=get_scripts())
+
 
 if __name__ == '__main__':
     run()
diff --git a/setup.py b/setup.py
index a8f3a61..c84b71a 100644
--- a/setup.py
+++ b/setup.py
@@ -9,13 +9,88 @@ import tko.setup
 import utils.setup
 import mirror.setup
 
+from distutils.core import setup
+
+try:
+    import autotest.common as common
+except ImportError:
+    import common
+
+from autotest.client.shared import version
+
+def _combine_dicts(list_dicts):
+    result_dict = {}
+    for d in list_dicts:
+        for k in d:
+            result_dict[k] = d[k]
+    return result_dict
+
+
+def get_package_dir():
+    return _combine_dicts([client.setup.get_package_dir(),
+                          frontend.setup.get_package_dir(),
+                          cli.setup.get_package_dir(),
+                          server.setup.get_package_dir(),
+                          scheduler.setup.get_package_dir(),
+                          database.setup.get_package_dir(),
+                          tko.setup.get_package_dir(),
+                          utils.setup.get_package_dir(),
+                          mirror.setup.get_package_dir()])
+
+
+def get_packages():
+    return (client.setup.get_packages() +
+            frontend.setup.get_packages() +
+            cli.setup.get_packages() +
+            server.setup.get_packages() +
+            scheduler.setup.get_packages() +
+            database.setup.get_packages() +
+            tko.setup.get_packages() +
+            utils.setup.get_packages() +
+            mirror.setup.get_packages())
+
+
+def get_data_files():
+    return (client.setup.get_data_files() +
+            tko.setup.get_data_files() +
+            utils.setup.get_data_files() +
+            mirror.setup.get_data_files())
+
+
+def get_package_data():
+    return _combine_dicts([client.setup.get_package_data(),
+                           frontend.setup.get_package_data(),
+                           cli.setup.get_package_data(),
+                           server.setup.get_package_data(),
+                           scheduler.setup.get_package_data(),
+                           database.setup.get_package_data(),
+                           tko.setup.get_package_data(),
+                           utils.setup.get_package_data()])
+
+
+def get_scripts():
+    return (client.setup.get_scripts() +
+            frontend.setup.get_scripts() +
+            cli.setup.get_scripts() +
+            server.setup.get_scripts() +
+            scheduler.setup.get_scripts() +
+            database.setup.get_scripts() +
+            tko.setup.get_scripts())
+
+
+def run():
+    setup(name='autotest',
+          description='Autotest test framework',
+          maintainer='Lucas Meneghel Rodrigues',
+          maintainer_email='[email protected]',
+          version=version.get_version(),
+          url='http://autotest.github.com',
+          package_dir=get_package_dir(),
+          package_data=get_package_data(),
+          packages= get_packages(),
+          scripts=get_scripts(),
+          data_files=get_data_files())
+
+
 if __name__ == '__main__':
-    client.setup.run()
-    frontend.setup.run()
-    cli.setup.run()
-    server.setup.run()
-    scheduler.setup.run()
-    database.setup.run()
-    tko.setup.run()
-    utils.setup.run()
-    mirror.setup.run()
+    run()
\ No newline at end of file
diff --git a/tko/setup.py b/tko/setup.py
index 3789e69..62e4784 100644
--- a/tko/setup.py
+++ b/tko/setup.py
@@ -1,6 +1,5 @@
 from distutils.core import setup
-from glob import glob
-import os, sys
+import os
 
 try:
     import autotest.common as common
@@ -10,40 +9,56 @@ except ImportError:
 from autotest.client.shared import version
 
 # Mostly needed when called one level up
-tko_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
+if os.path.isdir('tko'):
+    tko_dir = 'tko'
+else:
+    tko_dir = '.'
 
 # TODO: add some toplevel non-python files
 
+def get_package_dir():
+    return {'autotest.tko': tko_dir}
+
+
+def get_package_data():
+    return {'autotest.tko' : ['*.cgi']}
+
+
+def get_packages():
+    return ['autotest.tko.migrations',
+            'autotest.tko.parsers',
+            'autotest.tko.parsers.test',
+            'autotest.tko.parsers.test.templates',
+            'autotest.tko']
+
+def get_data_files():
+    return [('share/autotest/tko', [tko_dir + '/blank.gif',
+                                    tko_dir + '/draw_graphs',
+                                    tko_dir + '/machine_load',
+                                    tko_dir + '/parse',
+                                    tko_dir + '/plotgraph',
+                                    tko_dir + '/retrieve_jobs',
+                                    tko_dir + '/tko.proto'])]
+
+
+def get_scripts():
+    return [tko_dir + '/autotest-db-delete-job',
+            tko_dir + '/autotest-tko-parse']
+
+
 def run():
     setup(name='autotest',
-          description='Autotest testing framework - tko module',
-          author='Autotest Team',
-          author_email='[email protected]',
+          description='Autotest testing framework - TKO module',
+          maintainer='Lucas Meneghel Rodrigues',
+          maintainer_email='[email protected]',
           version=version.get_version(),
-          url='autotest.kernel.org',
-          package_dir={'autotest.tko': tko_dir },
-          package_data={'autotest.tko' : ['*.cgi',
-                                         ],
-                       },
-          packages=['autotest.tko.migrations',
-                    'autotest.tko.parsers',
-                    'autotest.tko.parsers.test',
-                    'autotest.tko.parsers.test.templates',
-                    'autotest.tko',
-                   ],
-          data_files=[('share/autotest/tko', [ tko_dir + '/blank.gif',
-                                               tko_dir + '/draw_graphs',
-                                               tko_dir + '/machine_load',
-                                               tko_dir + '/parse',
-                                               tko_dir + '/plotgraph',
-                                               tko_dir + '/retrieve_jobs',
-                                               tko_dir + '/tko.proto',
-                                             ]),
-                     ],
-          scripts=[tko_dir + '/autotest-db-delete-job',
-                   tko_dir + '/autotest-tko-parse',
-                   ],
-    )
+          url='http://autotest.github.com',
+          package_dir=get_package_dir(),
+          package_data=get_package_data(),
+          packages=get_packages(),
+          data_files=get_data_files(),
+          scripts=get_scripts())
+
 
 if __name__ == '__main__':
     run()
diff --git a/utils/setup.py b/utils/setup.py
index ca59f31..8cb886d 100644
--- a/utils/setup.py
+++ b/utils/setup.py
@@ -1,5 +1,5 @@
 from distutils.core import setup
-import os, sys
+import os
 
 try:
     import autotest.common as common
@@ -9,30 +9,45 @@ except ImportError:
 from autotest.client.shared import version
 
 # Mostly needed when called one level up
-utils_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'
+if os.path.isdir('utils'):
+    utils_dir = 'utils'
+else:
+    utils_dir = '.'
 
 # TODO handle the init scripts
 
+
+def get_package_dir():
+    return {'autotest.utils': utils_dir}
+
+
+def get_package_data():
+    return {'autotest.utils' : ['named_semaphore/*', 'modelviz/*']}
+
+
+def get_packages():
+    return ['autotest.utils']
+
+
+def get_data_files():
+    return [('share/autotest/utils', [ utils_dir + '/autotestd.service',
+                                       utils_dir + '/autotest.init',
+                                       utils_dir + '/autotest-rh.init',
+                                       utils_dir + '/release'])]
+
+
 def run():
     setup(name='autotest',
           description='Autotest testing framework - utility scripts',
-          author='Autotest Team',
-          author_email='[email protected]',
+          maintainer='Lucas Meneghel Rodrigues',
+          maintainer_email='[email protected]',
           version=version.get_version(),
-          url='autotest.kernel.org',
-          package_dir={'autotest.utils': utils_dir },
-          package_data={'autotest.utils' : ['named_semaphore/*',
-                                            'modelviz/*',
-                                           ],
-                       },
-          packages=['autotest.utils'],
-          data_files=[('share/autotest/utils', [ utils_dir + 
'/autotestd.service',
-                                                 utils_dir + '/autotest.init',
-                                                 utils_dir + 
'/autotest-rh.init',
-                                                 utils_dir + '/release'
-                                               ])
-                     ],
-    )
+          url='http://autotest.github.com',
+          package_dir=get_package_dir(),
+          package_data=get_package_data(),
+          packages=get_packages(),
+          data_files=get_data_files())
+
 
 if __name__ == '__main__':
     run()
-- 
1.8.0

_______________________________________________
Autotest-kernel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/autotest-kernel

Reply via email to