[前][次][番号順一覧][スレッド一覧]

ruby-changes:71105

From: Nobuyoshi <ko1@a...>
Date: Mon, 7 Feb 2022 15:31:12 +0900 (JST)
Subject: [ruby-changes:71105] 0169380741 (master): Appveyor: Link vcpkg DLLs except for readline

https://git.ruby-lang.org/ruby.git/commit/?id=0169380741

From 01693807415a90d39742a3c3391f942287358af8 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 7 Feb 2022 15:30:07 +0900
Subject: Appveyor: Link vcpkg DLLs except for readline

---
 .appveyor.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e88245db8e..1f179143c8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -49,7 +49,6 @@ for: https://github.com/ruby/ruby/blob/trunk/.appveyor.yml#L49
     - .\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%'
@@ -73,6 +72,9 @@ for: https://github.com/ruby/ruby/blob/trunk/.appveyor.yml#L72
     - if not exist %ZLIB_ZIP% curl -fsSL -o %ZLIB_ZIP% --retry 10 https://zlib.net/zlib%zlib_version:.=%.zip
     - 7z x -aos -o%APPVEYOR_BUILD_FOLDER%\ext\zlib %ZLIB_ZIP%
     - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
+    - for %%I in (c:\Tools\vcpkg\installed\%Platform%-windows\bin\*.dll) do (
+        if not %%~nI == readline mklink \usr\local\bin\%%~nxI %%I
+      )
     - attrib +r /s /d
     - mkdir %Platform%-mswin_%vs%
   build_script:
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]