Skip to content

Fix CI after VS updates #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattleibow merged 1 commit into from
May 17, 2022
Merged

Fix CI after VS updates #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions gn/BUILDCONFIG.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ declare_args() {

win_vc = ""
win_toolchain_version = ""
win_vcvars_version = ""

clang_win = ""
clang_win_version = ""
Expand Down Expand Up @@ -158,8 +159,17 @@ if (is_win) {
if (win_vc == "") {
win_vc = exec_script("//gn/find_msvc.py", [], "trim string")
}
if (win_vc != "" && win_toolchain_version == "") {
win_toolchain_version = exec_script("//gn/highest_version_dir.py", [ "$win_vc/Tools/MSVC", "[0-9]{2}\.[0-9]{2}\.[0-9]{5}" ], "trim string")
if (win_vc != "") {
if (win_toolchain_version == "") {
if (win_vcvars_version != "") {
win_toolchain_version = exec_script("//gn/highest_version_dir.py", [ "$win_vc/Tools/MSVC", "$win_vcvars_version[0-9]{1}\.[0-9]{5}" ], "trim string")
} else {
win_toolchain_version = exec_script("//gn/highest_version_dir.py", [ "$win_vc/Tools/MSVC", "[0-9]{2}\.[0-9]{2}\.[0-9]{5}" ], "trim string")
}
}
if (win_vcvars_version == "") {
win_vcvars_version = exec_script("//gn/get_vcvars_version.py", [ win_toolchain_version ], "trim string")
}
}
if (win_sdk == "") {
win_sdk = exec_script("//gn/find_winsdk.py", [], "trim string")
Expand Down
9 changes: 9 additions & 0 deletions gn/get_vcvars_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env python

from __future__ import print_function

import sys

sdk_version = sys.argv[1]

print(sdk_version[0:4])
2 changes: 1 addition & 1 deletion gn/toolchain/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ toolchain("msvc") {
if (is_winrt) {
_target += " uwp"
}
_target += " " + win_sdk_version + " -vcvars_ver=14.2"
_target += " " + win_sdk_version + " -vcvars_ver=" + win_vcvars_version

_vcvarsall = "$win_vc/Auxiliary/Build/vcvarsall.bat"
env_setup = "cmd /c set __VSCMD_ARG_NO_LOGO=1 && set VSCMD_START_DIR=%CD% && \"$_vcvarsall\" $_target && "
Expand Down