From 820d088115f228a2519398ac6cf1e7df3beb356f Mon Sep 17 00:00:00 2001 From: nulano Date: Sun, 29 Sep 2019 22:39:18 +0200 Subject: [PATCH] test-windows.yml harfbuzz --- .github/workflows/test-windows.yml | 21 +++++++++++++++++++++ winbuild/config.py | 5 +++++ 2 files changed, 26 insertions(+) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 26f7ef6a3..693a5f565 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -232,7 +232,28 @@ jobs: copy /Y /B *.h %INCLIB% copy /Y /B *.lib %INCLIB% + - name: Build dependencies / harfbuzz + 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%\harfbuzz-2.6.1 + call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1 + echo on + echo (gc CMakeLists.txt) -replace 'enable_testing', "add_compile_options(-MT)`r`nenable_testing" ^| Out-File -encoding ASCII CMakeLists.txt > patch.ps1 + powershell .\patch.ps1 + type CMakeLists.txt + set CMAKE=cmake.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF + set CMAKE=%CMAKE% -DCMAKE_BUILD_TYPE=Release + %CMAKE% -G "NMake Makefiles" . + nmake -nologo -f Makefile clean + nmake -nologo -f Makefile harfbuzz + copy /Y /B src\*.h %INCLIB% + copy /Y /B *.lib %INCLIB% + + - name: Build dependencies / ghostscript + if: false run: | set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32 diff --git a/winbuild/config.py b/winbuild/config.py index 962f0112b..8eabae2e9 100644 --- a/winbuild/config.py +++ b/winbuild/config.py @@ -103,6 +103,11 @@ libs = { + "libimagequant-ba653c8ccb34dde4e21c6076d85a72d21ed9d971.zip", "dir": "libimagequant-ba653c8ccb34dde4e21c6076d85a72d21ed9d971", }, + "harfbuzz": { + "url": "https://github.com/harfbuzz/harfbuzz/archive/2.6.1.zip", + "filename": PILLOW_DEPENDS_DIR + "harfbuzz-2.6.1.zip", + "dir": "harfbuzz-2.6.1", + }, } compilers = {