diff options
author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 17:42:25 +0000 |
---|---|---|
committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 17:42:25 +0000 |
commit | ffe2056247cf654136c6247287a8b59132dda2f4 (patch) | |
tree | 1e18673984e4a01a2548c9e6274b09116577cee7 /build/config/win/visual_studio_version.gni | |
parent | 48abf8153428c988f0740b5515beb4ecab18d837 (diff) | |
download | chromium_src-ffe2056247cf654136c6247287a8b59132dda2f4.zip chromium_src-ffe2056247cf654136c6247287a8b59132dda2f4.tar.gz chromium_src-ffe2056247cf654136c6247287a8b59132dda2f4.tar.bz2 |
Use depot_tools toolchain, remove now unneeded code, fix not including path to win sdk tools
This is enough for this to work OK:
[gn-2013]d:\src\cr\src>gn gen out_gn
[gn-2013]d:\src\cr\src>ninja -C out_gn gn
[gn-2013]d:\src\cr\src>out_gn\gn gen out_gn2
[gn-2013]d:\src\cr\src>ninja -C out_gn2 gn
...
[297/297] LINK gn.exe
I'm not sure if we need all the deleted stuff for something
else, but I guess we can revive it when we need it.
(There's some dependency problem with linking atm, as
"ninja -C out_gn gn" always relinks, but I think it's unrelated.)
R=brettw@chromium.org
BUG=297677
Review URL: https://codereview.chromium.org/204663004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/config/win/visual_studio_version.gni')
-rw-r--r-- | build/config/win/visual_studio_version.gni | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/build/config/win/visual_studio_version.gni b/build/config/win/visual_studio_version.gni index 79b5841..cda36b0 100644 --- a/build/config/win/visual_studio_version.gni +++ b/build/config/win/visual_studio_version.gni @@ -3,34 +3,20 @@ # found in the LICENSE file.
declare_args() {
- # Version of Visual Studio to use.
- #
- # Possible values:
- # - "auto"
- # - "2010"
- # - "2010e"
- # - "2012"
- # - "2012e"
- # - "2013"
- # - "2013e"
- #
- # The "e" variants denote "Express". The default, "auto" will find the
- # preferred one of all Visual Studios installed on the current system.
- visual_studio_version = "auto"
-
- # The path to use as the root of a Visual Studio install. If nonempty,
- # this path will be used instead of any autodetected install locations,
- # which allows you to have the Visual Studio files in a directory without
- # actually "installing" it.
- #
- # When empty, we will autodetect the best Visual Studio path to use. The
- # autodetected one is usually something like
- # "C:\Program Files (x86)\Microsoft Visual Studio 10.0".
+ # Path to Visual Studio. If empty, the default is used which is to use the
+ # automatic toolchain in depot_tools.
visual_studio_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.
+ windows_sdk_path = "C:\Program Files (x86)\Windows Kits\8.0"
}
if (visual_studio_path == "") {
- visual_studio_path = exec_script("get_visual_studio_path.py",
- [ visual_studio_version ], "value")
+ toolchain_data =
+ exec_script("../../vs_toolchain.py", [ "get_toolchain_dir" ], "value")
+ visual_studio_path = toolchain_data[0]
+ windows_sdk_path = toolchain_data[1]
}
|