summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-12-20 01:30:18 +0900
committerkali <kali@leap.se>2012-12-20 01:37:58 +0900
commit6a8b5c24571251cb39e8d83333b0450e8324dcbe (patch)
treedd9bbf28f38f6dd52da2ad422fa3b7a9dc53f760
parent0bb7a486ae2aaf8171afcbe6a9846cbd5a99e0a5 (diff)
add links to pyqt and openvpn
-rw-r--r--README.rst6
-rw-r--r--docs/dev/environment.rst7
2 files changed, 6 insertions, 7 deletions
diff --git a/README.rst b/README.rst
index be47a125..01e1c151 100644
--- a/README.rst
+++ b/README.rst
@@ -81,9 +81,9 @@ The LEAP client git repository is available at::
Some steps need to be run when setting a development environment for the first time.
-Enable a **virtualenv** to isolate your libraries::
+Enable a **virtualenv** to isolate your libraries. (Current *.gitignore* knows about a virtualenv in the root tree. If you do not like that place, just change ``.`` for *<path.to.environment>*)::
- $ virtualenv . # ensure your .gitignore knows about it
+ $ virtualenv .
$ source bin/activate
Make sure you are in the development branch::
@@ -108,7 +108,7 @@ To run the test suite::
$ ./run_tests.sh
-which the first time should also install all of them in your virtualenv for you.
+which the first time should automagically install all the needed dependencies in your virtualenv for you.
License
=======
diff --git a/docs/dev/environment.rst b/docs/dev/environment.rst
index 8561396e..55f00d5e 100644
--- a/docs/dev/environment.rst
+++ b/docs/dev/environment.rst
@@ -22,7 +22,7 @@ Leap client depends on these libraries:
* `python 2.6 or 2.7`
* `qt4` libraries (see also :ref:`Troubleshooting PyQt install <pyqtvirtualenv>` about how to install inside your virtualenv)
* `libgnutls`
-* `openvpn`
+* `openvpn<http://openvpn.net/index.php/open-source/345-openvpn-project.html>`_
Debian
^^^^^^
@@ -76,13 +76,12 @@ As a workaround, you can run the following script after creating your virtualenv
$ pkg/postmkvenv.sh
-A second option if that does not work for you would be to install PyQt globally and pass the `--site-packages` option when you are creating your virtualenv::
+A second option if that does not work for you would be to install PyQt globally and pass the ``--site-packages`` option when you are creating your virtualenv::
$ apt-get install python-qt4
$ virtualenv --site-packages .
-.. TODO add link to PyQt tar.gz
-Or, if you prefer, you can also download the official PyQt tarball and execute `configure.py` in the root folder of their distribution, which generates a ``Makefile``::
+Or, if you prefer, you can also `download the official PyQt tarball<http://www.riverbankcomputing.com/software/pyqt/download>`_ and execute ``configure.py`` in the root folder of their distribution, which generates a ``Makefile``::
$ python configure.py
$ make && make install