winget based setup: don't manually pull meson, use the build's copy

meson is available as an external module/it just needs to be extracted.
That simplifies quite a few things, not to mention a new bug where
specifying it like that would strip the slashes, so if it should be used
manually the mixed style path needs to be used.

Change-Id: Icc39db01c2bc484a64bea76ce68b7dfcb6e5d353
This commit is contained in:
Christian Lohmaier
2025-08-25 23:11:33 +02:00
parent 846998194b
commit 0a5b17c722
2 changed files with 0 additions and 22 deletions
-10
View File
@@ -79,16 +79,6 @@ properties:
Uri: https://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar
ChecksumType: SHA256
Checksum: 36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
- resource: xPSDesiredStateConfiguration/xRemoteFile
id: meson
directives:
description: download meson
securityContext: elevated
settings:
DestinationPath: C:/Users/Public/Downloads/meson-1.7.2.zip
Uri: https://github.com/mesonbuild/meson/archive/refs/tags/1.7.2.zip
ChecksumType: SHA256
Checksum: c6395019029f19945f61f5b9b551c7c10d9d1b2970f89be86da25a4cf2a6119c
- resource: xPSDesiredStateConfiguration/xMsiPackage
id: JDK_x64
directives:
-12
View File
@@ -23,7 +23,6 @@ properties:
"jom_1_1_4.zip",
"junit-4.10.jar",
"make-4.2.1-msvc.exe",
"meson-1.7.2.zip",
"pkgconf-2.4.3.exe",
"strawberry-perl-5.40.0.1-64bit-portable.zip",
"")
@@ -104,16 +103,6 @@ properties:
TestScript: Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.15/bin/ant"
GetScript: Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.15/bin/ant"
SetScript: Expand-Archive -LiteralPath "$env:PUBLIC/Downloads/apache-ant-1.10.15-bin.zip" -Destination "$env:USERPROFILE/lo/"
- resource: xPSDesiredStateConfiguration/xScript
id: meson-extract
dependsOn:
- lodir
directives:
description: extract meson to the ~/lo directory
settings:
TestScript: Test-Path -Path "$env:USERPROFILE/lo/meson-1.7.2/meson.py"
GetScript: Test-Path -Path "$env:USERPROFILE/lo/meson-1.7.2/meson.py"
SetScript: Expand-Archive -LiteralPath "$env:PUBLIC/Downloads/meson-1.7.2.zip" -Destination "$env:USERPROFILE/lo/"
- resource: xPSDesiredStateConfiguration/xScript
id: spp-extract
dependsOn:
@@ -187,7 +176,6 @@ properties:
#--disable-dependency-tracking
#--enable-dbgutil
#--with-lang=fr ja
MESON=$env:USERPROFILE\lo\meson-1.7.2\meson.py
PKG_CONFIG=pkgconf-2.4.3.exe
"
- resource: xPSDesiredStateConfiguration/xScript