From 156360af3d10fa4ecfb1ada6718f3ae57db5e62b Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 30 Jun 2014 12:14:01 -0600 Subject: switch to static linking on windows and update installation page --- docs/installation.rst | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/installation.rst b/docs/installation.rst index 8fbbcb30..56d21e72 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -35,16 +35,23 @@ OpenSSL releases: On Windows ---------- -If you're on Windows you'll need to make sure you 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: +The wheel package on Windows is a statically linked build (as of 0.5) so all +dependencies are included. Just run + +.. code-block:: console + + $ 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: .. code-block:: console C:\> \path\to\vcvarsall.bat x86_amd64 - C:\> set LIB=C:\OpenSSL-1.0.1g-64bit\lib;%LIB% - C:\> set INCLUDE=C:\OpenSSL-1.0.1g-64bit\include;%INCLUDE% + C:\> set LIB=C:\OpenSSL-1.0.1h-64bit\lib\VC\static;%LIB% + C:\> set INCLUDE=C:\OpenSSL-1.0.1h-64bit\include;%INCLUDE% C:\> pip install cryptography Building cryptography on Linux -- cgit v1.2.3 From 2a39f7f3c80b9c725b586ca96defbe5bad62bf83 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 2 Jul 2014 22:56:01 -0500 Subject: switch to env variable based static/dynamic switch for windows --- docs/installation.rst | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/installation.rst b/docs/installation.rst index 56d21e72..81e150de 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -45,13 +45,25 @@ dependencies are included. Just run 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: +include the corresponding locations.For example: .. code-block:: console C:\> \path\to\vcvarsall.bat x86_amd64 - C:\> set LIB=C:\OpenSSL-1.0.1h-64bit\lib\VC\static;%LIB% - C:\> set INCLUDE=C:\OpenSSL-1.0.1h-64bit\include;%INCLUDE% + C:\> set LIB=C:\OpenSSL\lib\VC\static;C:\OpenSSL\lib;%LIB% + C:\> set INCLUDE=C:\OpenSSL\include;%INCLUDE% + C:\> pip install cryptography + +You can also choose to build statically or dynamically using the +``PYCA_OPENSSL_INSTALL`` 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_OPENSSL_INSTALL=dynamic C:\> pip install cryptography Building cryptography on Linux -- cgit v1.2.3 From 419e67a1d515ec7883a1e31608c1618e226fbffb Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 5 Jul 2014 11:15:55 -0500 Subject: change env variable name, handle empty string --- docs/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/installation.rst b/docs/installation.rst index 81e150de..339d8b76 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -55,15 +55,15 @@ include the corresponding locations.For example: C:\> pip install cryptography You can also choose to build statically or dynamically using the -``PYCA_OPENSSL_INSTALL`` variable. Allowed values are ``static`` (default) and -``dynamic``. +``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_OPENSSL_INSTALL=dynamic + C:\> set PYCA_WINDOWS_LINK_TYPE=dynamic C:\> pip install cryptography Building cryptography on Linux -- cgit v1.2.3