From 5413f68c61d897034d6fd14b4cbf663511fe298b Mon Sep 17 00:00:00 2001
From: dos <doscott@doscott.ca>
Date: Thu, 17 Oct 2019 11:11:17 -0300
Subject: [PATCH] Build vc14x libraries in official binaries build script

Replace vc140,vc141,vc142 builds using VS2015,VS2017,VS2019
with a single set of libraries using vc14x toolset built with VS2015.

Closes https://github.com/wxWidgets/wxWidgets/pull/1607
---
 build/tools/msvs/buildall.bat      |  4 +--
 build/tools/msvs/findvs.bat        | 54 -----------------------------
 build/tools/msvs/officialbuild.bat | 55 +++++-------------------------
 3 files changed, 9 insertions(+), 104 deletions(-)
 delete mode 100644 build/tools/msvs/findvs.bat

diff --git a/build/tools/msvs/buildall.bat b/build/tools/msvs/buildall.bat
index 49b74e4ef0..7feda5faaa 100755
--- a/build/tools/msvs/buildall.bat
+++ b/build/tools/msvs/buildall.bat
@@ -1,6 +1,4 @@
-start cmd /k Call officialbuild.bat vc142
-start cmd /k Call officialbuild.bat vc141
-start cmd /k Call officialbuild.bat vc140
+start cmd /k Call officialbuild.bat vc14x
 start cmd /k Call officialbuild.bat vc120
 start cmd /k Call officialbuild.bat vc110
 start cmd /k Call officialbuild.bat vc100
diff --git a/build/tools/msvs/findvs.bat b/build/tools/msvs/findvs.bat
deleted file mode 100644
index 7234f95302..0000000000
--- a/build/tools/msvs/findvs.bat
+++ /dev/null
@@ -1,54 +0,0 @@
-@echo off
-
-rem This is used to set up the VS2017 and later (hopefully) environment.
-
-rem Called with two paramaters, the inclusive low and the exclusisve high.
-if "%1" == "" goto ERR_NOPARM
-if "%2" == "" goto ERR_NOPARM
-
-rem If not running from official build, remember where we are.
-
-if "%curr_dir%" == "" (
-  set curr_dir=%cd%
-)
-
-@echo Checking if vswhere in path
-vswhere 1>nul
-
-if errorlevel 9009 (
-@echo "vswhere not found, trying C:\Program Files (x86)\Microsoft Visual Studio\Installer"
-set "PATH=C:\Program Files (x86)\Microsoft Visual Studio\Installer;%PATH%"
-)
-
-vswhere 1>nul
-if errorlevel 9009 (
-@echo "vswhere not found"
-goto ERR_EXIT
-)
-
-for /f "usebackq tokens=*" %%i in (`vswhere -latest -version "[%1,%2)" -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
-  set InstallDir=%%i
-)
-
-if "%InstallDir%" == "" (
-  @echo Install directory not found
-  goto ERR_EXIT
-)
-
-if NOT exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
-  @echo Can't find an vsdevcmd.bat
-  goto ERR_EXIT
-)
-
-call "%InstallDir%"\Common7\Tools\vsdevcmd.bat
-
-rem Go back to where we were before vsdevcmd changed things.
-cd %curr_dir%
-
-goto end
-
-:ERR_NOPARM
-@echo Need to specifiy version min/max range, eg.: 15.0 16.0
-:ERR_EXIT
-exit /b 1
-:end
diff --git a/build/tools/msvs/officialbuild.bat b/build/tools/msvs/officialbuild.bat
index 5e8f6820fe..a503a0c1e6 100755
--- a/build/tools/msvs/officialbuild.bat
+++ b/build/tools/msvs/officialbuild.bat
@@ -22,44 +22,10 @@ rem ========================================================
 
 set compvers="Unknown"
 
-if "%1" == "vc142" (
-  @echo Building for vc142 / vs2019
-  set comp=142
-  set compvers=vc142
-
-  if NOT "%VS160COMNTOOLS%" == "" (
-    call "%VS160COMNTOOLS%VsDevCmd.bat"
-  )
-  if "%VS160COMNTOOLS%" == "" (
-    call %curr_dir%\findvs 16.0 17.0
-
-    if errorlevel 1 (
-      @echo vswhere.exe must be in your path or a VS2019 developer command prompt must be used.
-      goto end
-    )
-  )
-)
-if "%1" == "vc141" (
-  @echo Building for vc141 / vs2017
-  set comp=141
-  set compvers=vc141
-
-  if NOT "%VS150COMNTOOLS%" == "" (
-    call "%VS150COMNTOOLS%VsDevCmd.bat"
-  )
-  if "%VS150COMNTOOLS%" == "" (
-    call %curr_dir%\findvs 15.0 16.0
-
-    if errorlevel 1 (
-      @echo vswhere.exe must be in your path or a VS2017 developer command prompt must be used.
-      goto end
-    )
-  )
-)
-if "%1" == "vc140" (
-  @echo Building for vc140 / vs2015
-  set comp=140
-  set compvers=vc140
+if "%1" == "vc14x" (
+  @echo Building for vc14x with vs2015
+  set comp=14x
+  set compvers=vc14x
   call "%VS140COMNTOOLS%VsDevCmd.bat"
 )
 if "%1" == "vc120" (
@@ -117,9 +83,7 @@ del %compvers%x86_Release.txt
 del %compvers%x64_Debug.txt
 del %compvers%x64_Release.txt
 
-if "%compvers%" == "vc142" call "%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x64
-if "%compvers%" == "vc141" call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x64
-if "%compvers%" == "vc140" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64
+if "%compvers%" == "vc14x" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64
 if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
 if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
 if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X64 /Release
@@ -152,9 +116,7 @@ nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD
 
 if ERRORLEVEL 1 goto ERR_BUILD
 
-if "%compvers%" == "vc142" call "%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x86
-if "%compvers%" == "vc141" call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x86
-if "%compvers%" == "vc140" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+if "%compvers%" == "vc14x" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86
 if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86
 if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86
 if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X86 /Release
@@ -214,12 +176,11 @@ goto End
 :VERSIONS
    @echo.
    @echo Compiler Version: One of -
-   @echo vc142
-   @echo vc141
-   @echo vc140
+   @echo vc14x (Requires VS2015)
    @echo vc120
    @echo vc110
    @echo vc100
+   @echo.
 
 :End