| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 import types | 5 import types |
| 6 | 6 |
| 7 from recipe_engine.config import config_item_context, ConfigGroup, BadConf | 7 from recipe_engine.config import config_item_context, ConfigGroup, BadConf |
| 8 from recipe_engine.config import ConfigList, Dict, Single, Static, Set, List | 8 from recipe_engine.config import ConfigList, Dict, Single, Static, Set, List |
| 9 | 9 |
| 10 from . import api as gclient_api | 10 from . import api as gclient_api |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 # If value is None, the property value will be applied to | 60 # If value is None, the property value will be applied to |
| 61 # solutions[0].revision. Otherwise, it will be applied to | 61 # solutions[0].revision. Otherwise, it will be applied to |
| 62 # solutions[0].custom_vars['custom_var_name'] | 62 # solutions[0].custom_vars['custom_var_name'] |
| 63 parent_got_revision_mapping = Dict(hidden=True), | 63 parent_got_revision_mapping = Dict(hidden=True), |
| 64 delete_unversioned_trees = Single(bool, empty_val=True, required=False), | 64 delete_unversioned_trees = Single(bool, empty_val=True, required=False), |
| 65 | 65 |
| 66 # Maps patch_project to (solution/path, revision). | 66 # Maps patch_project to (solution/path, revision). |
| 67 # - solution/path is then used to apply patches as patch root in | 67 # - solution/path is then used to apply patches as patch root in |
| 68 # bot_update. | 68 # bot_update. |
| 69 # - if revision is given, it's passed verbatim to bot_update for | 69 # - if revision is given, it's passed verbatim to bot_update for |
| 70 # corresponding dependency. | 70 # corresponding dependency. Otherwise (ie None), the patch will be |
| 71 # applied on top of version pinned in DEPS. |
| 71 # This is essentially a whitelist of which projects inside a solution | 72 # This is essentially a whitelist of which projects inside a solution |
| 72 # can be patched automatically by bot_update based on PATCH_PROJECT | 73 # can be patched automatically by bot_update based on PATCH_PROJECT |
| 73 # property. | 74 # property. |
| 74 # For example, bare chromium solution has this entry in patch_projects | 75 # For example, bare chromium solution has this entry in patch_projects |
| 75 # 'angle/angle': ('src/third_party/angle', 'HEAD') | 76 # 'angle/angle': ('src/third_party/angle', 'HEAD') |
| 76 # then a patch to Angle project can be applied to a chromium src's | 77 # then a patch to Angle project can be applied to a chromium src's |
| 77 # checkout after first updating Angle's repo to its master's HEAD. | 78 # checkout after first updating Angle's repo to its master's HEAD. |
| 78 patch_projects = Dict(value_type=tuple, hidden=True), | 79 patch_projects = Dict(value_type=tuple, hidden=True), |
| 79 | 80 |
| 80 # Check out refs/branch-heads. | 81 # Check out refs/branch-heads. |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 659 soln = c.solutions.add() | 660 soln = c.solutions.add() |
| 660 soln.name = 'gerrit-test-cq-normal' | 661 soln.name = 'gerrit-test-cq-normal' |
| 661 soln.url = 'https://chromium.googlesource.com/playground/gerrit-cq/normal.git' | 662 soln.url = 'https://chromium.googlesource.com/playground/gerrit-cq/normal.git' |
| 662 | 663 |
| 663 # TODO(phajdan.jr): Move to proper repo and add coverage. | 664 # TODO(phajdan.jr): Move to proper repo and add coverage. |
| 664 @config_ctx() | 665 @config_ctx() |
| 665 def valgrind(c): # pragma: no cover | 666 def valgrind(c): # pragma: no cover |
| 666 """Add Valgrind binaries to the gclient solution.""" | 667 """Add Valgrind binaries to the gclient solution.""" |
| 667 c.solutions[0].custom_deps['src/third_party/valgrind'] = \ | 668 c.solutions[0].custom_deps['src/third_party/valgrind'] = \ |
| 668 ChromiumGitURL(c, 'chromium', 'deps', 'valgrind', 'binaries') | 669 ChromiumGitURL(c, 'chromium', 'deps', 'valgrind', 'binaries') |
| OLD | NEW |