Module: Mesa Branch: main Commit: 5109790cf936aa5fd4dcba0005f9c1de96f7be1a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5109790cf936aa5fd4dcba0005f9c1de96f7be1a
Author: Yonggang Luo <[email protected]> Date: Fri Dec 22 02:16:46 2023 +0800 ci/msvc: Install both msvc2019 and msvc2022 Currently only msvc2019 are used This is did intentionally, so we have a history script install msvc2019 only within vs2022 Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26736> --- .gitlab-ci/windows/mesa_deps_msvc.ps1 | 6 +++++- .gitlab-ci/windows/mesa_init_msvc.ps1 | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/windows/mesa_deps_msvc.ps1 b/.gitlab-ci/windows/mesa_deps_msvc.ps1 index 019cbb79607..50702ba5f48 100644 --- a/.gitlab-ci/windows/mesa_deps_msvc.ps1 +++ b/.gitlab-ci/windows/mesa_deps_msvc.ps1 @@ -23,7 +23,11 @@ Start-Process -NoNewWindow -Wait -FilePath C:\vs_buildtools.exe ` "--nocache", ` "--installPath", "C:\BuildTools", ` "--add", "Microsoft.VisualStudio.Component.VC.Redist.14.Latest", ` -"--add", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", ` +"--add", "Microsoft.VisualStudio.Component.VC.ASAN", ` # MSVC 2022 +"--add", "Microsoft.VisualStudio.Component.VC.ATL", ` +"--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", ` +"--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", ` +"--add", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", ` # MSVC 2019 "--add", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC", ` "--add", "Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64", ` "--add", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", ` diff --git a/.gitlab-ci/windows/mesa_init_msvc.ps1 b/.gitlab-ci/windows/mesa_init_msvc.ps1 index f75cd36f5b9..01aadb648de 100644 --- a/.gitlab-ci/windows/mesa_init_msvc.ps1 +++ b/.gitlab-ci/windows/mesa_init_msvc.ps1 @@ -8,4 +8,10 @@ Import-Module (Join-Path $vsInstallPath "Common7\Tools\Microsoft.VisualStudio.De # VS2017 14.1 to 14.16 use -vcvars_ver=14.16 # VS2019 14.20 to 14.29 use -vcvars_ver=14.29 # VS2022 14.30 to 14.38 (not finished yet) use -vcvars_ver=14 to choose the newest version -Enter-VsDevShell -VsInstallPath $vsInstallPath -SkipAutomaticLocation -DevCmdArguments '-vcvars_ver=14.29 -arch=x64 -no_logo -host_arch=amd64' + +$vcvars_ver_arg=$args +if ($null -eq $vcvars_ver_arg[0]) { + $vcvars_ver_arg="-vcvars_ver=14.29" +} + +Enter-VsDevShell -VsInstallPath $vsInstallPath -SkipAutomaticLocation -DevCmdArguments "$vcvars_ver_arg -arch=x64 -no_logo -host_arch=amd64"
