From 3271b2886466e3108460000d0232b2c88d7bd62d Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Sat, 6 Sep 2025 15:20:17 +0800 Subject: [PATCH] ci/windows: Update documents to use winget Signed-off-by: Yonggang Luo Reviewed-by: Jesse Natalie Part-of: --- .gitlab-ci/windows/README.md | 2 +- docs/meson.rst | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/windows/README.md b/.gitlab-ci/windows/README.md index caf7c8f0b29..8c8780a3ada 100644 --- a/.gitlab-ci/windows/README.md +++ b/.gitlab-ci/windows/README.md @@ -19,7 +19,7 @@ the image is rebuilt inside the user's namespace. The rebuild executes `docker build` which calls `mesa_deps.ps1` inside the container to fetch and install all build dependencies. This includes Visual Studio Community Edition (downloaded from Microsoft, under the license which -allows use by open-source projects), other build tools from Chocolatey, and +allows use by open-source projects), other build tools from winget, and finally Meson and Python dependencies from PyPI. This job is executed inside a Windows shell environment directly inside the diff --git a/docs/meson.rst b/docs/meson.rst index 3aca8f43142..f2ba9e4772c 100644 --- a/docs/meson.rst +++ b/docs/meson.rst @@ -111,18 +111,18 @@ You will need to install Python 3 and Meson as a module using pip. This is because we use Python for generating code, and rely on external modules (Mako). You also need pkg-config (a hard dependency of Meson), Flex, and Bison. The easiest way to install everything you need is with -`Chocolatey `__. +`WinGet `__. .. code-block:: sh - choco install python3 winflexbison pkgconfiglite + winget install python3 WinFlexBison.win_flex_bison bloodrock.pkg-config-lite -You can even use Chocolatey to install MinGW and Ninja (Ninja can be +You can even use WinGet to install MinGW and Ninja (Ninja can be used with MSVC as well) .. code-block:: sh - choco install ninja mingw + winget install Ninja-build.Ninja MartinStorsjo.LLVM-MinGW.UCRT Then install Meson using pip @@ -217,7 +217,7 @@ Windows specific instructions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ On Windows you have a couple of choices for compilers. If you installed -MinGW with Chocolatey and want to use Ninja you should be able to open +MinGW with winget and want to use Ninja you should be able to open any shell and follow the instructions above. If you want to you MSVC, clang-cl, or ICL (the Intel Compiler), read on.