3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-13 20:28:26 +08:00
Code Issues Projects Releases Wiki Activity

Update vcpkg-tool to 2024-12-09.

Browse Source
This commit is contained in:
Billy O'Neal 2024-12-12 12:40:25 -08:00 committed by GitHub
commit 47344ab6d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/cmake/vcpkg_extract_archive.cmake
View File

@ -33,15 +33,9 @@ function(vcpkg_extract_archive)
/qn "TARGETDIR=${destination_native_path}"
WORKING_DIRECTORY "${archive_directory}"
)
elseif("${archive_extension}" MATCHES [[\.7z\.exe$]])
vcpkg_find_acquire_program(7Z)
elseif("${archive_extension}" MATCHES [[\.exe$]])
vcpkg_execute_in_download_mode(
COMMAND ${7Z} x
"${arg_ARCHIVE}"
"-o${arg_DESTINATION}"
-y -bso0 -bsp0
WORKING_DIRECTORY "${arg_DESTINATION}"
)
COMMAND "$ENV{VCPKG_COMMAND}" z-extract "${arg_ARCHIVE}" "${arg_DESTINATION}")
else()
vcpkg_execute_in_download_mode(
COMMAND "${CMAKE_COMMAND}" -E tar xzf "${arg_ARCHIVE}"

11
scripts/cmake/vcpkg_find_acquire_program(7Z).cmake
View File

@ -1,8 +1,9 @@
set(program_name 7z)
if(CMAKE_HOST_WIN32)
set(paths_to_search "${DOWNLOADS}/tools/7zip_msi-${tool_subdirectory}-windows/Files/7-Zip") # vcpkg fetch 7zip_msi path
list(APPEND paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/Files/7-Zip")
set(download_urls "https://github.com/ip7z/7zip/releases/download/24.09/7z2409.msi" "https://7-zip.org/a/7z2409.msi")
set(download_filename "7z2409.msi")
set(download_sha512 33448CC4EDB2550F1FE6C4BAC27C6F8D3E0D1985F7C6ABCF34AC83DFF650FB90B926F65A4553DA4E92868F507DE4DFAD87E5A38B3ED8C68668B983105BB39224)
set(tool_subdirectory "24.09")
set(paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/7z2409/SourceDir/Files/7-Zip")
set(download_urls "https://github.com/ip7z/7zip/releases/download/24.09/7z2409.exe")
set(download_filename "7z2409.7z.exe")
set(search_names "7z.exe")
set(download_sha512 a39a84b13b383ac5fca20eb6d92ec6b8bc85f1b6a545c441efdbe054d8d12c9ebe97d366235bdf1383bbdb2a9666d18d0145b10b6e589180502c0c2dfa26ef14)
endif()

4
scripts/cmake/vcpkg_find_acquire_program(CLANG).cmake
View File

@ -19,11 +19,11 @@ if(CMAKE_HOST_WIN32)
if(host_arch MATCHES "64")
set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win64.exe")
set(download_filename "LLVM-${program_version}-win64.7z.exe")
set(download_filename "LLVM-${program_version}-win64.exe")
set(download_sha512 2dd6f3eea106f2b905e6658ea5ea12856d17285adbfba055edc2d6b6389c4c2f7aa001df5cb0d8fb84fa7fa47d5035a7fddf276523b472dd55f150ae25938768)
else()
set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win32.exe")
set(download_filename "LLVM-${program_version}-win32.7z.exe")
set(download_filename "LLVM-${program_version}-win32.exe")
set(download_sha512 90225D650EADB0E590A9912B479B46A575D41A19EB5F2DA03C4DC8B032DC0790222F0E3706DFE2A35C0E7747941972AC26CB47D3EB13730DB76168931F37E5F1)
endif()
endif()

10
scripts/vcpkg-tool-metadata.txt
View File

@ -1,5 +1,5 @@
VCPKG_TOOL_RELEASE_TAG=2024-11-12
VCPKG_MACOS_SHA=09f0c1dcb8d86adc34531816928c8bc2f83f6584cefd65b606dce991ee868d86386bbb5e7054fe8b62972f02b7f05636dd06e8691449e80957e7cd20f8139cc7
VCPKG_MUSLC_SHA=615f5688faa77b99968c6c55890a93eda9eb5fbc4005556f7b3ef358e17ac1ab194ec3177ffbd60d703e4940ce7334eafa948e4cb3ee1b0117685da40177aefa
VCPKG_GLIBC_SHA=c0484b64a70b146206e0273e92767e7a611e0d9540495602b73f01c25e63f1d07f971e2661f29b62a0c92641c24739189642baec91545ed864123bc019db86ff
VCPKG_TOOL_SOURCE_SHA=da376da67ece521e3197be9e1f7b637405f1ca314fad6937ae7ee08baaebb6cebb1336e16d43667bd9ce329a613c6a65f6d0fa2d22940261bb975a3258f2c8d0
VCPKG_TOOL_RELEASE_TAG=2024-12-09
VCPKG_MACOS_SHA=771f18188cbfd312b833a88a2dfe91bffefe54f7c264e6d3ce8f5b477d98d3a144e9e228e33a5c58de205be970fa701b34acdd08354935926b3a6f485ef630e8
VCPKG_MUSLC_SHA=1240c124f82c679f2deb5fd3485ccec9540474776146711b3c8637391fbb2b75534e3bf8a3572c5a6c0f3789fc9f8461989f56ffdb5781fa89f19e8e6d5c91bb
VCPKG_GLIBC_SHA=1084ea358d00d23795d7ea8359001fd72b0cb09ff7edc29f722d5ba6b8949e9ea32d5755b270fe7f4eef1d16361594962ab38445ea67e772ddd2408d72ab2c95
VCPKG_TOOL_SOURCE_SHA=d93f45ce2aa1d2226927553378bda869f8933206aeda83db5785cba0217c790f309e5596b878e21f94bda7bf280f817aee41eb704da3bb015b69fc5e565d0fea

8
scripts/vcpkgTools.xml
View File

@ -139,10 +139,10 @@
</tool>
<tool name="7zip" os="windows">
<version>24.09</version>
<exeRelativePath>7za.exe</exeRelativePath>
<url>https://github.com/ip7z/7zip/releases/download/24.09/7z2409-extra.7z</url>
<sha512>d17ef51ebe5e61761fa449c0d6106950e7e8dd9ef9bb9f129aed048f3d8d81662ba82a71e8264fff7c0f6764f410f2e8a4430d27e4ce915cf339e8d639905b3b</sha512>
<archiveName>7z2409-extra.7z</archiveName>
<exeRelativePath>7z.exe</exeRelativePath>
<url>https://github.com/ip7z/7zip/releases/download/24.09/7z2409.exe</url>
<sha512>a39a84b13b383ac5fca20eb6d92ec6b8bc85f1b6a545c441efdbe054d8d12c9ebe97d366235bdf1383bbdb2a9666d18d0145b10b6e589180502c0c2dfa26ef14</sha512>
<archiveName>7z2409.7z.exe</archiveName>
</tool>
<tool name="7zr" os="windows">
<version>24.09</version>