Skip to content

Commit

Permalink
Merge a73b951 into 6eb534b
Browse files Browse the repository at this point in the history
  • Loading branch information
@hugovk
hugovk committed Dec 4, 2017
2 parents 6eb534b + a73b951 commit 1ce0899
Showing 1 changed file with 40 additions and 22 deletions.
62 changes: 40 additions & 22 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,33 @@

_LIB_IMAGING = (
"Access", "AlphaComposite", "Resample", "Bands", "BcnDecode", "BitDecode",
"Blend", "Chops", "Convert", "ConvertYCbCr", "Copy", "Crc32", "Crop", "Dib",
"Draw", "Effects", "EpsEncode", "File", "Fill", "Filter", "FliDecode",
"Geometry", "GetBBox", "GifDecode", "GifEncode", "HexDecode", "Histo",
"JpegDecode", "JpegEncode", "LzwDecode", "Matrix", "ModeFilter",
"Negative", "Offset", "Pack", "PackDecode", "Palette", "Paste",
"Quant", "QuantOctree", "QuantHash", "QuantHeap", "PcdDecode", "PcxDecode",
"Blend", "Chops", "Convert", "ConvertYCbCr", "Copy", "Crc32", "Crop",
"Dib", "Draw", "Effects", "EpsEncode", "File", "Fill", "Filter",
"FliDecode", "Geometry", "GetBBox", "GifDecode", "GifEncode", "HexDecode",
"Histo", "JpegDecode", "JpegEncode", "LzwDecode", "Matrix", "ModeFilter",
"Negative", "Offset", "Pack", "PackDecode", "Palette", "Paste", "Quant",
"QuantOctree", "QuantHash", "QuantHeap", "PcdDecode", "PcxDecode",
"PcxEncode", "Point", "RankFilter", "RawDecode", "RawEncode", "Storage",
"SgiRleDecode", "SunRleDecode", "TgaRleDecode", "Unpack", "UnpackYCC",
"UnsharpMask", "XbmDecode", "XbmEncode", "ZipDecode", "ZipEncode", "TiffDecode",
"Jpeg2KDecode", "Jpeg2KEncode", "BoxBlur", "QuantPngQuant", "codec_fd")
"UnsharpMask", "XbmDecode", "XbmEncode", "ZipDecode", "ZipEncode",
"TiffDecode", "Jpeg2KDecode", "Jpeg2KEncode", "BoxBlur", "QuantPngQuant",
"codec_fd")

DEBUG = False

class DependencyException(Exception): pass
class RequiredDependencyException(Exception): pass

class DependencyException(Exception):
pass


class RequiredDependencyException(Exception):
pass


PLATFORM_MINGW = 'mingw' in ccompiler.get_default_compiler()
PLATFORM_PYPY = hasattr(sys, 'pypy_version_info')


def _dbg(s, tp=None):
if DEBUG:
if tp:
Expand Down Expand Up @@ -108,6 +116,7 @@ def _cmd_exists(cmd):
for path in os.environ["PATH"].split(os.pathsep)
)


def _read(file):
with open(file, 'rb') as fp:
return fp.read()
Expand All @@ -119,6 +128,7 @@ def get_version():
exec(compile(f.read(), version_file, 'exec'))
return locals()['__version__']


try:
import _tkinter
except (ImportError, OSError):
Expand All @@ -136,6 +146,7 @@ def get_version():
LCMS_ROOT = None
RAQM_ROOT = None


def _pkg_config(name):
try:
command = [
Expand All @@ -147,9 +158,10 @@ def _pkg_config(name):
command.append('--silence-errors')
libs = subprocess.check_output(command).decode('utf8').split(' ')
return libs[1][2:].strip(), libs[0][2:].strip()
except:
except Exception:
pass


class pil_build_ext(build_ext):
class feature:
features = ['zlib', 'jpeg', 'tiff', 'freetype', 'raqm', 'lcms', 'webp',
Expand Down Expand Up @@ -178,7 +190,8 @@ def __iter__(self):
] + [
('enable-%s' % x, None, 'Enable support for %s' % x) for x in feature
] + [
('disable-platform-guessing', None, 'Disable platform guessing on Linux'),
('disable-platform-guessing', None,
'Disable platform guessing on Linux'),
('debug', None, 'Debug logging')
]

Expand Down Expand Up @@ -299,7 +312,7 @@ def build_extensions(self):
try:
prefix = subprocess.check_output(['brew', '--prefix']).strip(
).decode('latin1')
except:
except Exception:
# Homebrew not installed
prefix = None

Expand Down Expand Up @@ -337,8 +350,10 @@ def build_extensions(self):
_add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
else:
libdirs = {
'x86_64': ["/lib64", "/usr/lib64", "/usr/lib/x86_64-linux-gnu"],
'64bit': ["/lib64", "/usr/lib64", "/usr/lib/x86_64-linux-gnu"],
'x86_64': ["/lib64", "/usr/lib64",
"/usr/lib/x86_64-linux-gnu"],
'64bit': ["/lib64", "/usr/lib64",
"/usr/lib/x86_64-linux-gnu"],
'i386': ["/usr/lib/i386-linux-gnu"],
'i686': ["/usr/lib/i386-linux-gnu"],
'32bit': ["/usr/lib/i386-linux-gnu"],
Expand Down Expand Up @@ -371,7 +386,8 @@ def build_extensions(self):
# user libs are at $PREFIX/lib
if os.environ.get('ANDROID_ROOT', None):
_add_directory(library_dirs,
os.path.join(os.environ['ANDROID_ROOT'],'lib'))
os.path.join(os.environ['ANDROID_ROOT'],
'lib'))

elif sys.platform.startswith("gnu"):
self.add_multiarch_paths()
Expand Down Expand Up @@ -608,9 +624,9 @@ def build_extensions(self):
defs.append(("WORDS_BIGENDIAN", None))

if sys.platform == "win32" and not (PLATFORM_PYPY or PLATFORM_MINGW):
defs.append(("PILLOW_VERSION", '"\\"%s\\""'%PILLOW_VERSION))
defs.append(("PILLOW_VERSION", '"\\"%s\\""' % PILLOW_VERSION))
else:
defs.append(("PILLOW_VERSION", '"%s"'%PILLOW_VERSION))
defs.append(("PILLOW_VERSION", '"%s"' % PILLOW_VERSION))

exts = [(Extension("PIL._imaging",
files,
Expand Down Expand Up @@ -712,7 +728,8 @@ def summary_report(self, feature):
if not all:
print("To add a missing option, make sure you have the required")
print("library and headers.")
print("See https://pillow.readthedocs.io/en/latest/installation.html#building-from-source")
print("See https://pillow.readthedocs.io/en/latest/installation."
"html#building-from-source")
print("")

print("To check the build, run the selftest.py script.")
Expand All @@ -730,7 +747,7 @@ def add_multiarch_paths(self):
try:
ret = subprocess.call(['dpkg-architecture',
'-qDEB_HOST_MULTIARCH'], stdout=fp)
except:
except Exception:
return
try:
if ret >> 8 == 0:
Expand Down Expand Up @@ -771,9 +788,10 @@ def debug_build():
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
],
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*",
cmdclass={"build_ext": pil_build_ext},
ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
include_package_data=True,
Expand Down

0 comments on commit 1ce0899

Please sign in to comment.