diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-01-13 17:44:09 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-02-06 22:23:55 +0900 |
commit | 402d76485cfc20ce8307878a84967d75ccc13378 (patch) | |
tree | d96c84971ca6575fad64ace1b414f0f0e8ead2da | |
parent | b9083c206aa02a824970e809d66607dd2c1a90f1 (diff) |
[MSWin] Install libffi using vcpkg
-rw-r--r-- | .appveyor.yml | 12 | ||||
-rw-r--r-- | .github/workflows/windows.yml | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 75cef60dd5..e88245db8e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,7 +23,7 @@ environment: - build: vs vs: 120 ssl: OpenSSL - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GEMS_FOR_TEST: "" - build: vs vs: 140 @@ -31,6 +31,8 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GEMS_FOR_TEST: "" RELINE_TEST_ENCODING: "UTF-8" +cache: + - c:\Tools\vcpkg\installed\ for: - matrix: @@ -42,6 +44,12 @@ for: - SET BITS=%Platform:x86=32% - SET BITS=%BITS:x=% - SET OPENSSL_DIR=C:\%ssl%-Win%BITS% + - cd C:\Tools\vcpkg + - git pull -q + - .\bootstrap-vcpkg.bat + - cd %APPVEYOR_BUILD_FOLDER% + - vcpkg --triplet %Platform%-windows install libffi libyaml readline zlib + - set PATH=c:\Tools\vcpkg\installed\%Platform%-windows\bin;%PATH% - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat - SET vcvars - '"%vcvars%" %Platform:x64=amd64%' @@ -72,7 +80,7 @@ for: - cd %Platform%-mswin_%vs% - >- ..\win32\configure.bat - --with-opt-dir=/usr/local + --with-opt-dir="/usr/local;c:/Tools/vcpkg/installed/%Platform%-windows" --with-openssl-dir=%OPENSSL_DIR:\=/% - nmake -l - nmake install-nodoc diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 28a07be9cd..4acb9b74fc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -64,7 +64,7 @@ jobs: ${{ runner.os }}-vcpkg-installed- - name: Install libraries with vcpkg run: | - vcpkg --triplet x64-windows install readline zlib + vcpkg --triplet x64-windows install libffi readline zlib - uses: actions/cache@v2 with: path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey @@ -104,10 +104,10 @@ jobs: set | C:\msys64\usr\bin\sort > new.env C:\msys64\usr\bin\comm -13 old.env new.env >> %GITHUB_ENV% del *.env + for %%I in (libffi) do mklink %%I.dll C:\vcpkg\installed\x64-windows\bin\%%I.dll - name: Configure run: >- ../src/win32/configure.bat --disable-install-doc - --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64" - run: nmake incs |