Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vcpkg_download_distfile] Fix the parameter mismatch issues of some internal functions and fix the recursive call (step 3) #20585

Merged
merged 12 commits into from
Nov 26, 2021
Merged

[vcpkg_download_distfile] Fix the parameter mismatch issues of some internal functions and fix the recursive call (step 3) #20585

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
407574d
[vcpkg_download_distfile] Fix incorrect arguments in z_vcpkg_download…
Oct 8, 2021
72b1e3c
Add parameter DISABLE_AIRA2 to avoid recursive calls
Oct 8, 2021
1df447d
Pass SKIP_SHA512
Oct 8, 2021
6f84f33
Update doc
Oct 8, 2021
334bcac
typo
Oct 9, 2021
5a19c30
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Oct 25, 2021
a9e1b37
Merge branch 'dev/jack/20574' of https://github.com/JackBoosY/vcpkg i…
Oct 25, 2021
48451e1
Use downloaded aria2, fix download for multiple url
Oct 25, 2021
e234b6a
typo
Oct 25, 2021
5aa1e68
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Nov 3, 2021
ec70dbc
Update vcpkg min release version 2021-11-02
Nov 5, 2021
3445ad7
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion scripts/cmake/vcpkg_download_distfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function(z_vcpkg_download_distfile_test_hash path kind error_advice sha512 skip_
" File path: [ ${file_path} ]\n"
" Expected hash: [ ${sha512} ]\n"
" Actual hash: [ ${file_hash} ]\n"
"${CUSTOM_ERROR_ADVICE}\n")
"${error_advice}\n")
endif()
endfunction()

Expand Down Expand Up @@ -140,6 +140,8 @@ function(z_vcpkg_download_distfile_via_aria filename urls headers sha512 skip_sh
"${DOWNLOADS}/temp/${filename}"
"downloaded file"
"The file may have been corrupted in transit."
"${sha512}"
${skip_sha512}
)
file(REMOVE
${DOWNLOADS}/download-${filename}-out.log
Expand Down Expand Up @@ -218,6 +220,8 @@ If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.")
"${downloaded_file_path}"
"cached file"
"Please delete the file and retry if this file should be downloaded again."
"${arg_SHA512}"
${arg_SKIP_SHA512}
)
set("${out_var}" "${downloaded_file_path}" PARENT_SCOPE)
return()
Expand Down