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

Unified Diff: build/config/win/visual_studio_version.gni

Issue 306613002: Add support for VS express to the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « build/config/win/BUILD.gn ('k') | build/vs_toolchain.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/win/visual_studio_version.gni
diff --git a/build/config/win/visual_studio_version.gni b/build/config/win/visual_studio_version.gni
index 3f156f3c3af18e6e50612cf63c852ac9282dace5..c73f98af5116ada6f5a2622f12483b9314155503 100644
--- a/build/config/win/visual_studio_version.gni
+++ b/build/config/win/visual_studio_version.gni
@@ -4,9 +4,18 @@
declare_args() {
# Path to Visual Studio. If empty, the default is used which is to use the
- # automatic toolchain in depot_tools.
+ # automatic toolchain in depot_tools. If set, you must also set the
+ # visual_studio_version and wdk_path.
visual_studio_path = ""
+ # Version of Visual Studio pointed to by the visual_studio_path.
+ # Use "2013" for Visual Studio 2013, or "2013e" for the Express version.
+ visual_studio_version = ""
+
+ # Directory of the Windows driver kit. If visual_studio_path is empty, this
+ # will be auto-filled.
+ wdk_path = ""
+
# Full path to the Windows SDK, not including a backslash at the end.
# This value is the default location, override if you have a different
# installation location.
@@ -15,7 +24,17 @@ declare_args() {
if (visual_studio_path == "") {
toolchain_data =
- exec_script("../../vs_toolchain.py", [ "get_toolchain_dir" ], "value")
- visual_studio_path = toolchain_data[0]
- windows_sdk_path = toolchain_data[1]
+ exec_script("../../vs_toolchain.py", [ "get_toolchain_dir" ], "scope")
+ visual_studio_path = toolchain_data.vs_path
+ windows_sdk_path = toolchain_data.sdk_path
+ visual_studio_version = toolchain_data.vs_version
+ wdk_path = toolchain_data.wdk_dir
+} else {
+ assert(visual_studio_version != "",
+ "You must set the visual_studio_version if you set the path")
+ assert(wdk_path != "",
+ "You must set the wdk_path if you set the visual studio path")
}
+
+# Set when using the "Express" version of a Visual Studio version we support.
+is_visual_studio_express = (visual_studio_version == "2013e")
« no previous file with comments | « build/config/win/BUILD.gn ('k') | build/vs_toolchain.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698