mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-25 01:16:16 +03:00
winbuild use lcms2-2.8 for python3.x; use static freetype on GHA
This commit is contained in:
parent
cf1f8b0498
commit
04868c9e51
11
.github/workflows/test-windows.yml
vendored
11
.github/workflows/test-windows.yml
vendored
|
@ -147,26 +147,23 @@ jobs:
|
||||||
set DefaultPlatformToolset=v140
|
set DefaultPlatformToolset=v140
|
||||||
set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets
|
set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets
|
||||||
set MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
|
set MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
|
||||||
%MSBUILD% builds\windows\vc2010\freetype.sln /t:Build /p:Configuration="Release" /p:Platform=${{ matrix.platform-msbuild }} /m
|
%MSBUILD% builds\windows\vc2010\freetype.sln /t:Build /p:Configuration="Release Static" /p:Platform=${{ matrix.platform-msbuild }} /m
|
||||||
xcopy /Y /E /Q include %INCLIB%
|
xcopy /Y /E /Q include %INCLIB%
|
||||||
copy /Y /B objs\${{ matrix.platform-msbuild }}\Release\freetype.dll %INCLIB%
|
copy /Y /B "objs\${{ matrix.platform-msbuild }}\Release Static\freetype.lib" %INCLIB%
|
||||||
copy /Y /B objs\${{ matrix.platform-msbuild }}\Release\freetype.lib %INCLIB%
|
|
||||||
|
|
||||||
- name: Build dependencies / LCMS2
|
- name: Build dependencies / LCMS2
|
||||||
if: false
|
|
||||||
run: |
|
run: |
|
||||||
REM Projects\VC2015\lcms2.sln is not available in lcms2-2.7
|
|
||||||
|
|
||||||
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
|
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
|
||||||
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
|
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
|
||||||
set BUILD=%GITHUB_WORKSPACE%\winbuild\build
|
set BUILD=%GITHUB_WORKSPACE%\winbuild\build
|
||||||
cd /D %BUILD%\lcms2-2.7
|
cd /D %BUILD%\lcms2-2.8
|
||||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
||||||
echo on
|
echo on
|
||||||
rmdir /S /Q Lib
|
rmdir /S /Q Lib
|
||||||
rmdir /S /Q Projects\VC2015\Release
|
rmdir /S /Q Projects\VC2015\Release
|
||||||
set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets
|
set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets
|
||||||
set MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
|
set MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
|
||||||
|
powershell -Command "(gc Projects\VC2015\lcms2_static\lcms2_static.vcxproj) -replace 'MultiThreadedDLL', 'MultiThreaded' | Out-File -encoding ASCII Projects\VC2015\lcms2_static\lcms2_static.vcxproj"
|
||||||
%MSBUILD% Projects\VC2015\lcms2.sln /t:Clean;lcms2_static /p:Configuration="Release" /p:Platform=${{ matrix.platform-msbuild }} /m
|
%MSBUILD% Projects\VC2015\lcms2.sln /t:Clean;lcms2_static /p:Configuration="Release" /p:Platform=${{ matrix.platform-msbuild }} /m
|
||||||
xcopy /Y /E /Q include %INCLIB%
|
xcopy /Y /E /Q include %INCLIB%
|
||||||
copy /Y /B Lib\MS\*.lib %INCLIB%
|
copy /Y /B Lib\MS\*.lib %INCLIB%
|
||||||
|
|
|
@ -270,6 +270,7 @@ def build_lcms_70(compiler):
|
||||||
r"""
|
r"""
|
||||||
rem Build lcms2
|
rem Build lcms2
|
||||||
setlocal
|
setlocal
|
||||||
|
set LCMS=%%LCMS-2.7%%
|
||||||
rd /S /Q %%LCMS%%\Lib
|
rd /S /Q %%LCMS%%\Lib
|
||||||
rd /S /Q %%LCMS%%\Projects\VC%(vc_version)s\Release
|
rd /S /Q %%LCMS%%\Projects\VC%(vc_version)s\Release
|
||||||
%%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:Clean /p:Configuration="Release" /p:Platform=Win32 /m
|
%%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:Clean /p:Configuration="Release" /p:Platform=Win32 /m
|
||||||
|
@ -287,8 +288,10 @@ def build_lcms_71(compiler):
|
||||||
r"""
|
r"""
|
||||||
rem Build lcms2
|
rem Build lcms2
|
||||||
setlocal
|
setlocal
|
||||||
|
set LCMS=%%LCMS-2.8%%
|
||||||
rd /S /Q %%LCMS%%\Lib
|
rd /S /Q %%LCMS%%\Lib
|
||||||
rd /S /Q %%LCMS%%\Projects\VC%(vc_version)s\Release
|
rd /S /Q %%LCMS%%\Projects\VC%(vc_version)s\Release
|
||||||
|
powershell -Command "(gc Projects\VC2015\lcms2_static\lcms2_static.vcxproj) -replace 'MultiThreadedDLL', 'MultiThreaded' | Out-File -encoding ASCII Projects\VC2015\lcms2_static\lcms2_static.vcxproj"
|
||||||
%%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:Clean /p:Configuration="Release" /p:Platform=%(platform)s /m
|
%%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:Clean /p:Configuration="Release" /p:Platform=%(platform)s /m
|
||||||
%%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:lcms2_static /p:Configuration="Release" /p:Platform=%(platform)s /m
|
%%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:lcms2_static /p:Configuration="Release" /p:Platform=%(platform)s /m
|
||||||
xcopy /Y /E /Q %%LCMS%%\include %%INCLIB%%
|
xcopy /Y /E /Q %%LCMS%%\include %%INCLIB%%
|
||||||
|
|
|
@ -44,11 +44,16 @@ libs = {
|
||||||
"filename": PILLOW_DEPENDS_DIR + "freetype-2.10.1.tar.gz",
|
"filename": PILLOW_DEPENDS_DIR + "freetype-2.10.1.tar.gz",
|
||||||
"dir": "freetype-2.10.1",
|
"dir": "freetype-2.10.1",
|
||||||
},
|
},
|
||||||
"lcms": {
|
"lcms-2.7": {
|
||||||
"url": SF_MIRROR + "/project/lcms/lcms/2.7/lcms2-2.7.zip",
|
"url": SF_MIRROR + "/project/lcms/lcms/2.7/lcms2-2.7.zip",
|
||||||
"filename": PILLOW_DEPENDS_DIR + "lcms2-2.7.zip",
|
"filename": PILLOW_DEPENDS_DIR + "lcms2-2.7.zip",
|
||||||
"dir": "lcms2-2.7",
|
"dir": "lcms2-2.7",
|
||||||
},
|
},
|
||||||
|
"lcms-2.8": {
|
||||||
|
"url": SF_MIRROR + "/project/lcms/lcms/2.8/lcms2-2.8.zip",
|
||||||
|
"filename": PILLOW_DEPENDS_DIR + "lcms2-2.8.zip",
|
||||||
|
"dir": "lcms2-2.8",
|
||||||
|
},
|
||||||
"ghostscript": {
|
"ghostscript": {
|
||||||
"url": "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927/ghostscript-9.27.tar.gz", # noqa: E501
|
"url": "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927/ghostscript-9.27.tar.gz", # noqa: E501
|
||||||
"filename": PILLOW_DEPENDS_DIR + "ghostscript-9.27.tar.gz",
|
"filename": PILLOW_DEPENDS_DIR + "ghostscript-9.27.tar.gz",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user