diff --git a/docs/source/installation.rst b/docs/source/installation.rst index bb33ec0..f1c09e9 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -37,35 +37,28 @@ you just need to compile a distribution with the pyjnius module:: Installation for Windows ------------------------ -1. Download and install JDK and JRE (if not installed): - * http://www.oracle.com/technetwork/java/javase/downloads/index.html - -2. Edit your system and environment variables (use your appropriate your java version): - - 1. Add to Environment Variables: - * ``JDK_HOME``: C:\\Program Files\\Java\\jdk1.7.0_79\\ - * ``PATH``: C:\\Program Files\\Java\\jdk1.7.0_79\\jre\\bin\\server\\ - 2. Add to System Variables: - * ``PATH``: C:\\Program Files\Java\jdk1.7.0_79\bin\` +Python and pip must be installed and present in PATH. -3. Install pip (if not installed): - - https://pip.pypa.io/en/latest/installing/ -4. Download and install Cython (if not installed): - 1. Install wheel: - * ``pip install wheel`` - 2. Install Cython: - 1. Download Cython for Windows: - * http://www.lfd.uci.edu/~gohlke/pythonlibs/#cython - 2. Install Cython (use your appropriate filename): - * ``pip install Cython-0.24-cp35-cp35m-win_amd64.whl`` +1. Download and install JDK and JRE: + * http://www.oracle.com/technetwork/java/javase/downloads/index.html -5. Download and install Microsoft Visual C++ Compiler for Python 2.7: - 1. http://aka.ms/vcpython27 - Python modules can be part written in C (typically for speed). If you try to install such a package with ``pip`` (or ``setup.py``), it has to compile that C/C++ from source. `[Reference] `_ - 2. Install ``setuptools`` for the compiler to work: - * https://pypi.python.org/pypi/setuptools#windows-simplified +2. Edit your system and environment variables (use the appropriate Java version): -6. Download and install the pyjnius source: - - https://github.com/kivy/pyjnius - - ``python setup.py install`` + 1. Add to Environment Variables: + * ``JDK_HOME``: C:\\Program Files\\Java\\jdk1.7.0_79\\ + * ``PATH``: C:\\Program Files\\Java\\jdk1.7.0_79\\jre\\bin\\server\\ + 2. Add to System Variables: + * ``PATH``: C:\\Program Files\\Java\\jdk1.7.0_79\\bin\\` + +3. Download and install Microsoft Visual C++ Compiler for Python 2.7: + - http://aka.ms/vcpython27 + +4. Update pip and setuptools: + - ``python -m pip install --upgrade pip setuptools`` + +5. Install Cython: + - ``python -m pip install --upgrade Cython`` + +6. Install Pyjnius: + - ``pip install pyjnius``