diff options
author | 2016-10-13 15:45:07 -0400 | |
---|---|---|
committer | 2016-10-13 20:35:04 +0000 | |
commit | 69f6ed40eb8d363644a6b53f5fcbbf88baee372f (patch) | |
tree | 30b5d0dd41cf2726aaeab3fc91e358351a466fa3 /infra/bots/recipes | |
parent | 466ad9986851d48cd594efb9a2a5de27c620cdea (diff) |
GN/Win: suppport GDI, convert GDI bots to build with GN.
CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Win-MSVC-x86-Debug-GDI-Trybot,Build-Win-MSVC-x86-Release-GDI-Trybot;master.client.skia:Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI-Trybot,Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI-Trybot,Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI-Trybot
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3324
Change-Id: I3ff2f5d16de9fff7ed77fa5127b96bef55bef957
Reviewed-on: https://skia-review.googlesource.com/3324
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'infra/bots/recipes')
-rw-r--r-- | infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json index cd08ff7e65..38d8f64043 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -123,30 +123,39 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py", - "--win_toolchain_json", - "[SLAVE_BUILD]\\src\\build\\win_toolchain.json", - "--depot_tools_parent_dir", - "[SLAVE_BUILD]" + "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], - "name": "bootstrap win toolchain" + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "env": { + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" }, { "cmd": [ - "python", - "make.py", - "most" + "gn.bat", + "gen", + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI\\Release", + "--args=is_debug=false skia_use_gdi=true target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]\\src", - "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_gdi=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja.exe", + "-C", + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI\\Release" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build most" + "name": "ninja" }, { "cmd": [ |