Mercurial > libervia-web

changeset 513:ecec2cc13b33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
installation: setup.py update: - removed DAEMON option change when installing libervia - fixed docstring used for a comment - changed author/author_email for SàT association
author Goffi <goffi@goffi.org>
date Sun, 24 Aug 2014 18:43:45 +0200
parents 750db9ff8525
children 530c88c1deee
files setup.py
diffstat 1 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Sun Aug 24 18:43:45 2014 +0200
+++ b/setup.py	Sun Aug 24 18:43:45 2014 +0200
@@ -85,10 +85,8 @@
         sh_buffer = ""
         with open(self.sh_script_path, 'r') as sh_file:
             for ori_line in sh_file:
-                if ori_line.startswith('DAEMON='):
-                    dest_line = 'DAEMON=""\n'  # we want to launch libervia as a daemon
-                elif ori_line.startswith('DATA_DIR='):
-                    dest_line = 'DATA_DIR="%s"\n' % self.install_data_dir
+                if ori_line.startswith('PLUGIN_OPTIONS='):
+                    dest_line = 'PLUGIN_OPTIONS="-d %s"\n' % self.install_data_dir
                 elif ori_line.startswith('PYTHON='):
                     dest_line = 'PYTHON="%s"\n' % sys.executable
                 else:
@@ -120,12 +118,12 @@
         return result
 
     def copy_data_files(self):
-        """To copy the JS files couldn't be done with the data_files parameter
-        of setuptools.setup because all the files to be copied must exist before
-        the call. Also, we need the value of self.install_lib to build the JS
-        files (it's not easily predictable as it may vary from one system to
-        another), so we can't call pyjsbuild before setuptools.setup.
-        """
+        # XXX: To copy the JS files couldn't be done with the data_files parameter
+        # of setuptools.setup because all the files to be copied must exist before
+        # the call. Also, we need the value of self.install_lib to build the JS
+        # files (it's not easily predictable as it may vary from one system to
+        # another), so we can't call pyjsbuild before setuptools.setup.
+
         html = os.path.join(self.install_data_dir, C.HTML_DIR)
         if os.path.isdir(html):
             shutil.rmtree(html, ignore_errors=True)
@@ -270,8 +268,8 @@
       version='0.4.0',
       description=u'Web frontend for Salut à Toi',
       long_description=u'Libervia is a web frontend for Salut à Toi (SàT), a multi-frontends and multi-purposes XMPP client.',
-      author='Goffi (Jérôme Poisson)',
-      author_email='goffi@goffi.org',
+      author='Association « Salut à Toi »',
+      author_email='contact@goffi.org',
       url='http://www.salut-a-toi.org',
       classifiers=['Development Status :: 3 - Alpha',
                    'Environment :: Web Environment',