From 71c5393b73d1bc4d82e168ae9a8ad5ef86150748 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Wed, 12 Oct 2016 14:32:09 -0400 Subject: Update GN recipes for Windows. fetch-gn is a Python script, gn is a batch script, and ninja is an exe. Pass the win_toolchain package to GN as windk. This won't work yet. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3245 Change-Id: Iacc59c70c06ec118fc6a45d0cdb67095ff2b951b Reviewed-on: https://skia-review.googlesource.com/3245 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- .../Build-Mac-Clang-x86_64-Debug-CommandBuffer.json | 2 ++ .../swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json | 2 ++ .../Build-Ubuntu-Clang-x86_64-Debug-ASAN.json | 2 ++ .../Build-Ubuntu-Clang-x86_64-Debug-GN.json | 2 ++ .../swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json | 2 ++ .../swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json | 2 ++ .../Build-Ubuntu-GCC-x86_64-Debug-MSAN.json | 2 ++ .../Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json | 2 ++ ...untu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json | 2 ++ .../Build-Ubuntu-GCC-x86_64-Release-ANGLE.json | 2 ++ .../Build-Ubuntu-GCC-x86_64-Release-Fast.json | 2 ++ .../Build-Ubuntu-GCC-x86_64-Release-Mesa.json | 2 ++ .../Build-Ubuntu-GCC-x86_64-Release-Valgrind.json | 2 ++ .../swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json | 8 +++++--- 14 files changed, 31 insertions(+), 3 deletions(-) (limited to 'infra/bots/recipes/swarm_compile.expected') diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 6fa0d25a68..296bc17a28 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -162,6 +162,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json index 4f2a133c99..afb2ad8b5d 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 8d0c0cbd7c..2736afd54d 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json index f3a6c826f0..63a6c02458 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json index 3555d1ad1e..c184198290 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index 33659c3736..b92a4ea481 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index febfd4390f..eb857e3e16 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index a463745267..9d20fd3055 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index b668f31e93..54c6712ca3 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index 05ea9e4ae4..e9e752acc5 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index 5b57b34bd1..3dbcf3028b 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index 59fe37fec0..f3f5490bdc 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json index c3f9260744..f7234aebe7 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json index ce0290855e..49a9c7a749 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -121,6 +121,8 @@ }, { "cmd": [ + "python", + "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", @@ -131,10 +133,10 @@ }, { "cmd": [ - "gn", + "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN\\Release", - "--args=is_debug=false target_cpu=\"x86\"" + "--args=is_debug=false target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { @@ -144,7 +146,7 @@ }, { "cmd": [ - "ninja", + "ninja.exe", "-C", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN\\Release" ], -- cgit v1.2.3