[ci] Disable vcpkg freetype installation and fix Appveyor CI (#422)
This commit is contained in:
parent
44f7d6ecde
commit
70202983f5
16
appveyor.yml
16
appveyor.yml
|
@ -32,18 +32,18 @@ install:
|
|||
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-ragel"
|
||||
|
||||
- 'if "%compiler%"=="msvc" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%'
|
||||
- 'if "%compiler%"=="msvc" git clone https://github.com/Microsoft/vcpkg'
|
||||
- 'if "%compiler%"=="msvc" cd vcpkg'
|
||||
- 'if "%compiler%"=="msvc" powershell -exec bypass scripts\bootstrap.ps1'
|
||||
- 'if "%compiler%"=="msvc" vcpkg install freetype:%VCPKG_ARCH%'
|
||||
- 'if "%compiler%"=="msvc" copy installed\%VCPKG_ARCH%\debug\lib\freetyped.lib installed\%VCPKG_ARCH%\lib'
|
||||
- 'if "%compiler%"=="msvc" cd ..'
|
||||
# - 'if "%compiler%"=="msvc" git clone https://github.com/Microsoft/vcpkg'
|
||||
# - 'if "%compiler%"=="msvc" cd vcpkg'
|
||||
# - 'if "%compiler%"=="msvc" powershell -exec bypass scripts\bootstrap.ps1'
|
||||
# - 'if "%compiler%"=="msvc" vcpkg install freetype:%VCPKG_ARCH%'
|
||||
# - 'if "%compiler%"=="msvc" copy installed\%VCPKG_ARCH%\debug\lib\freetyped.lib installed\%VCPKG_ARCH%\lib'
|
||||
# - 'if "%compiler%"=="msvc" cd ..'
|
||||
|
||||
build_script:
|
||||
- 'if "%compiler%"=="msvc" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; ./autogen.sh; make distdir"'
|
||||
- 'if "%compiler%"=="msvc" cd harfbuzz-*\win32'
|
||||
- 'if "%compiler%"=="msvc" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1 DIRECTWRITE=1 FREETYPE=1 FREETYPE_DIR=..\..\vcpkg\installed\%VCPKG_ARCH%\include ADDITIONAL_LIB_DIR=..\..\vcpkg\installed\%VCPKG_ARCH%\lib'
|
||||
- 'if "%compiler%"=="msvc" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1 DIRECTWRITE=1 FREETYPE=1 install'
|
||||
- 'if "%compiler%"=="msvc" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1 DIRECTWRITE=1' # FREETYPE=1 FREETYPE_DIR=..\..\vcpkg\installed\%VCPKG_ARCH%\include ADDITIONAL_LIB_DIR=..\..\vcpkg\installed\%VCPKG_ARCH%\lib'
|
||||
- 'if "%compiler%"=="msvc" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1 DIRECTWRITE=1 install' # FREETYPE=1 install'
|
||||
|
||||
- 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-$MSYS2_ARCH-{freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config}"'
|
||||
- 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; ./autogen.sh --with-uniscribe --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 --build=$MINGW_CHOST --host=$MINGW_CHOST --prefix=$MINGW_PREFIX; make; make check"'
|
||||
|
|
Loading…
Reference in New Issue