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.

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

Move vcpkgTools.xml into the tool and better support for arm64-linux #1490

Open
wants to merge 15 commits into
base: main
Choose a base branch
from

Conversation

data-queue
Copy link
Contributor

This PR contains several changes:

  1. Moves vcpkgTools.xml data into the tool. This will remove our XML regex parsing logic, and make it easier to add logic on what tools to install on which platforms.
  2. Adds the architecture field into the tool data, so we can filter by architecture.
  3. Adds the arm64 linux tool for CMake.
  4. Removes the requirement of force system binaries on arm64 linux platforms since we are now acquiring tools

Related: #1277

Followup PRs:
Ninja does not support arm64 linux on vcpkg's current version. I will be making a PR to update Ninja and add architecture support for arm64 linux.

src/vcpkg/tools.cpp Outdated Show resolved Hide resolved
src/vcpkg/tools.cpp Outdated Show resolved Hide resolved
src/vcpkg/tools.cpp Outdated Show resolved Hide resolved
…the search loop, and get rid of magic numbers that is the length of the table.
@autoantwort
Copy link
Contributor

Hm I would prefer if the vcpkg-tool would get the data via a json file. With a separate file it would be easy to workaround if one of the domains is offline or otherwise broken, to replace an url with an internal version or to test a new version of a tool.

data-queue and others added 4 commits September 24, 2024 11:14
Make the table be static data, deduplicate part of the expression in the search loop, and get rid of magic numbers that is the length of the table.
@Neumann-A
Copy link
Contributor

With a separate file it would be easy to workaround if one of the domains is offline or otherwise broken, to replace an url with an internal version or to test a new version of a tool.

Especially updating CMake requires testing with a world rebuild before merging it.

+1 on the json part since vcpkg already knows how to parse json. But yeah you are just transforming a tools.xml to a tools.json

BillyONeal added a commit to BillyONeal/vcpkg-tool that referenced this pull request Oct 10, 2024
Extracted from microsoft#1490 as it's unclear when that change will land.
BillyONeal added a commit that referenced this pull request Oct 23, 2024
Extracted from #1490 as it's unclear when that change will land.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants