diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f6cb09..35c33ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,13 +76,13 @@ jobs: uses: actions/checkout@v4 with: repository: 'Microsoft/vcpkg' - path: vcpkg/clone + path: vcpkg/repository - name: Setup vcpkg cache uses: actions/cache@v4 with: path: vcpkg/archives - key: ${{runner.os}}-${{matrix.arch}}-${{matrix.charset}}-${{hashFiles('vcpkg/overlay_*', 'vcpkg/clone/ports/curl', 'vcpkg/clone/ports/openssl', 'vcpkg/clone/ports/nghttp2', 'vcpkg/clone/ports/zlib', 'vcpkg/clone/ports/brotli', 'vcpkg/clone/ports/zstd')}} + key: ${{runner.os}}-${{matrix.arch}}-${{matrix.charset}}-${{hashFiles('vcpkg/overlay_*', 'vcpkg/repository/ports/curl', 'vcpkg/repository/ports/openssl', 'vcpkg/repository/ports/nghttp2', 'vcpkg/repository/ports/zlib', 'vcpkg/repository/ports/brotli', 'vcpkg/repository/ports/zstd')}} # ----------------------------------------------------------------------- - name: Build diff --git a/Directory.Build.props b/Directory.Build.props index a01aea1..7832e80 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ x86-windows-static x64-windows-static - $(SolutionDir)vcpkg\clone\ + $(SolutionDir)vcpkg\repository\ $(VcpkgRootDir)installed\$(VcpkgTriplet)\ x86 diff --git a/_build.bat b/_build.bat index a8641a8..2db585b 100644 --- a/_build.bat +++ b/_build.bat @@ -121,7 +121,7 @@ echo. set bindir=Release-%compiler%-%platform_nsis%-%charset% set pkgdir=packages\%configuration%-%compiler%-%platform_nsis%-%charset% set curldir=packages\%configuration%-%compiler%-%platform_nsis%-%charset%-curl -set vcpkginstdir=vcpkg\clone\installed\%triplet% +set vcpkginstdir=vcpkg\repository\installed\%triplet% rmdir /s /q %pkgdir% 2> nul diff --git a/src/nscurl/Makefile.windows b/src/nscurl/Makefile.windows index 219c613..4237340 100644 --- a/src/nscurl/Makefile.windows +++ b/src/nscurl/Makefile.windows @@ -52,7 +52,7 @@ STATIC = $(OUTDIR)/lib$(PROJECT).a # vcpkg VCPKG_TRIPLET = $(_arch)-mingw-static -VCPKG_INSTALLED = ../../vcpkg/clone/installed/$(VCPKG_TRIPLET) +VCPKG_INSTALLED = ../../vcpkg/repository/installed/$(VCPKG_TRIPLET) INC += -I$(VCPKG_INSTALLED)/include -I$(VCPKG_INSTALLED)/include/openssl ifeq ($(_config), debug) diff --git a/vcpkg/.gitignore b/vcpkg/.gitignore index 335de9c..c7d647a 100644 --- a/vcpkg/.gitignore +++ b/vcpkg/.gitignore @@ -1,3 +1,3 @@ /archives/ -/clone/ -/latest/ \ No newline at end of file +/latest/ +/repository/ \ No newline at end of file diff --git a/vcpkg/build.bat b/vcpkg/build.bat index f28a2b3..c826ca0 100644 --- a/vcpkg/build.bat +++ b/vcpkg/build.bat @@ -26,7 +26,7 @@ if /i "%compiler%" equ "mingw" set vcpkg_triplet=%arch%-mingw-%runtime% if /i "%compiler%" equ "msbuild" if /i "%runtime%" equ "static" set vcpkg_triplet=%arch%-windows-%runtime% if /i "%compiler%" equ "msbuild" if /i "%runtime%" equ "dynamic" set vcpkg_triplet=%arch%-windows -set vcpkg_dir=%~dp0clone +set vcpkg_dir=%~dp0repository REM | ------------------------------------------------------------------------- diff --git a/vcpkg/cleanup.bat b/vcpkg/cleanup.bat index 86ef29e..1c4ad60 100644 --- a/vcpkg/cleanup.bat +++ b/vcpkg/cleanup.bat @@ -12,8 +12,8 @@ echo. pushd "%~dp0" rd /q /s archives -rd /q /s clone rd /q /s latest +rd /q /s repository popd exit /b \ No newline at end of file