Chromium Code Reviews

Side by Side Diff: build/config/win/visual_studio_version.gni

Issue 965713002: Handle unpatched VS xtree header (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« build/config/BUILDCONFIG.gn ('K') | « build/config/win/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 declare_args() { 5 declare_args() {
6 # Path to Visual Studio. If empty, the default is used which is to use the 6 # Path to Visual Studio. If empty, the default is used which is to use the
7 # automatic toolchain in depot_tools. If set, you must also set the 7 # automatic toolchain in depot_tools. If set, you must also set the
8 # visual_studio_version and wdk_path. 8 # visual_studio_version and wdk_path.
9 visual_studio_path = "" 9 visual_studio_path = ""
10 10
11 # Version of Visual Studio pointed to by the visual_studio_path. 11 # Version of Visual Studio pointed to by the visual_studio_path.
12 # Use "2013" for Visual Studio 2013, or "2013e" for the Express version. 12 # Use "2013" for Visual Studio 2013, or "2013e" for the Express version.
13 visual_studio_version = "" 13 visual_studio_version = ""
14 14
15 # Directory of the Windows driver kit. If visual_studio_path is empty, this 15 # Directory of the Windows driver kit. If visual_studio_path is empty, this
16 # will be auto-filled. 16 # will be auto-filled.
17 wdk_path = "" 17 wdk_path = ""
18 18
19 # Full path to the Windows SDK, not including a backslash at the end. 19 # Full path to the Windows SDK, not including a backslash at the end.
20 # This value is the default location, override if you have a different 20 # This value is the default location, override if you have a different
21 # installation location. 21 # installation location.
22 windows_sdk_path = "C:\Program Files (x86)\Windows Kits\8.1" 22 windows_sdk_path = "C:\Program Files (x86)\Windows Kits\8.1"
23
24 # Whether the VS xtree header has been patched to disable warning 4702. If
25 # it has, then we don't need to disable 4702 (unreachable code warning).
26 # The patch is preapplied to the internal toolchain and hence all bots.
27 msvs_xtree_patched = false
23 } 28 }
24 29
25 if (visual_studio_path == "") { 30 if (visual_studio_path == "") {
26 toolchain_data = 31 toolchain_data =
27 exec_script("../../vs_toolchain.py", [ "get_toolchain_dir" ], "scope") 32 exec_script("../../vs_toolchain.py", [ "get_toolchain_dir" ], "scope")
28 visual_studio_path = toolchain_data.vs_path 33 visual_studio_path = toolchain_data.vs_path
29 windows_sdk_path = toolchain_data.sdk_path 34 windows_sdk_path = toolchain_data.sdk_path
30 visual_studio_version = toolchain_data.vs_version 35 visual_studio_version = toolchain_data.vs_version
31 wdk_path = toolchain_data.wdk_dir 36 wdk_path = toolchain_data.wdk_dir
32 visual_studio_runtime_dirs = toolchain_data.runtime_dirs 37 visual_studio_runtime_dirs = toolchain_data.runtime_dirs
33 } else { 38 } else {
34 assert(visual_studio_version != "", 39 assert(visual_studio_version != "",
35 "You must set the visual_studio_version if you set the path") 40 "You must set the visual_studio_version if you set the path")
36 assert(wdk_path != "", 41 assert(wdk_path != "",
37 "You must set the wdk_path if you set the visual studio path") 42 "You must set the wdk_path if you set the visual studio path")
38 visual_studio_runtime_dirs = [] 43 visual_studio_runtime_dirs = []
39 } 44 }
45
46 if (!msvs_xtree_patched) {
47 if (exec_script("../../win_is_xtree_patched.py", [], "value") == 1) {
48 msvs_xtree_patched = true
49 }
50 }
OLDNEW
« build/config/BUILDCONFIG.gn ('K') | « build/config/win/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine