We couldn't use nmake before configure.bat

ruby · Jun 26, 2024 · d70057d · d70057d
1 parent 797e1df
commit d70057d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -142,7 +142,9 @@ jobs:
  run: cl
 
  - name: Install libraries with vcpkg
- run: nmake install-vcpkg
+ run: |
+ vcpkg install --triplet x64-windows
+ working-directory: src
  env:
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
@@ -161,6 +163,8 @@ jobs:
  ../src/win32/configure.bat --disable-install-doc
  --with-opt-dir=D:/a/ruby/ruby/src/vcpkg_installed/x64-windows
 
+ - run: nmake prepare-vcpkg
+
  - run: nmake incs
 
  - run: nmake extract-extlibs

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
@@ -597,8 +597,10 @@ update-vcpkg::
 
 install-vcpkg::
  @cd "$(srcdir:/=\)" && set LC_TIME=C && vcpkg install
- for %%I in ($(srcdir:/=\)\vcpkg_installed\x64-windows\bin\*.dll) do (
- if not %%~nI == readline mklink %%~nxI %%I
+
+prepare-vcpkg::
+ for %%I in ($(srcdir:/=\)\vcpkg_installed\x64-windows\bin\*.dll) do ( \
+ if not %%~nI == readline mklink %%~nxI %%I \
  )
 
 .PHONY: reconfig