Mercurial > libervia-backend

changeset 349:3ec237e82aed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setup.py update: - version number updated - install now check environment variable "SAT_INSTALL" with commas-separated options. if nopreinstall is in it, pre-installation will be skipped - "à" removed in SàT commit user for hg patch, to avoid non-ascii char issue
author Goffi <goffi@goffi.org>
date Mon, 30 May 2011 19:05:08 +0200
parents 8ff113e2abcb
children abe08fcb42d7
files setup.py
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Mon May 30 16:16:46 2011 +0200
+++ b/setup.py	Mon May 30 19:05:08 2011 +0200
@@ -92,7 +92,7 @@
                         'cd wokkel',
                         '%s pull -f http://hg.ik.nu/ralphm/wokkel-muc-client-support-24-2  -r 1b19c49d30c2' % hg_path,
                         '%s merge wokkel-muc-client-support-24' % hg_path,
-                        '%s commit -u "SàT installation script" -m "Merged wokkel\'s MUC branch"' % hg_path,
+                        '%s commit -u "SaT installation script" -m "Merged wokkel\'s MUC branch"' % hg_path,
                         '%s setup.py %s' % (sys.executable, ' '.join(sys.argv[1:]))]  #XXX: we use the same arguments as for this setup.py
             for command in commands:
                 if command.startswith('cd '):
@@ -117,6 +117,7 @@
     def run(self):
         install.run(self)
         sys.stdout.write ('running post installation stuff\n')
+        sys.stdout.flush()
         self.sh_script_path = os.path.join(self.install_lib,'sat','sat.sh')
         self.primitivus_path = os.path.join(self.install_lib,'sat_frontends','primitivus')
         self.custom_auto_options()
@@ -174,10 +175,12 @@
 
 if sys.argv[1].lower() in ['egg_info','install']:
     #we only check dependencies if egg_info or install is used
-    preinstall_check()
+    install_opt = os.environ.get("SAT_INSTALL","")
+    if not "nopreinstall" in install_opt: #user can force preinstall skipping 
+        preinstall_check()
 
 setup(name=NAME,
-      version='0.1.1',
+      version='0.2.0',
       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. You can use it with the desktop frontend (wix - WxPython based), console ui frontend (Primitivus, Urwid based), or command line frontend (jp), and others are coming. ',
       author='Goffi (Jérôme Poisson)',