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

Merge pull request #1289 from wiredfool/winbuild2

Browse Source 
Windows build tweaks
This commit is contained in:
Hugo van Kemenade 2015-06-19 12:47:40 +03:00
commit 081839f0f9
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winbuild/build.py
View File

@ -1,6 +1,6 @@
#/usr/bin/env python3 #/usr/bin/env python3
import subprocess, multiprocessing import subprocess
import shutil import shutil
import sys, getopt import sys, getopt
import os import os
@ -106,11 +106,10 @@ def main(op):
compilers[(compiler_version, 64)]), compilers[(compiler_version, 64)]),
footer()]))) footer()])))
pool = multiprocessing.Pool() results = map(run_script, scripts)
results = pool.map(run_script, scripts)
for (version, status, trace, err) in results: for (version, status, trace, err) in results:
print ("Compiled %s: %s" % (version, status)) print ("Compiled %s: %s" % (version, status and 'ERR' or 'OK'))
def run_one(op): def run_one(op):

2
winbuild/build_dep.py
View File

@ -185,7 +185,7 @@ setlocal
cd /D %%WEBP%% cd /D %%WEBP%%
rd /S /Q %%WEBP%%\output\release-static rd /S /Q %%WEBP%%\output\release-static
nmake -f Makefile.vc CFG=release-static RTLIBCFG=static OBJDIR=output all nmake -f Makefile.vc CFG=release-static RTLIBCFG=static OBJDIR=output all
copy /Y /B output\release-static\%(platform)s\lib\* %%INCLIB%% copy /Y /B output\release-static\%(webp_platform)s\lib\* %%INCLIB%%
mkdir %%INCLIB%%\webp mkdir %%INCLIB%%\webp
copy /Y /B src\webp\*.h %%INCLIB%%\\webp copy /Y /B src\webp\*.h %%INCLIB%%\\webp
endlocal endlocal

8
winbuild/config.py
View File

@ -72,14 +72,16 @@ compilers = { (7,64): {
'vc_version':'2008', 'vc_version':'2008',
'env_flags': '/x64 /xp', 'env_flags': '/x64 /xp',
'inc_dir': 'msvcr90-x64', 'inc_dir': 'msvcr90-x64',
'platform': 'x64' 'platform': 'x64',
'webp_platform': 'x64',
}, },
(7,32): { (7,32): {
'env_version':'v7.0', 'env_version':'v7.0',
'vc_version':'2008', 'vc_version':'2008',
'env_flags': '/x86 /xp', 'env_flags': '/x86 /xp',
'inc_dir': 'msvcr90-x32', 'inc_dir': 'msvcr90-x32',
'platform': 'Win32' 'platform': 'Win32',
'webp_platform': 'x86',
}, },
(7.1,64): { (7.1,64): {
@ -88,6 +90,7 @@ compilers = { (7,64): {
'env_flags': '/x64 /vista', 'env_flags': '/x64 /vista',
'inc_dir': 'msvcr10-x64', 'inc_dir': 'msvcr10-x64',
'platform': 'x64', 'platform': 'x64',
'webp_platform': 'x64',
}, },
(7.1,32): { (7.1,32): {
'env_version':'v7.1', 'env_version':'v7.1',
@ -95,6 +98,7 @@ compilers = { (7,64): {
'env_flags': '/x86 /vista', 'env_flags': '/x86 /vista',
'inc_dir': 'msvcr10-x32', 'inc_dir': 'msvcr10-x32',
'platform': 'Win32', 'platform': 'Win32',
'webp_platform': 'x86',
}, },
} }