docs && setup.py update

This commit is contained in:
ingvar1995 2016-07-11 17:24:39 +03:00
parent 5b9cce4155
commit 47c0a451c4
3 changed files with 14 additions and 13 deletions

View File

@ -26,11 +26,10 @@ Run app using ``toxygen`` command.
1. [Download and install latest Python 3.4](https://www.python.org/downloads/windows/)
2. [Install PySide](https://pypi.python.org/pypi/PySide/1.2.4) (recommended) or [PyQt4](https://riverbankcomputing.com/software/pyqt/download)
3. Install PyAudio: ``pip3.4 install pyaudio``
4. Install PySocks: ``pip3.4 install PySocks``
5. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
6. Unpack archive
7. Download latest libtox.dll build, download latest libsodium.a build, put it into \src\libs\
8. Run \src\main.py
4. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
5. Unpack archive
6. Download latest libtox.dll build, download latest libsodium.a build, put it into \src\libs\
7. Run \src\main.py.
[libtox.dll for 32-bit Python](https://build.tox.chat/view/libtoxcore/job/libtoxcore_build_windows_x86_shared_release/lastSuccessfulBuild/artifact/libtoxcore_build_windows_x86_shared_release.zip)
@ -51,10 +50,9 @@ Dependencies:
3. Install [toxcore](https://github.com/irungentoo/toxcore/blob/master/INSTALL.md) with toxav support in your system (install in /usr/lib/)
4. Install PyAudio:
``sudo apt-get install portaudio19-dev`` and ``sudo apt-get install python3-pyaudio``
5. Install PySocks: ``pip3.4 install PySocks``
6. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
7. Unpack archive
8. Run app:
5. [Download toxygen](https://github.com/xveduk/toxygen/archive/master.zip)
6. Unpack archive
7. Run app:
``python3.4 main.py``
## Compile Toxygen

View File

@ -7,14 +7,14 @@ from toxygen.util import program_version
version = program_version + '.0'
MODULES = ['PyAudio', 'PySocks']
MODULES = ['PyAudio']
if system() == 'Windows':
MODULES.append('PySide')
class InstallScript(install):
"""Install all required libs"""
"""This class configures Toxygen after installation"""
def run(self):
install.run(self)
@ -29,8 +29,9 @@ setup(name='Toxygen',
description='Toxygen - Tox client',
long_description='Toxygen is powerful Tox client written in Python3',
url='https://github.com/xveduk/toxygen/',
keywords='toxygen tox',
keywords='toxygen tox messenger',
author='Ingvar',
maintainer='Ingvar',
license='GPL3',
packages=['toxygen', 'toxygen.plugins', 'toxygen.styles'],
install_requires=MODULES,

View File

@ -381,6 +381,7 @@ class Toxygen:
def clean():
"""Removes all windows libs from libs folder"""
d = curr_directory() + '/libs/'
for fl in ('libtox64.dll', 'libtox.dll', 'libsodium64.a', 'libsodium.a'):
if os.path.exists(d + fl):
@ -388,6 +389,7 @@ def clean():
def configure():
"""Removes unused libs"""
d = curr_directory() + '/libs/'
is_64bits = sys.maxsize > 2 ** 32
if not is_64bits:
@ -410,7 +412,7 @@ def configure():
def main():
if len(sys.argv) == 1:
toxygen = Toxygen()
else: # path to profile or tox: uri or --version or --help
else: # started with argument(s)
arg = sys.argv[1]
if arg == '--version':
print('Toxygen ' + program_version)