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

azure-pipelines/end-to-end-tests-dir/fetch.ps1

@@ -6,90 +6,42 @@ if (-not $IsMacOS -and -not $IsLinux) {
     $Scripts = Join-Path $TestingRoot "scripts"
     mkdir $Scripts | Out-Null
 
-@"
-<?xml version="1.0"?>
-<tools version="2">
-    <tool name="7zip" os="windows">
-        <version>19.00</version>
-        <exeRelativePath>Files\7-Zip\7z.exe</exeRelativePath>
-        <url>https://www.7-zip.org/a/7z1900-x64.msi</url>
-        <sha512>7837a8677a01eed9c3309923f7084bc864063ba214ee169882c5b04a7a8b198ed052c15e981860d9d7952c98f459a4fab87a72fd78e7d0303004dcb86f4324c8</sha512>
-        <archiveName>7z1900-x64.msi</archiveName>
-    </tool>
-    <tool name="ninja-testing" os="windows">
-        <version>1.10.2</version>
-        <exeRelativePath>ninja.exe</exeRelativePath>
-        <url>https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip</url>
-        <sha512>6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3</sha512>
-        <archiveName>ninja-win-1.10.2.zip</archiveName>
-    </tool>
-    <tool name="ninja" os="windows">
-        <version>1.10.2</version>
-        <exeRelativePath>ninja.exe</exeRelativePath>
-        <url>https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip</url>
-        <sha512>6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3</sha512>
-        <archiveName>ninja-win-1.10.2.zip</archiveName>
-    </tool>
-    <tool name="cmake" os="windows">
-        <version>3.22.2</version>
-        <exeRelativePath>cmake-3.22.2-windows-i386\bin\cmake.exe</exeRelativePath>
-        <url>https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-windows-i386.zip</url>
-        <sha512>969d3d58d56d8fa3cc3acae2b949bf58abab945f70ae292ff20c9060d845dfc094c613c367a924abff47f307cc33af1467cdb9b75bb857868e38b2c7cdc72f79</sha512>
-        <archiveName>cmake-3.22.2-windows-i386.zip</archiveName>
-    </tool>
-    <tool name="cmake" os="osx">
-        <version>3.22.2</version>
-        <exeRelativePath>cmake-3.22.2-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
-        <url>https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-macos-universal.tar.gz</url>
-        <sha512>08104f608ecb9a5cfef38e79f0957d21e425616c0677781445492f82cbfec805113e3b5eb4bc737b707bb26a00678e7bd55e17555a5611c08b0b9b44ac5136ac</sha512>
-        <archiveName>cmake-3.22.2-macos-universal.tar.gz</archiveName>
-    </tool>
-    <tool name="cmake" os="linux">
-        <version>3.22.2</version>
-        <exeRelativePath>cmake-3.22.2-linux-x86_64/bin/cmake</exeRelativePath>
-        <url>https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.tar.gz</url>
-        <sha512>579e08b086f6903ef063697fca1dc2692f68a7341dd35998990b772b4221cdb5b1deecfa73bad9d46817ef09e58882b2adff9d64f959c01002c11448a878746b</sha512>
-        <archiveName>cmake-3.22.2linux-x86_64.tar.gz</archiveName>
-    </tool>
-    <tool name="cmake" os="freebsd">
-        <version>3.20.4</version>
-        <exeRelativePath>usr/local/bin/cmake</exeRelativePath>
-        <url>https://pkg.freebsd.org/FreeBSD:13:amd64/quarterly/All/cmake-3.20.4.txz</url>
-        <sha512>3e5b675d7ff924f92996d912e2365582e687375109ef99c9073fb8196bb329243a406b218cf1358d7cc518988b311ce9e5bf87de4d64f2e6377b7c2bc8894475</sha512>
-        <archiveName>cmake-3.20.4.txz</archiveName>
-    </tool>
-</tools>
-"@ | % { $_ -replace "`r","" } | Out-File -enc ascii $(Join-Path $Scripts "vcpkgTools.xml")
+    $7zip_version = "24.08"
+    $ninja_version = "1.11.1"
 
     $env:VCPKG_DOWNLOADS = Join-Path $TestingRoot 'down loads'
+    $env:VCPKG_FORCE_DOWNLOADED_BINARIES = "1"
     Run-Vcpkg -TestArgs ($commonArgs + @("fetch", "7zip", "--vcpkg-root=$TestingRoot"))
     Throw-IfFailed
-    Require-FileExists "$TestingRoot/down loads/tools/7zip-19.00-windows/Files/7-Zip/7z.exe"
+    Require-FileExists "$TestingRoot/down loads/tools/7zip-${7zip_version}-windows/7za.exe"
 
-    Run-Vcpkg -TestArgs ($commonArgs + @("fetch", "ninja-testing", "--vcpkg-root=$TestingRoot"))
+    Run-Vcpkg -TestArgs ($commonArgs + @("fetch", "ninja", "--vcpkg-root=$TestingRoot"))
     Throw-IfFailed
-    Require-FileExists "$TestingRoot/down loads/tools/ninja-testing-1.10.2-windows/ninja.exe"
+    Require-FileExists "$TestingRoot/down loads/tools/ninja-${ninja_version}-windows/ninja.exe"
 
+    mkdir "$TestingRoot/down loads/tools/ninja-testing-${ninja_version}-windows" | Out-Null
+    Move-Item -Path "$TestingRoot/down loads/tools/ninja-${ninja_version}-windows/ninja.exe" -Destination "$TestingRoot/down loads/tools/ninja-testing-${ninja_version}-windows/ninja.exe"
     $path = $env:PATH
+    Remove-Item env:VCPKG_FORCE_DOWNLOADED_BINARIES
 
-    $env:PATH = "$path;$TestingRoot/down loads/tools/ninja-testing-1.10.2-windows"
+    $env:PATH = "$path;$TestingRoot/down loads/tools/ninja-testing-${ninja_version}-windows"
     Run-Vcpkg -TestArgs ($commonArgs + @("fetch", "ninja", "--vcpkg-root=$TestingRoot"))
     Throw-IfFailed
-    Require-FileNotExists "$TestingRoot/down loads/tools/ninja-1.10.2-windows/ninja.exe"
+    Require-FileNotExists "$TestingRoot/down loads/tools/ninja-${ninja_version}-windows/ninja.exe"
 
     $env:VCPKG_FORCE_DOWNLOADED_BINARIES = "1"
     Run-Vcpkg -TestArgs ($commonArgs + @("fetch", "ninja", "--vcpkg-root=$TestingRoot"))
     Throw-IfFailed
-    Require-FileExists "$TestingRoot/down loads/tools/ninja-1.10.2-windows/ninja.exe"
+    Require-FileExists "$TestingRoot/down loads/tools/ninja-${ninja_version}-windows/ninja.exe"
 
-    Remove-Item -Recurse -Force "$TestingRoot/down loads/tools/ninja-1.10.2-windows" -ErrorAction SilentlyContinue
+    Remove-Item -Recurse -Force "$TestingRoot/down loads/tools/ninja-${ninja_version}-windows" -ErrorAction SilentlyContinue
     Remove-Item env:VCPKG_FORCE_DOWNLOADED_BINARIES
 
     $env:VCPKG_FORCE_SYSTEM_BINARIES = "1"
     $env:PATH = "$PSScriptRoot\..\e2e-assets\fetch;$path"
     Run-Vcpkg -TestArgs ($commonArgs + @("fetch", "ninja", "--vcpkg-root=$TestingRoot"))
     Throw-IfFailed
-    Require-FileNotExists "$TestingRoot/down loads/tools/ninja-1.10.2-windows/ninja.exe"
+    Require-FileNotExists "$TestingRoot/down loads/tools/ninja-${ninja_version}-windows/ninja.exe"
 
     Remove-Item env:VCPKG_FORCE_SYSTEM_BINARIES
     $out = Run-VcpkgAndCaptureOutput -TestArgs ($commonArgs + @("fetch", "ninja", "--vcpkg-root=$TestingRoot", "--x-stderr-status"))

include/vcpkg/base/message-data.inc.h

@@ -924,10 +924,6 @@ DECLARE_MESSAGE(CouldNotFindGitTreeAtCommit,
                 (msg::package_name, msg::commit_sha),
                 "",
                 "could not find the git tree for `versions` in repo {package_name} at commit {commit_sha}")
-DECLARE_MESSAGE(CouldNotFindToolVersion,
-                (msg::version, msg::path),
-                "",
-                "Could not find <tools version=\"{version}\"> in {path}")
 DECLARE_MESSAGE(CouldNotFindVersionDatabaseFile, (msg::path), "", "Couldn't find the versions database file: {path}")
 DECLARE_MESSAGE(CreatedNuGetPackage, (msg::path), "", "Created nupkg: {path}")
 DECLARE_MESSAGE(CreateFailureLogsDir, (msg::path), "", "Creating failure logs output directory {path}.")
@@ -2988,11 +2984,6 @@ DECLARE_MESSAGE(VersionCommandHeader,
                 (msg::version),
                 "",
                 "vcpkg package management program version {version}\n\nSee LICENSE.txt for license information.")
-DECLARE_MESSAGE(
-    VersionConflictXML,
-    (msg::path, msg::expected_version, msg::actual_version),
-    "",
-    "Expected {path} version: [{expected_version}], but was [{actual_version}]. Please re-run bootstrap-vcpkg.")
 DECLARE_MESSAGE(VersionConstraintNotInDatabase1,
                 (msg::package_name, msg::version),
                 "",

include/vcpkg/tools.h

@@ -62,7 +62,6 @@ namespace vcpkg
     std::unique_ptr<ToolCache> get_tool_cache(const Filesystem& fs,
                                               std::shared_ptr<const DownloadManager> downloader,
                                               Path downloads,
-                                              Path xml_config,
                                               Path tools,
                                               RequireExactVersions abiToolVersionHandling);
 }

include/vcpkg/tools.test.h

@@ -29,7 +29,5 @@ namespace vcpkg
         Path exe_path(const Path& tools_base_path) const { return tools_base_path / tool_dir_subpath / exe_subpath; }
     };
 
-    Optional<ToolData> parse_tool_data_from_xml(StringView XML, StringView XML_PATH, StringView tool, StringView os);
-
     Optional<std::array<int, 3>> parse_tool_version_string(StringView string_version);
 }

locales/messages.json

@@ -531,8 +531,6 @@
   "_CouldNotFindBaselineInCommit.comment": "An example of {url} is https://github.com/microsoft/vcpkg. An example of {commit_sha} is 7cfad47ae9f68b183983090afd6337cd60fd4949. An example of {package_name} is zlib.",
   "CouldNotFindGitTreeAtCommit": "could not find the git tree for `versions` in repo {package_name} at commit {commit_sha}",
   "_CouldNotFindGitTreeAtCommit.comment": "An example of {package_name} is zlib. An example of {commit_sha} is 7cfad47ae9f68b183983090afd6337cd60fd4949.",
-  "CouldNotFindToolVersion": "Could not find <tools version=\"{version}\"> in {path}",
-  "_CouldNotFindToolVersion.comment": "An example of {version} is 1.3.8. An example of {path} is /foo/bar.",
   "CouldNotFindVersionDatabaseFile": "Couldn't find the versions database file: {path}",
   "_CouldNotFindVersionDatabaseFile.comment": "An example of {path} is /foo/bar.",
   "CreateFailureLogsDir": "Creating failure logs output directory {path}.",
@@ -1587,8 +1585,6 @@
   "_VersionBuiltinPortTreeEntryMissing.comment": "{expected} and {actual} are versions like 1.0. An example of {package_name} is zlib.",
   "VersionCommandHeader": "vcpkg package management program version {version}\n\nSee LICENSE.txt for license information.",
   "_VersionCommandHeader.comment": "An example of {version} is 1.3.8.",
-  "VersionConflictXML": "Expected {path} version: [{expected_version}], but was [{actual_version}]. Please re-run bootstrap-vcpkg.",
-  "_VersionConflictXML.comment": "An example of {path} is /foo/bar. An example of {expected_version} is 1.3.8. An example of {actual_version} is 1.3.8.",
   "VersionConstraintNotInDatabase1": "the \"version>=\" constraint to {package_name} names version {version} which does not exist in the version database. All versions must exist in the version database to be interpreted by vcpkg.",
   "_VersionConstraintNotInDatabase1.comment": "An example of {package_name} is zlib. An example of {version} is 1.3.8.",
   "VersionConstraintNotInDatabase2": "consider removing the version constraint or choosing a value declared here",

src/vcpkg-test/tools.cpp

@@ -41,81 +41,6 @@ Copyright (C) 2006, 2019 Tatsuhiro Tsujikawa)");
     CHECK_FALSE(result.has_value());
 }
 
-TEST_CASE ("parse_tool_data_from_xml", "[tools]")
-{
-    const StringView tool_doc = R"(
-<?xml version="1.0"?>
-<tools version="2">
-    <tool name="git" os="linux">
-        <version>2.7.4</version>
-        <exeRelativePath></exeRelativePath>
-        <url></url>
-        <sha512></sha512>
-    </tool>
-    <tool name="nuget" os="osx">
-        <version>5.11.0</version>
-        <exeRelativePath>nuget.exe</exeRelativePath>
-        <url>https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe</url>
-        <sha512>06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7</sha512>
-    </tool>
-    <tool name="node" os="windows">
-        <version>16.12.0</version>
-        <exeRelativePath>node-v16.12.0-win-x64\node.exe</exeRelativePath>
-        <url>https://nodejs.org/dist/v16.12.0/node-v16.12.0-win-x64.7z</url>
-        <sha512>0bb793fce8140bd59c17f3ac9661b062eac0f611d704117774f5cb2453d717da94b1e8b17d021d47baff598dc023fb7068ed1f8a7678e446260c3db3537fa888</sha512>
-        <archiveName>node-v16.12.0-win-x64.7z</archiveName>
-    </tool>
-</tools>
-)";
-
-    {
-        auto data = parse_tool_data_from_xml(tool_doc, "vcpkgTools.xml", "tool1", "windows");
-        REQUIRE(!data.has_value());
-    }
-    {
-        auto data = parse_tool_data_from_xml(tool_doc, "vcpkgTools.xml", "node", "unknown");
-        REQUIRE(!data.has_value());
-    }
-    {
-        auto data = parse_tool_data_from_xml(tool_doc, "vcpkgTools.xml", "node", "windows");
-        REQUIRE(data.has_value());
-        auto& p = *data.get();
-        CHECK(p.is_archive);
-        CHECK(p.version == decltype(p.version){16, 12, 0});
-        CHECK(p.tool_dir_subpath == "node-16.12.0-windows");
-        CHECK(p.exe_subpath == "node-v16.12.0-win-x64\\node.exe");
-        CHECK(p.download_subpath == "node-v16.12.0-win-x64.7z");
-        CHECK(p.sha512 == "0bb793fce8140bd59c17f3ac9661b062eac0f611d704117774f5cb2453d717da94b1e8b17d021d47baff598dc023"
-                          "fb7068ed1f8a7678e446260c3db3537fa888");
-        CHECK(p.url == "https://nodejs.org/dist/v16.12.0/node-v16.12.0-win-x64.7z");
-    }
-    {
-        auto data = parse_tool_data_from_xml(tool_doc, "vcpkgTools.xml", "nuget", "osx");
-        REQUIRE(data.has_value());
-        auto& p = *data.get();
-        CHECK_FALSE(p.is_archive);
-        CHECK(p.version == decltype(p.version){5, 11, 0});
-        CHECK(p.tool_dir_subpath == "nuget-5.11.0-osx");
-        CHECK(p.exe_subpath == "nuget.exe");
-        CHECK(p.download_subpath == "06a337c9-nuget.exe");
-        CHECK(p.sha512 == "06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda8"
-                          "3b64c03ce14c8f35ca9957a17a8c02b8c4b7");
-        CHECK(p.url == "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe");
-    }
-    {
-        auto data = parse_tool_data_from_xml(tool_doc, "vcpkgTools.xml", "git", "linux");
-        REQUIRE(data.has_value());
-        auto& p = *data.get();
-        CHECK_FALSE(p.is_archive);
-        CHECK(p.version == decltype(p.version){2, 7, 4});
-        CHECK(p.tool_dir_subpath == "git-2.7.4-linux");
-        CHECK(p.exe_subpath == "");
-        CHECK(p.download_subpath == "");
-        CHECK(p.sha512 == "");
-        CHECK(p.url == "");
-    }
-}
-
 TEST_CASE ("extract_prefixed_nonwhitespace", "[tools]")
 {
     CHECK(extract_prefixed_nonwhitespace("fooutil version ", "fooutil", "fooutil version 1.2", "fooutil.exe")

src/vcpkg.cpp

@@ -270,7 +270,7 @@ int main(const int argc, const char* const* const argv)
 
     register_console_ctrl_handler();
 
-#if (defined(__aarch64__) || defined(__arm__) || defined(__s390x__) || defined(__riscv) ||                             \
+#if (defined(__arm__) || defined(__s390x__) || defined(__riscv) ||                                                     \
      ((defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || defined(__PPC64LE__)) &&                    \
       defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) ||                                       \
      defined(_M_ARM) || defined(_M_ARM64)) &&                                                                          \