diff options
author | Brian Osman <brianosman@google.com> | 2018-06-06 11:51:31 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-06 16:59:04 +0000 |
commit | 2d7678d61fb68a2c9060a9fad8ebabf4e0053576 (patch) | |
tree | 5d39c603ea6397569b174c8af0c298a6afdcd2d4 | |
parent | f454bd3930ec61d4a8aa20c877d386077152c1e0 (diff) |
Update MSVS toolchain for bots:
MSVC 14.14.26428
SDK 10.0.17134.0
Docs-Preview: https://skia.org/?cl=132409
Change-Id: I02686531804ac026b92bceed29dc28d246fe4902
Reviewed-on: https://skia-review.googlesource.com/132409
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
7 files changed, 8 insertions, 8 deletions
diff --git a/infra/bots/assets/win_toolchain/VERSION b/infra/bots/assets/win_toolchain/VERSION index c7930257df..301160a930 100644 --- a/infra/bots/assets/win_toolchain/VERSION +++ b/infra/bots/assets/win_toolchain/VERSION @@ -1 +1 @@ -7
\ No newline at end of file +8
\ No newline at end of file diff --git a/infra/bots/recipe_modules/build/default.py b/infra/bots/recipe_modules/build/default.py index d9b50506ee..63c168b2d1 100644 --- a/infra/bots/recipe_modules/build/default.py +++ b/infra/bots/recipe_modules/build/default.py @@ -53,7 +53,7 @@ def compile_fn(api, checkout_root, out_dir): linux_vulkan_sdk = str(api.vars.slave_dir.join('linux_vulkan_sdk')) win_toolchain = str(api.vars.slave_dir.join( 't', 'depot_tools', 'win_toolchain', 'vs_files', - 'a9e1098bba66d2acccc377d5ee81265910f29272')) + '5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c')) win_vulkan_sdk = str(api.vars.slave_dir.join('win_vulkan_sdk')) moltenvk = str(api.vars.slave_dir.join('moltenvk')) diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json index 4bc23ba226..69aabc3974 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json @@ -32,7 +32,7 @@ "[START_DIR]/cache/work/skia/bin/gn.exe", "gen", "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug", - "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" + "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c/VC\"" ], "cwd": "[START_DIR]/cache/work/skia", "env": { diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index c205e593b6..0f8aa55e62 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -32,7 +32,7 @@ "[START_DIR]/cache/work/skia/bin/gn.exe", "gen", "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", - "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" + "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c/VC\"" ], "cwd": "[START_DIR]/cache/work/skia", "env": { diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json index ba33a339f7..93f86d69b2 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json @@ -141,7 +141,7 @@ "[START_DIR]/cache/work/skia/bin/gn.exe", "gen", "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug/Debug", - "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" + "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c/VC\"" ], "cwd": "[START_DIR]/cache/work/skia", "env": { diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index ae47c27964..5530cfdbaf 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -17585,7 +17585,7 @@ { "name": "skia/bots/win_toolchain", "path": "t", - "version": "version:7" + "version": "version:8" } ], "command": [ diff --git a/site/user/build.md b/site/user/build.md index c9d17b4ec1..899a11b581 100644 --- a/site/user/build.md +++ b/site/user/build.md @@ -257,8 +257,8 @@ The bots use a packaged 2017 toolchain, which Googlers can download like this: You can then pass the VC and SDK paths to GN by setting your GN args: - win_vc = "C:\toolchain\depot_tools\win_toolchain\vs_files\a9e1098bba66d2acccc377d5ee81265910f29272\VC" - win_sdk = "C:\toolchain\depot_tools\win_toolchain\vs_files\a9e1098bba66d2acccc377d5ee81265910f29272\win_sdk" + win_vc = "C:\toolchain\depot_tools\win_toolchain\vs_files\5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c\VC" + win_sdk = "C:\toolchain\depot_tools\win_toolchain\vs_files\5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c\win_sdk" This toolchain is the only way we support 32-bit builds, by also setting `target_cpu="x86"`. There is also a corresponding 2015 toolchain, downloaded via `infra/bots/assets/win_toolchain_2015`. |