comparison setup.py @ 349:3ec237e82aed

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 99206631503e
children a3aa4d046914
comparison
equal deleted inserted replaced
348:8ff113e2abcb 349:3ec237e82aed
90 #we are now in a temp dir, we can get the repositories 90 #we are now in a temp dir, we can get the repositories
91 commands = ['%s clone http://hg.ik.nu/wokkel -r f9cd8ca1a62d' % hg_path, #XXX: we use specific revision to avoid merge conflict 91 commands = ['%s clone http://hg.ik.nu/wokkel -r f9cd8ca1a62d' % hg_path, #XXX: we use specific revision to avoid merge conflict
92 'cd wokkel', 92 'cd wokkel',
93 '%s pull -f http://hg.ik.nu/ralphm/wokkel-muc-client-support-24-2 -r 1b19c49d30c2' % hg_path, 93 '%s pull -f http://hg.ik.nu/ralphm/wokkel-muc-client-support-24-2 -r 1b19c49d30c2' % hg_path,
94 '%s merge wokkel-muc-client-support-24' % hg_path, 94 '%s merge wokkel-muc-client-support-24' % hg_path,
95 '%s commit -u "SàT installation script" -m "Merged wokkel\'s MUC branch"' % hg_path, 95 '%s commit -u "SaT installation script" -m "Merged wokkel\'s MUC branch"' % hg_path,
96 '%s setup.py %s' % (sys.executable, ' '.join(sys.argv[1:]))] #XXX: we use the same arguments as for this setup.py 96 '%s setup.py %s' % (sys.executable, ' '.join(sys.argv[1:]))] #XXX: we use the same arguments as for this setup.py
97 for command in commands: 97 for command in commands:
98 if command.startswith('cd '): 98 if command.startswith('cd '):
99 os.chdir(command[3:]) 99 os.chdir(command[3:])
100 else: 100 else:
115 115
116 116
117 def run(self): 117 def run(self):
118 install.run(self) 118 install.run(self)
119 sys.stdout.write ('running post installation stuff\n') 119 sys.stdout.write ('running post installation stuff\n')
120 sys.stdout.flush()
120 self.sh_script_path = os.path.join(self.install_lib,'sat','sat.sh') 121 self.sh_script_path = os.path.join(self.install_lib,'sat','sat.sh')
121 self.primitivus_path = os.path.join(self.install_lib,'sat_frontends','primitivus') 122 self.primitivus_path = os.path.join(self.install_lib,'sat_frontends','primitivus')
122 self.custom_auto_options() 123 self.custom_auto_options()
123 self.custom_create_links() 124 self.custom_create_links()
124 self.custom_wokkel_requirement() 125 self.custom_wokkel_requirement()
172 sys.exit(2) 173 sys.exit(2)
173 174
174 175
175 if sys.argv[1].lower() in ['egg_info','install']: 176 if sys.argv[1].lower() in ['egg_info','install']:
176 #we only check dependencies if egg_info or install is used 177 #we only check dependencies if egg_info or install is used
177 preinstall_check() 178 install_opt = os.environ.get("SAT_INSTALL","")
179 if not "nopreinstall" in install_opt: #user can force preinstall skipping
180 preinstall_check()
178 181
179 setup(name=NAME, 182 setup(name=NAME,
180 version='0.1.1', 183 version='0.2.0',
181 description=u'Salut à Toi multi-frontend XMPP client', 184 description=u'Salut à Toi multi-frontend XMPP client',
182 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. ', 185 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. ',
183 author='Goffi (Jérôme Poisson)', 186 author='Goffi (Jérôme Poisson)',
184 author_email='goffi@goffi.org', 187 author_email='goffi@goffi.org',
185 url='http://wiki.goffi.org/wiki/Salut_%C3%A0_Toi', 188 url='http://wiki.goffi.org/wiki/Salut_%C3%A0_Toi',