[vcpkg script] ninja 1.12#41980
Conversation
Fixes microsoft#38494 Resurrects microsoft#38538 Co-authored-by: xb284524239 <40262910+xb284524239@users.noreply.github.com>
|
android: Unrelated baseline regressions. windows: qt5-webengine
... proposal: add legacy ninja as a per-port download. |
Maybe we should skip it given qt5's status at this point. |
qt 5.15.16 was just released. qt5 will stay for a while, also for targeting older devices which cannot run the latest macOS or android (if only vcpkg would support cross builds for qt5). |
|
And marking qt5-webengine as Yeah, breaking one of the long-path victims by use of the new version of ninja which improves long-path issues is a nice dilemma. |
To be clear, I only mean qt5-webengine, not all of qt5. We are already considering skipping it because the |
| @@ -1,17 +1,29 @@ | |||
| set(program_name ninja) | |||
There was a problem hiding this comment.
I feel like this should use vcpkg fetch ninja somehow so that the ninja in the executable and the ninja provided by the script are defined to be the same.
There was a problem hiding this comment.
They are different before this PR and the same with this PR ;-)
There was a problem hiding this comment.
I am still for using $ENV{VCPKG_COMMAND} fetch ninja somehow instead of duplicating the download info.
There was a problem hiding this comment.
Me too, but I am not able to implement this change soon, and there is no example.
This PR should be merged in the next windows of no-baseline-regressions, instead of being delayed.
There was a problem hiding this comment.
set(program_name ninja) # Required by vcpkg_find_acquire_program logic
vcpkg_execute_in_download_mode(
COMMAND "$ENV{VCPKG_COMMAND}" fetch ninja
RESULT_VARIABLE error_code
OUTPUT_VARIABLE NINJA
WORKING_DIRECTORY "${DOWNLOADS}"
)
string(STRIP "${NINJA}" NINJA) # vcpkg output has a strange line endings and whitespaces in there?
#set(NINJA "${NINJA}" CACHE STRING "") # does not seem required.
you can replace the complete code with this.
|
Waiting for #42588. |
Since that PR was merged, is there anything else holding this back? |
|
All checks green 🎉 |
|
Now it probabaly has to wait for #43209 to land, for the tools xml->json transition. |
I don't think we need to wait for another world rebuild though. |
|
I just tried to merge this but github is angry at the moment... will try again in a bit Edit: You don't say? |
# Conflicts: # scripts/vcpkgTools.xml
|
The 2 build failures appear to be baseline issues, so I merged through them. |
VCPKG upgraded it's ninja version to 1.12.1 in microsoft/vcpkg@f576077 / microsoft#41980 . FreeBSD had ninja-1.12.1 in it's third party package repository, but reverted it to 1.11.0 (freebsd/freebsd-ports@1e1a1e9), as issues with ccache were discovered when using ninja-1.12.1. vcpkg does not deploy ninja on FreeBSD, and does not accept the version found on the system, either. Remove the version check on FreeBSD's branch, to allow vcpkg to use the pkg/ports version even if it is "outdated".
Reprise from #39260.