From 4b3ec49c7121cfcaa56a6195be847c24a86205f9 Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Wed, 23 Sep 2020 05:20:24 -0500
Subject: [PATCH] Use vswhere to find vcvarsall.bat (#11)

The Windows images provided by GitHub have a native program called
"vswhere", which can be used to find vcvarsall.bat.

* use vswhere to find vcvarsall
* don't require child_process twice
* use vswhere to find the 2015 bat file
* refactor findWithVswhere
* move finding vcbuildtools using vswhere upward
* print error of vswhere
---
 index.js | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/index.js b/index.js
index 6a4941e..fd128fa 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,6 @@
 const core = require('@actions/core')
-const exec = require('util').promisify(require('child_process').exec)
+const child_process = require('child_process')
+const exec = require('util').promisify(child_process.exec)
 const fs = require('fs')
 const process = require('process')
 
@@ -18,21 +19,42 @@ const InterestingVariables = [
     /^WindowsSDK/i,
 ]
 
+function findWithVswhere(pattern) {
+    let path = null;
+    try {
+        path = child_process.execSync(`vswhere -products * -latest -prerelease -find ${pattern}`).toString().trim()
+    } catch (e) {
+        console.log(e)
+    }
+    return path
+}
+
 function findVcvarsall() {
+    // use vswhere
+    let path = findWithVswhere('**/Auxiliary/Build/vcvarsall.bat')
+    if (path && fs.existsSync(path)) {
+        return path
+    }
+
     const programFiles = process.env['ProgramFiles(x86)']
     // Given the order of each list it should check
     // for the more recent versions first and the
     // highest grade edition first.
     for (const ver of VERSIONS) {
         for (const ed of EDITIONS) {
-            const path = `${programFiles}\\Microsoft Visual Studio\\${ver}\\${ed}\\VC\\Auxiliary\\Build\\vcvarsall.bat`
+            path = `${programFiles}\\Microsoft Visual Studio\\${ver}\\${ed}\\VC\\Auxiliary\\Build\\vcvarsall.bat`
             if (fs.existsSync(path)) {
                 return path
             }
         }
     }
     // Special case for Visual Studio 2015 (and maybe earlier), try it out too.
-    const path = `${programFiles}\\Microsoft Visual C++ Build Tools\\vcbuildtools.bat`
+    // us vswhere
+    path = findWithVswhere('**/vcbuildtools.bat')
+    if (path && fs.existsSync(path)) {
+        return path
+    }
+    path = `${programFiles}\\Microsoft Visual C++ Build Tools\\vcbuildtools.bat`
     if (fs.existsSync(path)) {
         return path
     }