diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-07-24 21:52:17 +0100 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-07-24 21:57:34 +0100 |
| commit | 6608b7e98e6669404c981ad981c277767998f129 (patch) | |
| tree | df4320c3e317f66ac893acde3e36f738fee8dcbd /docs | |
| parent | b095374c64a413f8569a6b34883655d7a230a5c8 (diff) | |
| download | cryptography-6608b7e98e6669404c981ad981c277767998f129.tar.gz cryptography-6608b7e98e6669404c981ad981c277767998f129.tar.bz2 cryptography-6608b7e98e6669404c981ad981c277767998f129.zip | |
remove windows link type, update docs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/installation.rst | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/docs/installation.rst b/docs/installation.rst index 96e1e8de..becab6b0 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -45,28 +45,18 @@ dependencies are included. Just run $ pip install cryptography If you prefer to compile it yourself you'll need to have OpenSSL installed. -There are `pre-compiled binaries`_ available. If your installation is in an -unusual location set the ``LIB`` and ``INCLUDE`` environment variables to -include the corresponding locations.For example: +You can compile OpenSSL yourself as well or use the binaries we build for our +release infrastructure (`32-bit`_ and `64-bit`_). Wherever you place your copy +of OpenSSL you'll need to set the ``LIB`` and ``INCLUDE`` environment variables +to include the proper locations. For example: .. code-block:: console C:\> \path\to\vcvarsall.bat x86_amd64 - C:\> set LIB=C:\OpenSSL\lib\VC\static;C:\OpenSSL\lib;%LIB% - C:\> set INCLUDE=C:\OpenSSL\include;%INCLUDE% + C:\> set LIB=C:\OpenSSL-win64\lib;%LIB% + C:\> set INCLUDE=C:\OpenSSL-win64\include;%INCLUDE% C:\> pip install cryptography -You can also choose to build statically or dynamically using the -``PYCA_WINDOWS_LINK_TYPE`` variable. Allowed values are ``static`` (default) -and ``dynamic``. - -.. code-block:: console - - C:\> \path\to\vcvarsall.bat x86_amd64 - C:\> set LIB=C:\OpenSSL\lib\VC\static;C:\OpenSSL\lib;%LIB% - C:\> set INCLUDE=C:\OpenSSL\include;%INCLUDE% - C:\> set PYCA_WINDOWS_LINK_TYPE=dynamic - C:\> pip install cryptography Building cryptography on Linux ------------------------------ @@ -186,6 +176,7 @@ information, consult `Greg Wilson's blog post`_ on the subject. .. _`Homebrew`: http://brew.sh .. _`MacPorts`: http://www.macports.org -.. _`pre-compiled binaries`: https://www.openssl.org/related/binaries.html +.. _`32-bit`: https://jenkins.cryptography.io/job/openssl-win32-release/ +.. _`64-bit`: https://jenkins.cryptography.io/job/openssl-win64-release/ .. _`bug in conda`: https://github.com/conda/conda-recipes/issues/110 .. _`Greg Wilson's blog post`: http://software-carpentry.org/blog/2014/04/mr-biczo-was-right.html |