flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Jenkins] Use vswhere to locate vcvarsall script.

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-02-13 17:53:22 +00:00
parent 48b16b9598
commit 731d39d783
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/lib/util.py
View File

@@ -5,6 +5,7 @@ from __future__ import print_function
import itertools
import subprocess
import sys
import os
def validate_pair(ob):
@@ -67,5 +68,12 @@ def get_vs_env(arch):
The arch has to be one of "x86", "amd64", "arm", "x86_amd64", "x86_arm", "amd64_x86",
"amd64_arm", i.e. the args passed to vcvarsall.bat.
"""
vsvarsall = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\Auxiliary\\Build\\vcvarsall.bat"
# https://github.com/Microsoft/vswhere/wiki
component = 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64'
vswhere = os.environ['ProgramFiles(x86)'] + "\\Microsoft Visual Studio\\Installer\\vswhere.exe"
vswhereCmd = [vswhere, '-latest', '-products', '*', '-requires', component, '-property', 'installationPath']
vspath = subprocess.check_output(vswhereCmd).decode("utf-8").strip()
vsvarsall = vspath + "\\VC\\Auxiliary\\Build\\vcvarsall.bat"
return get_environment_from_batch_command([vsvarsall, arch])