Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

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

Issue 2531333004: Revert of win: Remove unneeded references to visual_studio_version now that it's always 2015. (Closed)
Patch Set: Comment + rebase Created 4 years 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 unified diff | Download patch
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 # Currently always "2015". 12 # Use "2013" for Visual Studio 2013, or "2013e" for the Express version.
Nico 2016/11/29 16:23:45 this is where i would've put the comment
Michael Achenbach 2016/11/30 08:18:59 Ah - yes - that would have been better indeed. Let
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\10" 22 windows_sdk_path = "C:\Program Files (x86)\Windows Kits\10"
23 } 23 }
24 24
25 if (visual_studio_path == "") { 25 if (visual_studio_path == "") {
26 toolchain_data = 26 toolchain_data =
27 exec_script("../../vs_toolchain.py", [ "get_toolchain_dir" ], "scope") 27 exec_script("../../vs_toolchain.py", [ "get_toolchain_dir" ], "scope")
28 visual_studio_path = toolchain_data.vs_path 28 visual_studio_path = toolchain_data.vs_path
29 windows_sdk_path = toolchain_data.sdk_path 29 windows_sdk_path = toolchain_data.sdk_path
30 visual_studio_version = toolchain_data.vs_version 30 visual_studio_version = toolchain_data.vs_version
31 wdk_path = toolchain_data.wdk_dir 31 wdk_path = toolchain_data.wdk_dir
32 visual_studio_runtime_dirs = toolchain_data.runtime_dirs 32 visual_studio_runtime_dirs = toolchain_data.runtime_dirs
33 } else { 33 } else {
34 assert(visual_studio_version != "", 34 assert(visual_studio_version != "",
35 "You must set the visual_studio_version if you set the path") 35 "You must set the visual_studio_version if you set the path")
36 assert(wdk_path != "", 36 assert(wdk_path != "",
37 "You must set the wdk_path if you set the visual studio path") 37 "You must set the wdk_path if you set the visual studio path")
38 visual_studio_runtime_dirs = [] 38 visual_studio_runtime_dirs = []
39 } 39 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698