python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-26 01:04:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Style nits

Browse Source
This commit is contained in:
wiredfool 2015-06-16 13:29:30 -07:00
parent ccf9eb5628
commit cedb226ef2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/build.rst
View File

@ -7,8 +7,8 @@ Building Pillow on Windows
This page will describe a build setup to build Pillow against the This page will describe a build setup to build Pillow against the
supported python versions in 32 and 64 bit modes, using freely supported python versions in 32 and 64 bit modes, using freely
availble Microsoft compilers. This has been developed and tested availble Microsoft compilers. This has been developed and tested
against 64bit Windows 7 Professional and a bare Windows Server 2012 against 64-bit Windows 7 Professional and Windows Server 2012
64bit RTM version on Amazon EC2. 64-bit version on Amazon EC2.
Prerequsites Prerequsites
------------ ------------
@ -17,25 +17,25 @@ Extra Build Helpers
^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
* Powershell (available by default on Windows Server) * Powershell (available by default on Windows Server)
* Github client (provides git+bash shell) * GitHub client (provides git+bash shell)
Optional: Optional:
* GPG (for checking signatures) (UNDONE -- python signature checking) * GPG (for checking signatures) (UNDONE -- Python signature checking)
Pythons Pythons
^^^^^^^ ^^^^^^^
The build routines expect Python to be installed at C:\PythonXX for 32 The build routines expect Python to be installed at C:\PythonXX for
bit versions or C:\PythonXXx64 for the 64 bit versions. 32-bit versions or C:\PythonXXx64 for the 64-bit versions.
Download Python 3.4.0, install it, and add it to the path. This is the Download Python 3.4, install it, and add it to the path. This is the
Python that we will use to bootstrap the build process. (The download Python that we will use to bootstrap the build process. (The download
routines are using 3.2+ features, and installing 3.4 gives us pip and routines are using 3.2+ features, and installing 3.4 gives us pip and
virtualenv as well, reducing the number of packages that we need to virtualenv as well, reducing the number of packages that we need to
install.) install.)
Download the rest of the pythons by opening a command window, changing Download the rest of the Pythons by opening a command window, changing
to the `winbuild` directory, and running `python to the `winbuild` directory, and running `python
get_pythons.py`. get_pythons.py`.
@ -43,7 +43,7 @@ UNDONE -- gpg verify the signatures (note that we can download from
https) https)
Run each installer and set the proper path to the installation. Don't Run each installer and set the proper path to the installation. Don't
set any of them as the default python, or add them to the path. set any of them as the default Python, or add them to the path.
Compilers Compilers
@ -70,7 +70,7 @@ a command window, change directory into `winbuild` and run `python
build_dep.py`. build_dep.py`.
This will download libjpeg, libtiff, libz, and freetype. It will then This will download libjpeg, libtiff, libz, and freetype. It will then
compile 32 and 64 bit versions of the libraries, with both versions of compile 32 and 64-bit versions of the libraries, with both versions of
the compilers. the compilers.
UNDONE -- lcms fails. UNDONE -- lcms fails.
@ -81,7 +81,7 @@ Building Pillow
Once the dependencies are built, run `python build.py --clean` to Once the dependencies are built, run `python build.py --clean` to
build and install Pillow in virtualenvs for each python build and install Pillow in virtualenvs for each python
build. `build.py --dist` will build windows installers instead of build. `build.py --dist` will build Windows installers instead of
installing into virtualenvs. installing into virtualenvs.
UNDONE -- suppressed output, what about failures. UNDONE -- suppressed output, what about failures.

2
setup.py
View File

@ -467,7 +467,7 @@ class pil_build_ext(build_ext):
if _find_library_file(self, "lcms2"): if _find_library_file(self, "lcms2"):
feature.lcms = "lcms2" feature.lcms = "lcms2"
elif _find_library_file(self, "lcms2_static"): elif _find_library_file(self, "lcms2_static"):
#alternate windows name. #alternate Windows name.
feature.lcms = "lcms2_static" feature.lcms = "lcms2_static"
if _tkinter and _find_include_file(self, "tk.h"): if _tkinter and _find_include_file(self, "tk.h"):