From 0afcc375890eef6de23c8e0a29b6953b3f07b8e0 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 24 May 2022 14:09:55 -0700 Subject: [PATCH] MSVC 2015 -> 2017 (#29754) * MSVC 2015 -> 2017 * Update by review --- BUILDING.md | 2 +- tools/run_tests/helper_scripts/build_cxx.bat | 8 -------- tools/run_tests/run_tests.py | 13 ++----------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 80dadc64fc9..3a3107febaa 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -55,7 +55,7 @@ installed by `brew` is being used: ## Windows To prepare for cmake + Microsoft Visual C++ compiler build -- Install Visual Studio 2015 or 2017 (Visual C++ compiler will be used). +- Install Visual Studio 2017 or later (Visual C++ compiler will be used). - Install [Git](https://git-scm.com/). - Install [CMake](https://cmake.org/download/). - Install [nasm](https://www.nasm.us/) and add it to `PATH` (`choco install nasm`) - *required by boringssl* diff --git a/tools/run_tests/helper_scripts/build_cxx.bat b/tools/run_tests/helper_scripts/build_cxx.bat index e6e727a7b30..983418b36de 100644 --- a/tools/run_tests/helper_scripts/build_cxx.bat +++ b/tools/run_tests/helper_scripts/build_cxx.bat @@ -21,14 +21,6 @@ cd cmake mkdir build cd build -If "%GRPC_BUILD_ACTIVATE_VS_TOOLS%" == "2015" ( - @rem set cl.exe build environment to build with VS2015 tooling - @rem this is required for Ninja build to work - call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %GRPC_BUILD_VS_TOOLS_ARCHITECTURE% - @rem restore command echo - echo on -) - @rem Workaround a bug where VS150COMNTOOLS is not set due to a bug in VS 2017 installer @rem see https://developercommunity.visualstudio.com/t/installing-visualstudio-build-tools-doesnt-add-env/17435 set "VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\" diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 611d8c04415..bb0135c3d5c 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -252,25 +252,18 @@ class CLanguage(object): _check_compiler(self.args.compiler, [ 'default', 'cmake', - 'cmake_ninja_vs2015', 'cmake_ninja_vs2017', - 'cmake_vs2015', 'cmake_vs2017', 'cmake_vs2019', ]) _check_arch(self.args.arch, ['default', 'x64', 'x86']) activate_vs_tools = '' - if self.args.compiler == 'cmake_ninja_vs2015' or self.args.compiler == 'cmake' or self.args.compiler == 'default': + if self.args.compiler == 'cmake_ninja_vs2017' or self.args.compiler == 'cmake' or self.args.compiler == 'default': # cmake + ninja build is the default because it is faster and supports boringssl assembly optimizations - # the compiler used is exactly the same as for cmake_vs2015 - cmake_generator = 'Ninja' - activate_vs_tools = '2015' - elif self.args.compiler == 'cmake_ninja_vs2017': + # the compiler used is exactly the same as for cmake_vs2017 cmake_generator = 'Ninja' activate_vs_tools = '2017' - elif self.args.compiler == 'cmake_vs2015': - cmake_generator = 'Visual Studio 14 2015' elif self.args.compiler == 'cmake_vs2017': cmake_generator = 'Visual Studio 15 2017' elif self.args.compiler == 'cmake_vs2019': @@ -1537,9 +1530,7 @@ argp.add_argument( 'electron1.6', 'coreclr', 'cmake', - 'cmake_ninja_vs2015', 'cmake_ninja_vs2017', - 'cmake_vs2015', 'cmake_vs2017', 'cmake_vs2019', 'mono',