python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-13 05:06:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

test-windows.yml libjpeg-turbo

Browse Source
This commit is contained in:
nulano 2019-09-27 10:18:32 +02:00
parent b81f5481b8
commit d05655095b
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.github/workflows/test-windows.yml vendored
View File

@ -62,6 +62,11 @@ jobs:
- name: Fetch dependencies - name: Fetch dependencies
run: | run: |
curl -fsSL -o nasm.zip https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/win64/nasm-2.14.02-win64.zip
7z x nasm.zip "-o$env:RUNNER_WORKSPACE\"
Write-Host "`#`#[add-path]$env:RUNNER_WORKSPACE\nasm-2.14.02"
Write-Host "::add-path::$env:RUNNER_WORKSPACE\nasm-2.14.02"
$env:PYTHON=$env:pythonLocation $env:PYTHON=$env:pythonLocation
curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/master.zip curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/master.zip
7z x pillow-depends.zip -oc:\ 7z x pillow-depends.zip -oc:\
@ -76,7 +81,9 @@ jobs:
EXECUTABLE: bin\python.exe EXECUTABLE: bin\python.exe
shell: pwsh shell: pwsh
# libjpeg-turbo build is slow, pypy test is slow -> don't do both at once
- name: Build dependencies / libjpeg - name: Build dependencies / libjpeg
if: "contains(matrix.python-version, 'pypy')"
run: | run: |
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
@ -90,6 +97,23 @@ jobs:
copy /Y /B j*.h %INCLIB% copy /Y /B j*.h %INCLIB%
copy /Y /B *.lib %INCLIB% copy /Y /B *.lib %INCLIB%
- name: Build dependencies / libjpeg-turbo
if: "!contains(matrix.python-version, 'pypy')"
run: |
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
set BUILD=%GITHUB_WORKSPACE%\winbuild\build
cd /D %BUILD%\libjpeg-turbo-2.0.3
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
echo on
set CMAKE=cmake.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF
set CMAKE=%CMAKE% -DENABLE_SHARED:BOOL=OFF -DWITH_JPEG8:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release
%CMAKE% -G "NMake Makefiles" .
nmake -nologo -f Makefile clean
nmake -nologo -f Makefile
copy /Y /B j*.h %INCLIB%
copy /Y /B jpeg-static.lib %INCLIB%\libjpeg.lib
- name: Build dependencies / zlib - name: Build dependencies / zlib
run: | run: |
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
@ -176,10 +200,10 @@ jobs:
cd /D %BUILD%\openjpeg-2.3.1msvcr10-x32 cd /D %BUILD%\openjpeg-2.3.1msvcr10-x32
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
set CMAKE=cmake.exe -DOPENJP2_COMPILE_OPTIONS=-MT set CMAKE=cmake.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF
set CMAKE=%CMAKE% -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF
set CMAKE=%CMAKE% -DBUILD_THIRDPARTY:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF set CMAKE=%CMAKE% -DBUILD_THIRDPARTY:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF
%CMAKE% -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" . set CMAKE=%CMAKE% -DOPENJP2_COMPILE_OPTIONS=-MT -DCMAKE_BUILD_TYPE=Release
%CMAKE% -G "NMake Makefiles" .
nmake -nologo -f Makefile clean nmake -nologo -f Makefile clean
nmake -nologo -f Makefile nmake -nologo -f Makefile
mkdir %INCLIB%\openjpeg-2.3.1 mkdir %INCLIB%\openjpeg-2.3.1

7
winbuild/config.py
View File

@ -1,6 +1,6 @@
import os import os
SF_MIRROR = "http://iweb.dl.sourceforge.net" SF_MIRROR = "https://iweb.dl.sourceforge.net"
PILLOW_DEPENDS_DIR = "C:\\pillow-depends\\" PILLOW_DEPENDS_DIR = "C:\\pillow-depends\\"
pythons = { pythons = {
@ -91,6 +91,11 @@ libs = {
"filename": PILLOW_DEPENDS_DIR + "openjpeg-2.3.1.tar.gz", "filename": PILLOW_DEPENDS_DIR + "openjpeg-2.3.1.tar.gz",
"dir": "openjpeg-2.3.1", "dir": "openjpeg-2.3.1",
}, },
"jpeg-turbo": {
"url": SF_MIRROR + "/project/libjpeg-turbo/2.0.3/libjpeg-turbo-2.0.3.tar.gz",
"filename": PILLOW_DEPENDS_DIR + "libjpeg-turbo-2.0.3.tar.gz",
"dir": "libjpeg-turbo-2.0.3",
},
} }
compilers = { compilers = {