Delete the VS2017 directories

Pass the visual studio version to the windows build script Change-Id: I1cf21ed387a52f4a260211be9964d84dc446d2f4
google · Dec 23, 2024 · 95af7c1 · 95af7c1
1 parent fea0be7
commit 95af7c1
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 104 deletions.
diff --git a/kokoro/scripts/windows/build.bat b/kokoro/scripts/windows/build.bat
@@ -17,6 +17,7 @@
 set BUILD_ROOT=%cd%
 set SRC=%cd%\github\amber
 set BUILD_TYPE=%1
+set VS_VERSION=%2
 
 :: Force usage of python 3.12
 set PATH=C:\python312;%PATH%
@@ -29,8 +30,10 @@ python tools\git-sync-deps
 :: #########################################
 :: set up msvc build env
 :: #########################################
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-echo "Using VS 2019..."
+if %VS_VERSION% == 2019 (
+  call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+  echo "Using VS 2019..."
+)
 
 cmake --version
 

diff --git a/kokoro/windows-msvc-2017-debug/build.bat b/kokoro/windows-msvc-2017-debug/build.bat
diff --git a/kokoro/windows-msvc-2017-debug/continuous.cfg b/kokoro/windows-msvc-2017-debug/continuous.cfg
diff --git a/kokoro/windows-msvc-2017-debug/presubmit.cfg b/kokoro/windows-msvc-2017-debug/presubmit.cfg
diff --git a/kokoro/windows-msvc-2017-release/build.bat b/kokoro/windows-msvc-2017-release/build.bat
diff --git a/kokoro/windows-msvc-2017-release/continuous.cfg b/kokoro/windows-msvc-2017-release/continuous.cfg
diff --git a/kokoro/windows-msvc-2017-release/presubmit.cfg b/kokoro/windows-msvc-2017-release/presubmit.cfg
diff --git a/kokoro/windows-msvc-2019-debug/build.bat b/kokoro/windows-msvc-2019-debug/build.bat
@@ -17,4 +17,4 @@
 :: Find the directory of the common build script.
 set SCRIPT_DIR=%~dp0
 
-call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug
+call %SCRIPT_DIR%\..\scripts\windows\build.bat Debug 2019
diff --git a/kokoro/windows-msvc-2019-release/build.bat b/kokoro/windows-msvc-2019-release/build.bat
@@ -17,4 +17,5 @@
 :: Find the directory of the common build script.
 set SCRIPT_DIR=%~dp0
 
-call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo
+call %SCRIPT_DIR%\..\scripts\windows\build.bat RelWithDebInfo 2019
+