Merge topic 'ci-wix'

cb1b2dc664 ci: Provide WiX 3 in PATH of jobs that need it
b71b6300e5 ci: Provide WiX 3 in versioned location
694f14f96f Tests: Teach CPackWiXGenerator to use WiX tools in PATH

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9342

.gitlab/.gitignore

@@ -21,6 +21,6 @@
 /tmp
 /unstable-jom*
 /watcom
-/wix*
+/wix3
 /clang-tidy-fixes
 /num_warnings.txt

.gitlab/ci/env_windows_arm64_package.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1

.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1

.gitlab/ci/env_windows_i386_package.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1

.gitlab/ci/env_windows_vs2022_x64_ninja.ps1

@@ -3,3 +3,5 @@ if ("$env:CMAKE_CI_NIGHTLY" -eq "true") {
   . ".gitlab/ci/ispc-env.ps1"
   . ".gitlab/ci/swift-env.ps1"
 }
+
+. .gitlab/ci/wix3-env.ps1

.gitlab/ci/env_windows_x86_64_package.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1

.gitlab/ci/wix3-env.ps1

@@ -0,0 +1,6 @@
+& "$pwsh" -File .gitlab/ci/wix3.ps1
+
+$pwdpath = $pwd.Path
+Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\wix3;$env:PATH"
+
+light -help | Select -First 1

.gitlab/ci/wix.ps1 → .gitlab/ci/wix3.ps1

@@ -17,4 +17,5 @@ if ($hash.Hash -ne $sha256sum) {
 }
 
 Add-Type -AssemblyName System.IO.Compression.FileSystem
-[System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir\wix\bin")
+[System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir\wix3")
+Remove-Item "$outdir\$tarball"

.gitlab/os-windows.yml

@@ -387,13 +387,10 @@
 .before_script_windows: &before_script_windows
     - . .gitlab/ci/env.ps1
     - $pwdpath = $pwd.Path
-    - (& "$pwsh" -File ".gitlab/ci/wix.ps1")
-    - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix"
     - (& "$pwsh" -File ".gitlab/ci/cmake.ps1")
     - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\cmake\bin;$env:PATH"
     - $cmake = "cmake"
     - . .gitlab/ci/ninja-env.ps1
-    - (& "$env:WIX\bin\light.exe" -help) | Select -First 1
     - cmake --version
     - . .gitlab/ci/qt-env.ps1
     - . .gitlab/ci/python-env.ps1

Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake

@@ -39,9 +39,8 @@ endif()
 
 function(run_wix_command command)
   file(TO_CMAKE_PATH "$ENV{WIX}" WIX_ROOT)
-  set(WIX_PROGRAM "${WIX_ROOT}/bin/${command}.exe")
-
-  if(NOT EXISTS "${WIX_PROGRAM}")
+  find_program(WIX_PROGRAM NAMES ${command} NO_CACHE PATHS "${WIX_ROOT}" PATH_SUFFIXES "bin")
+  if(NOT WIX_PROGRAM)
     message(FATAL_ERROR "Failed to find WiX Tool: ${WIX_PROGRAM}")
   endif()