From cd6cbe67d12d1cc4fd02144a62f1d8306e89f097 Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Mon, 3 Mar 2025 17:39:41 -0500 Subject: [PATCH 1/2] winget: Fix meson installation Without this change, meson will not be installed automatically. Also update meson package check on CI. --- .Wingetfile | 2 +- utils.pwsh/Install-BuildDependencies.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.Wingetfile b/.Wingetfile index 0f753e5db..096a232dc 100644 --- a/.Wingetfile +++ b/.Wingetfile @@ -1,4 +1,4 @@ package '7zip.7zip', path: '7-zip', bin: '7z' package 'cmake', path: 'Cmake\bin', bin: 'cmake' package 'MSYS2.MSYS2', path: 'C:\msys64\usr\bin', bin 'bash' -package 'meson', path: 'Meson', bin 'meson' +package 'mesonbuild.meson', path: 'Meson', bin 'meson' diff --git a/utils.pwsh/Install-BuildDependencies.ps1 b/utils.pwsh/Install-BuildDependencies.ps1 index 3c0cb446e..74396f7a3 100644 --- a/utils.pwsh/Install-BuildDependencies.ps1 +++ b/utils.pwsh/Install-BuildDependencies.ps1 @@ -72,7 +72,7 @@ function Install-BuildDependencies { Invoke-External winget @Params } else { - if ( $Package -eq 'meson' ) { + if ( $Package -eq 'mesonbuild.meson' ) { python3 -m pip install meson } } From 36462d48b4ce4f4b695465ba1eb2722ebc9eddfa Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Mon, 3 Mar 2025 17:44:35 -0500 Subject: [PATCH 2/2] winget: Unify file syntax Always use a colon after the label. --- .Wingetfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.Wingetfile b/.Wingetfile index 096a232dc..43798b845 100644 --- a/.Wingetfile +++ b/.Wingetfile @@ -1,4 +1,4 @@ -package '7zip.7zip', path: '7-zip', bin: '7z' -package 'cmake', path: 'Cmake\bin', bin: 'cmake' -package 'MSYS2.MSYS2', path: 'C:\msys64\usr\bin', bin 'bash' -package 'mesonbuild.meson', path: 'Meson', bin 'meson' +package: '7zip.7zip', path: '7-zip', bin: '7z' +package: 'cmake', path: 'Cmake\bin', bin: 'cmake' +package: 'MSYS2.MSYS2', path: 'C:\msys64\usr\bin', bin: 'bash' +package: 'mesonbuild.meson', path: 'Meson', bin: 'meson'