Use vcvarsall file directly from matrix

Author: AlexNDRmac

.appveyor.yml

@@ -6,61 +6,73 @@ environment:
     - PHP_VERSION: 7.0
       VC_VERSION: 14
       BUILD_TYPE: "Win32"
+      VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
-    - PHP_VERSION: 7.0
-      VC_VERSION: 14
-      BUILD_TYPE: "nts-Win32"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    - PHP_VERSION: 7.1
-      VC_VERSION: 14
-      BUILD_TYPE: "Win32"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    - PHP_VERSION: 7.1
-      VC_VERSION: 14
-      BUILD_TYPE: "nts-Win32"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    - PHP_VERSION: 7.2
-      VC_VERSION: 15
-      BUILD_TYPE: "Win32"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PHP_VERSION: 7.2
-      VC_VERSION: 15
-      BUILD_TYPE: "nts-Win32"
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PHP_VERSION: 7.3
-      VC_VERSION: 15
-      BUILD_TYPE: Win32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PHP_VERSION: 7.3
-      VC_VERSION: 15
-      BUILD_TYPE: nts-Win32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PHP_VERSION: 7.4
-      VC_VERSION: 15
-      BUILD_TYPE: Win32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PHP_VERSION: 7.4
-      VC_VERSION: 15
-      BUILD_TYPE: nts-Win32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PHP_VERSION: 8.0
-      VC_VERSION: 16
-      BUILD_TYPE: Win32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    # - PHP_VERSION: 7.0
+    #   VC_VERSION: 14
+    #   BUILD_TYPE: "nts-Win32"
+    #   VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+
+    # - PHP_VERSION: 7.1
+    #   VC_VERSION: 14
+    #   BUILD_TYPE: "Win32"
+    #   VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+
+    # - PHP_VERSION: 7.1
+    #   VC_VERSION: 14
+    #   BUILD_TYPE: "nts-Win32"
+    #   VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+
+    # - PHP_VERSION: 7.2
+    #   VC_VERSION: 15
+    #   BUILD_TYPE: "Win32"
+    #   VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PHP_VERSION: 7.2
+    #   VC_VERSION: 15
+    #   BUILD_TYPE: "nts-Win32"
+    #   VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PHP_VERSION: 7.3
+    #   VC_VERSION: 15
+    #   BUILD_TYPE: Win32
+    #   VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PHP_VERSION: 7.3
+    #   VC_VERSION: 15
+    #   BUILD_TYPE: nts-Win32
+    #   VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PHP_VERSION: 7.4
+    #   VC_VERSION: 15
+    #   BUILD_TYPE: Win32
+    #   VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PHP_VERSION: 7.4
+    #   VC_VERSION: 15
+    #   BUILD_TYPE: nts-Win32
+    #   VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    # - PHP_VERSION: 8.0
+    #   VC_VERSION: 16
+    #   BUILD_TYPE: Win32
+    #   VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat"
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
     - PHP_VERSION: 8.0
       VC_VERSION: 16
       BUILD_TYPE: nts-Win32
+      VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
   PHP_SDK_VERSION: 2.1.9
@@ -105,10 +117,8 @@ install:
   - ps: TuneUpPhp
 
 build_script:
+  - if NOT "%VCVARSALL%" == "" call "%VCVARSALL%" %PLATFORM%
   - ps: InitializeBuildVars
-  - IF EXIST '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%' '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%'
-  - IF EXIST '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%'
-  - for /f "tokens=1* delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath') do call "%%i\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
   - phpsdk_setvars
   - cmd /c .ci\build-win32.bat
   - phpize

.ci/AppVeyor.psm1

@@ -6,37 +6,6 @@
 # the LICENSE file that was distributed with this source code.
 
 Function InitializeBuildVars {
-	switch ($Env:VC_VERSION) {
-		'14' {
-			If (-not (Test-Path $Env:VS120COMNTOOLS)) {
-				Throw 'The VS120COMNTOOLS environment variable is not set. Check your MS VS installation'
-			}
-			$Env:VSCOMNTOOLS = $Env:VS120COMNTOOLS
-			break
-		}
-		'15' {
-			If (-not (Test-Path $Env:VS140COMNTOOLS)) {
-				Throw 'The VS140COMNTOOLS environment variable is not set. Check your MS VS installation'
-			}
-			$Env:VSCOMNTOOLS = $Env:VS140COMNTOOLS
-			break
-		}
-		'16' {
-			# By default VS does not set the VS150COMNTOOLS as system-wide variable starting from VS2017
-			# So, we need to use built-in tool from VS installer to set all the required vars manually
-			$VSInstaller = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
-			If (-not (Test-Path $VSInstaller)) {
-				Throw 'The VSCOMNTOOLS environment variable is not set. Check your MS VS installation'
-			}
-			$Env:VSCOMNTOOLS = (& "${VsInstaller}" -latest -property installationPath)
-			break
-		}
-		default {
-			Throw 'This script is designed to run with MS VS 14/15. Check your MS VS installation'
-			break
-		}
-	}
-
 	If ($Env:PLATFORM -eq 'x64') {
 		$Env:ARCH = 'x86_amd64'
 	} Else {