mirror of
https://github.com/ilammy/msvc-dev-cmd.git
synced 2026-09-07 06:07:19 +08:00
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
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
const core = require('@actions/core')
|
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 fs = require('fs')
|
||||||
const process = require('process')
|
const process = require('process')
|
||||||
|
|
||||||
@@ -18,21 +19,42 @@ const InterestingVariables = [
|
|||||||
/^WindowsSDK/i,
|
/^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() {
|
function findVcvarsall() {
|
||||||
|
// use vswhere
|
||||||
|
let path = findWithVswhere('**/Auxiliary/Build/vcvarsall.bat')
|
||||||
|
if (path && fs.existsSync(path)) {
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
|
||||||
const programFiles = process.env['ProgramFiles(x86)']
|
const programFiles = process.env['ProgramFiles(x86)']
|
||||||
// Given the order of each list it should check
|
// Given the order of each list it should check
|
||||||
// for the more recent versions first and the
|
// for the more recent versions first and the
|
||||||
// highest grade edition first.
|
// highest grade edition first.
|
||||||
for (const ver of VERSIONS) {
|
for (const ver of VERSIONS) {
|
||||||
for (const ed of EDITIONS) {
|
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)) {
|
if (fs.existsSync(path)) {
|
||||||
return path
|
return path
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Special case for Visual Studio 2015 (and maybe earlier), try it out too.
|
// 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)) {
|
if (fs.existsSync(path)) {
|
||||||
return path
|
return path
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user