mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-26 17:09:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg_download_distfile] Make file name more unique (#25607)

Browse Source 
* [vcpkg_download_distfile] Add parameter `FILE_DISAMBIGUATOR`

* Add argument checks

* Make unparse args a fatal error

* Remove trailing ;

* Append instead of prepend hash

* Always append commit hash

* Only append file hash if hash differs from already installed file with same name
This commit is contained in:
Thomas1664 2022-08-02 00:14:44 +02:00 committed by GitHub
parent 6c6d01f07b
commit 48369f2a2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/cmake/vcpkg_download_distfile.cmake
View File

@ -1,3 +1,10 @@
function(z_vcpkg_check_hash result file_path sha512)
file(SHA512 "${file_path}" file_hash)
string(TOLOWER "${sha512}" sha512_lower)
string(COMPARE EQUAL "${file_hash}" "${sha512_lower}" hash_match)
set("${result}" "${hash_match}" PARENT_SCOPE)
endfunction()
function(z_vcpkg_download_distfile_test_hash file_path kind error_advice sha512 skip_sha512)
if(_VCPKG_INTERNAL_NO_HASH_CHECK)
# When using the internal hash skip, do not output an explicit message.
@ -8,9 +15,10 @@ function(z_vcpkg_download_distfile_test_hash file_path kind error_advice sha512
return()
endif()
file(SHA512 "${file_path}" file_hash)
string(TOLOWER "${sha512}" sha512_lower)
if(NOT "${file_hash}" STREQUAL "${sha512_lower}")
set(hash_match OFF)
z_vcpkg_check_hash(hash_match "${file_path}" "${sha512}")
if(NOT hash_match)
message(FATAL_ERROR
"\nFile does not have expected hash:\n"
" File path: [ ${file_path} ]\n"
@ -151,6 +159,22 @@ If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.")
endif()
set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}")
if(EXISTS "${downloaded_file_path}" AND NOT arg_SKIP_SHA512)
set(hash_match OFF)
z_vcpkg_check_hash(hash_match "${downloaded_file_path}" "${arg_SHA512}")
if(NOT hash_match)
get_filename_component(filename_component "${arg_FILENAME}" NAME_WE)
get_filename_component(extension_component "${arg_FILENAME}" EXT)
get_filename_component(directory_component "${arg_FILENAME}" DIRECTORY)
string(SUBSTRING "${arg_SHA512}" 0 8 hash)
set(arg_FILENAME "${directory_component}${filename_component}-${hash}${extension_component}")
set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}")
endif()
endif()
set(download_file_path_part "${DOWNLOADS}/temp/${arg_FILENAME}")
# Works around issue #3399