From 9ecb6541cfbfecd2f9f419e03df24cb01d610c63 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Fri, 25 Mar 2022 15:37:18 +0000
Subject: [PATCH] tools: vsvarsall.bat: cleanup and restrict to VS2019

---
 tools/vcvarsall.bat | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tools/vcvarsall.bat b/tools/vcvarsall.bat
index 5bbc212f..f4e15e3a 100755
--- a/tools/vcvarsall.bat
+++ b/tools/vcvarsall.bat
@@ -1,16 +1,24 @@
 @echo off
 
-set vcvarsall="%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
+set vcvarsall=""
+
 set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 if exist %vswhere% (
-    for /f "usebackq tokens=*" %%i in (`%vswhere% -latest -find VC\**\vcvarsall.bat`) do (
-        if exist "%%i" (
-            set vcvarsall="%%i"
-        ) else (
-            for /f "usebackq tokens=*" %%i in (`%vswhere% -latest -property installationPath`) do (
-                set vcvarsall="%%i\VC\Auxiliary\Build\vcvarsall.bat"
-            )
+    for /f "usebackq tokens=*" %%i in (`%vswhere% -version [15.0^,17.0^) -find VC\**\vcvarsall.bat`) do (
+        set vcvarsall="%%i"
+    )
+)
+
+if not exist %vcvarsall% (
+    if exist %vswhere% (
+        for /f "usebackq tokens=*" %%i in (`%vswhere% -version [15.0^,17.0^) -property installationPath`) do (
+            set vcvarsall="%%i\VC\Auxiliary\Build\vcvarsall.bat"
         )
     )
 )
+
+if not exist %vcvarsall% (
+    set vcvarsall="%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
+)
+
 call %vcvarsall% %*