viff

changeset 904:27eb22c25f4b

Merged.
author Martin Geisler <mg@daimi.au.dk>
date Mon, 15 Sep 2008 13:03:47 +0200
parents 105bd2138d86 035ff24d65a0
children cecc84b0be9f
files
diffstat 1 files changed, 13 insertions(+), 6 deletions(-) [+]
line diff
     1.1 --- a/doc/install.txt	Tue Sep 09 10:35:36 2008 +0200
     1.2 +++ b/doc/install.txt	Mon Sep 15 13:03:47 2008 +0200
     1.3 @@ -5,12 +5,13 @@
     1.4  ==================
     1.5  
     1.6  VIFF is written in Python and uses the Twisted framework for
     1.7 -asynchronous communication, (optionally) PyOpenSSL for secure
     1.8 -communication, ConfigObj for configuration files, and GMPY for fast
     1.9 -bignum arithmetic. You can find these components here:
    1.10 +asynchronous communication, (optionally) OpenSSL and PyOpenSSL for
    1.11 +secure communication, ConfigObj for configuration files, and GMPY for
    1.12 +fast bignum arithmetic. You can find these components here:
    1.13  
    1.14  :Python:         http://python.org/
    1.15  :Twisted:        http://twistedmatrix.com/
    1.16 +:OpenSSL:        http://www.openssl.org/
    1.17  :PyOpenSSL:      http://pyopenssl.sourceforge.net/
    1.18  :ConfigObj:      http://voidspace.org.uk/python/configobj.html
    1.19  :GMPY:           http://code.google.com/p/gmpy/
    1.20 @@ -19,6 +20,7 @@
    1.21  
    1.22  :Python:         2.4.1 to 2.5.0
    1.23  :Twisted:        2.5 to 8.1.0
    1.24 +:OpenSSL:        0.9.8g
    1.25  :PyOpenSSL:      0.7
    1.26  :ConfigObj:      4.4.0
    1.27  :GMPY:           1.0alpha to 1.0.2
    1.28 @@ -56,14 +58,18 @@
    1.29  5) Download and install GMPY_. If you are using Vista, right-click on
    1.30     the installer and choose the option to run as administrator.
    1.31  
    1.32 -6) Download and install PyOpenSSL_. Again, run the installer as
    1.33 +6) Download and execute an `OpenSSL Win32 Installer`_. Problems have
    1.34 +   been reported when using the latest release, 0.9.8h, so currently
    1.35 +   0.9.8g is recommended.
    1.36 +
    1.37 +7) Download and install PyOpenSSL_. Again, run the installer as
    1.38     administrator if you are using Vista.
    1.39  
    1.40 -7) Download and install VIFF_. Note that if you are using the
    1.41 +8) Download and install VIFF_. Note that if you are using the
    1.42     installer on Vista, you will again need to run it as an
    1.43     administrator.
    1.44  
    1.45 -8) Proceed to `testing`_.
    1.46 +9) Proceed to `testing`_.
    1.47  
    1.48  
    1.49  Mac OS X
    1.50 @@ -236,6 +242,7 @@
    1.51  .. _Twisted: http://twistedmatrix.com/
    1.52  .. _ConfigObj: http://voidspace.org.uk/python/configobj.html
    1.53  .. _GMPY: http://code.google.com/p/gmpy/
    1.54 +.. _OpenSSL Win32 installer: http://www.slproweb.com/products/Win32OpenSSL.html
    1.55  .. _PyOpenSSL: http://pyopenssl.sourceforge.net/
    1.56  .. _MacPython: http://www.pythonmac.org
    1.57  .. _XCode: http://developer.apple.com/tools/xcode/