From 675ecf2e51bde8b473203e53016e1abd1b20e0eb Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Thu, 21 May 2020 15:51:32 -0700
Subject: [PATCH] tools: switch default build to latest Visual Studio

---
 tools/build-choco.bat    | 2 +-
 tools/build-sample.bat   | 2 +-
 tools/build.bat          | 2 +-
 tools/impdef.bat         | 2 +-
 tools/nmake-ext-test.bat | 2 +-
 tools/vcvarsall.bat      | 8 ++++++++
 6 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100755 tools/vcvarsall.bat

diff --git a/tools/build-choco.bat b/tools/build-choco.bat
index ba6b04a1..01aa2856 100644
--- a/tools/build-choco.bat
+++ b/tools/build-choco.bat
@@ -19,7 +19,7 @@ if X%~nx0==Xbuild-choco.bat (
     goto :choco
 )
 
-call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
+call "%~dp0vcvarsall.bat" x64
 
 if not X%SignedPackage%==X (
     if not exist "%~dp0..\build\VStudio\build\%Configuration%\winfsp-*.msi" (echo previous build not found >&2 & exit /b 1)
diff --git a/tools/build-sample.bat b/tools/build-sample.bat
index a934992a..8ceab0f3 100755
--- a/tools/build-sample.bat
+++ b/tools/build-sample.bat
@@ -10,7 +10,7 @@ if not X%4==X set ProjDir=%~4
 
 if X!ProjDir!==X (echo usage: build-sample Config Arch Sample ProjDir >&2 & goto fail)
 
-call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
+call "%~dp0vcvarsall.bat" x64
 
 if X!FSP_SAMPLE_DIR!==X (
 	set RegKey="HKLM\SOFTWARE\WinFsp"
diff --git a/tools/build.bat b/tools/build.bat
index ba6b04a1..01aa2856 100755
--- a/tools/build.bat
+++ b/tools/build.bat
@@ -19,7 +19,7 @@ if X%~nx0==Xbuild-choco.bat (
     goto :choco
 )
 
-call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
+call "%~dp0vcvarsall.bat" x64
 
 if not X%SignedPackage%==X (
     if not exist "%~dp0..\build\VStudio\build\%Configuration%\winfsp-*.msi" (echo previous build not found >&2 & exit /b 1)
diff --git a/tools/impdef.bat b/tools/impdef.bat
index 8abbec83..a865743e 100755
--- a/tools/impdef.bat
+++ b/tools/impdef.bat
@@ -19,7 +19,7 @@ set cdef=/D_AMD64_
 if /i X%outarch%==Xx86 set arch=x86
 if /i X%outarch%==Xx86 set cdef=/D_X86_
 
-call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" !arch!
+call "%~dp0vcvarsall.bat" !arch!
 set INCLUDE=%~dp0..\opt\fsext\inc;%~dp0..\inc;!WindowsSdkDir!Include\!WindowsSDKVersion!km\crt;!WindowsSdkDir!Include\!WindowsSDKVersion!km;!WindowsSdkDir!Include\!WindowsSDKVersion!km\shared;!INCLUDE!
 
 if exist !workdir! rmdir /s/q !workdir!
diff --git a/tools/nmake-ext-test.bat b/tools/nmake-ext-test.bat
index 756eea51..fa09dadf 100755
--- a/tools/nmake-ext-test.bat
+++ b/tools/nmake-ext-test.bat
@@ -5,7 +5,7 @@ setlocal
 set Configuration=Release
 if not X%1==X set Configuration=%1
 
-call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
+call "%~dp0vcvarsall.bat" x64
 
 cd %~dp0..\ext\test
 nmake /f Nmakefile
diff --git a/tools/vcvarsall.bat b/tools/vcvarsall.bat
new file mode 100755
index 00000000..96f1faa9
--- /dev/null
+++ b/tools/vcvarsall.bat
@@ -0,0 +1,8 @@
+@echo off
+
+set vcvarsall="%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
+set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+for /f "usebackq tokens=*" %%i in (`%vswhere% -find VC\**\vcvarsall.bat`) do (
+    set vcvarsall="%%i"
+)
+call %vcvarsall% %*