# HG changeset patch # User Goffi # Date 1408898658 -7200 # Node ID e89bd3a26c86cd4784da50e8caca2655e9635703 # Parent 9ae01ccf89c1b8f68a079be8abc70e1fe3e25050 installation: setup.py update: - twisted plugin installation - author is now « association Salut à Toi » - author_email is now association's main contact address - changed url from http://www.salut-a-toi.org to http://salut-a-toi.org diff -r 9ae01ccf89c1 -r e89bd3a26c86 setup.py --- a/setup.py Sun Aug 24 18:44:17 2014 +0200 +++ b/setup.py Sun Aug 24 18:44:18 2014 +0200 @@ -29,6 +29,27 @@ from stat import ST_MODE import shutil +# seen here: http://stackoverflow.com/questions/7275295 +try: + from setuptools.command import egg_info + egg_info.write_toplevel_names +except (ImportError, AttributeError): + pass +else: + def _top_level_package(name): + return name.split('.', 1)[0] + + def _hacked_write_toplevel_names(cmd, basename, filename): + pkgs = dict.fromkeys( + [_top_level_package(k) + for k in cmd.distribution.iter_distribution_names() + if _top_level_package(k) != "twisted" + ] + ) + cmd.write_file("top-level names", filename, '\n'.join(pkgs) + '\n') + + egg_info.write_toplevel_names = _hacked_write_toplevel_names + NAME = 'sat' LAUNCH_DAEMON_COMMAND = 'sat' @@ -62,12 +83,9 @@ """Change options for twistd in the shell script Mainly change the paths""" sh_buffer = "" - run_dir = os.path.dirname(self.sh_script_path) with open(self.sh_script_path, 'r') as sh_file: for ori_line in sh_file: - if ori_line.startswith('TAP_PATH='): - dest_line = 'TAP_PATH="%s/"\n' % run_dir - elif ori_line.startswith('PYTHON='): + if ori_line.startswith('PYTHON='): dest_line = 'PYTHON="%s"\n' % sys.executable else: dest_line = ori_line @@ -224,9 +242,9 @@ version='0.4.1', description=u'Salut à Toi multi-frontend XMPP client', long_description=u'Salut à Toi (SàT) is a XMPP client based on a daemon/frontend architecture. Its multi-frontends (desktop, web, console interface, CLI, etc) and multi-purposes (instant messaging, microblogging, games, file sharing, etc).', - author='Goffi (Jérôme Poisson)', - author_email='goffi@goffi.org', - url='http://www.salut-a-toi.org', + author='Association « Salut à Toi »', + author_email='contact@goffi.org', + url='http://salut-a-toi.org', classifiers=['Development Status :: 3 - Alpha', 'Environment :: Console', 'Environment :: X11 Applications :: GTK', @@ -234,11 +252,11 @@ 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Operating System :: POSIX :: Linux', 'Topic :: Communications :: Chat'], - package_dir={'sat': 'src', 'sat_frontends': 'frontends/src'}, + package_dir={'sat': 'src', 'sat_frontends': 'frontends/src', 'twisted.plugins': 'src/twisted/plugins'}, packages=['sat', 'sat.tools', 'sat.bridge', 'sat.plugins', 'sat.test', 'sat.core', 'sat.memory', 'sat_frontends', 'sat_frontends.bridge', 'sat_frontends.quick_frontend', 'sat_frontends.jp', - 'sat_frontends.primitivus', 'sat_frontends.wix', 'sat_frontends.tools', 'sat.stdui'], - package_data={'sat': ['sat.tac', 'sat.sh'], + 'sat_frontends.primitivus', 'sat_frontends.wix', 'sat_frontends.tools', 'sat.stdui', 'twisted.plugins'], + package_data={'sat': ['sat.sh'], 'sat_frontends': ['wix/COPYING']}, data_files=[(os.path.join(sys.prefix, 'share/locale/fr/LC_MESSAGES'), ['i18n/fr/LC_MESSAGES/sat.mo']), ('share/doc/%s' % NAME, ['CHANGELOG', 'COPYING', 'INSTALL', 'README', 'README4TRANSLATORS']),