| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from slave.recipe_config import config_item_context, ConfigGroup | 5 import os |
| 6 from slave.recipe_config import Dict, Set, Single, Static | 6 import sys |
| 7 from slave.recipe_config_types import Path | 7 |
| 8 from recipe_engine.config import config_item_context, ConfigGroup |
| 9 from recipe_engine.config import Dict, Set, Single, Static |
| 10 from recipe_engine.config_types import Path |
| 11 |
| 12 # TODO(luqui): Separate this out so we can make the recipes independent of |
| 13 # build/. |
| 14 sys.path.append( |
| 15 os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname( |
| 16 os.path.abspath(__file__)))))) |
| 17 |
| 8 from common.skia import builder_name_schema | 18 from common.skia import builder_name_schema |
| 9 | 19 |
| 10 | 20 |
| 11 CONFIG_DEBUG = 'Debug' | 21 CONFIG_DEBUG = 'Debug' |
| 12 CONFIG_RELEASE = 'Release' | 22 CONFIG_RELEASE = 'Release' |
| 13 VALID_CONFIGS = (CONFIG_DEBUG, CONFIG_RELEASE) | 23 VALID_CONFIGS = (CONFIG_DEBUG, CONFIG_RELEASE) |
| 14 | 24 |
| 15 | 25 |
| 16 def BaseConfig(BUILDER_NAME, MASTER_NAME, SLAVE_NAME, **_kwargs): | 26 def BaseConfig(BUILDER_NAME, MASTER_NAME, SLAVE_NAME, **_kwargs): |
| 17 equal_fn = lambda tup: ('%s=%s' % tup) | 27 equal_fn = lambda tup: ('%s=%s' % tup) |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 (c.role == builder_name_schema.BUILDER_ROLE_TEST and | 211 (c.role == builder_name_schema.BUILDER_ROLE_TEST and |
| 202 c.configuration == CONFIG_DEBUG) or | 212 c.configuration == CONFIG_DEBUG) or |
| 203 'Valgrind' in c.BUILDER_NAME) | 213 'Valgrind' in c.BUILDER_NAME) |
| 204 c.gyp_env.GYP_DEFINES.update(gyp_defs_from_builder_dict(c.builder_cfg)) | 214 c.gyp_env.GYP_DEFINES.update(gyp_defs_from_builder_dict(c.builder_cfg)) |
| 205 c.is_trybot = builder_name_schema.IsTrybot(c.BUILDER_NAME) | 215 c.is_trybot = builder_name_schema.IsTrybot(c.BUILDER_NAME) |
| 206 c.extra_env_vars = get_extra_env_vars(c.builder_cfg) | 216 c.extra_env_vars = get_extra_env_vars(c.builder_cfg) |
| 207 arch = (c.builder_cfg.get('arch') or c.builder_cfg.get('target_arch')) | 217 arch = (c.builder_cfg.get('arch') or c.builder_cfg.get('target_arch')) |
| 208 if ('Win' in c.builder_cfg.get('os', '') and arch == 'x86_64'): | 218 if ('Win' in c.builder_cfg.get('os', '') and arch == 'x86_64'): |
| 209 c.configuration += '_x64' | 219 c.configuration += '_x64' |
| 210 | 220 |
| OLD | NEW |