From e11eb70547fdf9386d00897f710ef9c7d3efbe44 Mon Sep 17 00:00:00 2001 From: Brian Ting Date: Mon, 11 Mar 2024 16:50:32 -0700 Subject: [PATCH 1/2] Update visual studio version to include llvm clang17 (#599) Update visual studio version to include llvm clang17 - external Change-Id: I4d7cefdec9879e78c9aae9acfa12bb715485deff Co-authored-by: Niranjan Yardi --- .../windows/base/visualstudio2022/Dockerfile | 2 +- starboard/build/config/modular/variables.gni | 20 ------------------- tools/install_visual_studio_22.ps1 | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 starboard/build/config/modular/variables.gni diff --git a/docker/windows/base/visualstudio2022/Dockerfile b/docker/windows/base/visualstudio2022/Dockerfile index fc9bd3b1b6c9f..79241b8617d8f 100644 --- a/docker/windows/base/visualstudio2022/Dockerfile +++ b/docker/windows/base/visualstudio2022/Dockerfile @@ -27,7 +27,7 @@ COPY dockerized_install_visual_studio_2022.ps1 /dockerized_install_visual_studio # Pins Visual Studio 2022 release version to 17.4.6 (includes Clang 15.0.1). # This should be kept in sync with the VS installer used in the dev workstation # setup script in: `tools/install_visual_studio_22.ps1` -ARG MSVS_INSTALLER_URL="https://download.visualstudio.microsoft.com/download/pr/d1ed8638-9e88-461e-92b7-4e29cc6172c3/38b09fc09ae9e590b73ae6752a0ebfd62579798969041bd341689273b842bc10/vs_BuildTools.exe" +ARG MSVS_INSTALLER_URL="https://download.visualstudio.microsoft.com/download/pr/63fee7e3-bede-41ad-97a2-97b8b9f535d1/d4af71832828f344373f7366c2af3461a83569d297dee8b43d30b7da71e9b5ed/vs_BuildTools.exe" RUN C:\dockerized_install_visual_studio_2022.ps1 ${env:MSVS_INSTALLER_URL} ENV VSINSTALLDIR "C:\BuildTools" diff --git a/starboard/build/config/modular/variables.gni b/starboard/build/config/modular/variables.gni deleted file mode 100644 index 7b220fa73690d..0000000000000 --- a/starboard/build/config/modular/variables.gni +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2023 The Cobalt Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -assert(current_toolchain == default_toolchain, - "Cannot access variables for non-default toolchains") - -if (!is_host_win) { - is_clang_16 = true -} diff --git a/tools/install_visual_studio_22.ps1 b/tools/install_visual_studio_22.ps1 index 86fd659745aac..a3c9be386a620 100644 --- a/tools/install_visual_studio_22.ps1 +++ b/tools/install_visual_studio_22.ps1 @@ -5,7 +5,7 @@ New-Item -Path "C:\" -Name "src" -ItemType "directory" -Force # Pins Visual Studio 2022 release version to 17.4.6 (includes Clang 15.0.1). # This should be kept in sync with the VS installer used in Build CI containers # defined in `docker/windows/base/visualstudio2022/Dockerfile` -$VS_INSTALL_URL="https://download.visualstudio.microsoft.com/download/pr/d1ed8638-9e88-461e-92b7-4e29cc6172c3/30be9c2a5e40d5666eeae683e319b472c8bcc8231c7b346fe798f0ad0f7e498b/vs_Professional.exe" +$VS_INSTALL_URL="https://download.visualstudio.microsoft.com/download/pr/63fee7e3-bede-41ad-97a2-97b8b9f535d1/2c37061fd2dc51c1283d9e9476437a2b0f211250e514df07c4b9827b95e8d849/vs_Professional.exe" Invoke-WebRequest -Uri $VS_INSTALL_URL -OutFile C:\src\vs_professional.exe From 34b6241765ec72be33b6e402d91472096d8a6ec7 Mon Sep 17 00:00:00 2001 From: Niranjan YArdi Date: Mon, 11 Mar 2024 17:01:22 -0700 Subject: [PATCH 2/2] TEST Do not submit Change-Id: I1f81bce516fe46f34f815e30ba64f5f6075af511 --- build/toolchain/win/msvc_toolchain.gni | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/toolchain/win/msvc_toolchain.gni b/build/toolchain/win/msvc_toolchain.gni index 01c3ebbdcf696..f584a380c8253 100644 --- a/build/toolchain/win/msvc_toolchain.gni +++ b/build/toolchain/win/msvc_toolchain.gni @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +## Test , DO NOT SUBMIT + assert(use_cobalt_customizations) import("//build/toolchain/cc_wrapper.gni")