| Index: infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
|
| diff --git a/infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
|
| similarity index 87%
|
| copy from infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json
|
| copy to infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
|
| index 94929b767f7bc0fd6741d6365a456d4b9856736c..6819581eb6b12c6530d34b5a9f77273dea8176ff 100644
|
| --- a/infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json
|
| +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
|
| @@ -76,7 +76,7 @@
|
| "-u",
|
| "[CUSTOM_C:\\_B_WORK]\\skia\\tools\\buildbot_spec.py",
|
| "/path/to/tmp/json",
|
| - "Build-Win-MSVC-x86-Debug"
|
| + "Build-Win-MSVC-x86-Release-GN"
|
| ],
|
| "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
|
| "name": "exec buildbot_spec.py",
|
| @@ -87,13 +87,14 @@
|
| "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"GN\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| @@ -113,61 +114,58 @@
|
| },
|
| {
|
| "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": {
|
| + "BUILDTYPE": "Release",
|
| + "CHROME_HEADLESS": "1",
|
| + "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
|
| + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
|
| + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN"
|
| + },
|
| + "name": "fetch-gn"
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "make.py",
|
| - "most"
|
| + "gn.exe",
|
| + "gen",
|
| + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN\\Release",
|
| + "--args=is_debug=false"
|
| ],
|
| "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
|
| "env": {
|
| - "BUILDTYPE": "Debug",
|
| + "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| - "CHROME_PATH": "[SLAVE_BUILD]\\src",
|
| "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
|
| + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN"
|
| },
|
| - "name": "build most",
|
| - "~followup_annotations": [
|
| - "step returned non-zero exit code: 1",
|
| - "@@@STEP_FAILURE@@@"
|
| - ]
|
| + "name": "gn_gen"
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "make.py",
|
| - "most"
|
| + "ninja",
|
| + "-C",
|
| + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN\\Release"
|
| ],
|
| "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
|
| "env": {
|
| - "BUILDTYPE": "Debug",
|
| + "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| - "CHROME_PATH": "[SLAVE_BUILD]\\src",
|
| "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
|
| + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN"
|
| },
|
| - "name": "build most (2)"
|
| + "name": "compile most"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
|
| - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug"
|
| + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN\\Release",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Release"
|
| ],
|
| "name": "copy build products",
|
| "~followup_annotations": [
|
|
|