build/vs_toolchain.py - Issue 566343002: gn: Make WDK_DIR environment variable optional for VS professional users

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/vs_toolchain.py

Issue 566343002: gn: Make WDK_DIR environment variable optional for VS professional users (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move checks back to SetEnvironmentAndGetRuntimeDllDirs Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/vs_toolchain.py

diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py

index 735827e94316f4125b42d41ed389719955050612..1e1fe46cf5d9496b19ddba2adaa460288c1b60f6 100644

--- a/build/vs_toolchain.py

+++ b/build/vs_toolchain.py

@@ -164,6 +164,12 @@ def GetToolchainDir():

"""Gets location information about the current toolchain (must have been

previously updated by 'update'). This is used for the GN build."""

SetEnvironmentAndGetRuntimeDllDirs()

+ depot_tools_win_toolchain = \

+ bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')))

+ is_express = os.environ['GYP_MSVS_VERSION'][-1:] == "e"

scottmg 2014/09/15 23:22:02 nit; just [-1] seems fine since you're comparing a

+ if not (depot_tools_win_toolchain or is_express or 'WDK_DIR' in os.environ):

+ os.environ['WDK_DIR'] = ""

scottmg 2014/09/15 23:22:02 nit; "" -> ''

print '''vs_path = "%s"

sdk_path = "%s"

vs_version = "%s"

« no previous file with comments | « no previous file | no next file » | no next file with comments »