summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL. E. Segovia <amy@centricular.com>2024-12-10 13:20:06 -0300
committerL. E. Segovia <amy@centricular.com>2024-12-10 13:20:06 -0300
commit4c39c04814e717aec5e370ac333e9353561a3081 (patch)
treececb9c485bdb692ada91fddd9e3414e03f0f63b7
parent0d30d14e196bde5240fbe505654e673d40d86d5a (diff)
bootstrap-windows.ps1: Try finding WiX when not in PATH but in WIX5
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1663>
-rw-r--r--tools/bootstrap-windows.ps12
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bootstrap-windows.ps1 b/tools/bootstrap-windows.ps1
index 524d7003..c00b043e 100644
--- a/tools/bootstrap-windows.ps1
+++ b/tools/bootstrap-windows.ps1
@@ -132,7 +132,7 @@ if (!(Is-Newer 'py' $python_req)) {
}
python -m pip install setuptools
-if (!(Is-Newer 'wix' $wix_req)) {
+if (!(Is-Newer 'wix' $wix_req) -and !(Is-Newer "$env:WIX5\wix" $wix_req)) {
Write-Host "WiX >= $wix_req not found, installing..."
Invoke-WebRequest -Uri $wix_url -OutFile "$env:TEMP\wix-tools-x64.msi"