| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 """Utility class to build the chromium master BuildFactory's. | 5 """Utility class to build the chromium master BuildFactory's. |
| 6 | 6 |
| 7 Based on gclient_factory.py and adds chromium-specific steps.""" | 7 Based on gclient_factory.py and adds chromium-specific steps.""" |
| 8 | 8 |
| 9 import re | 9 import re |
| 10 | 10 |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 [('src/data/mozilla_js_tests', None)], | 166 [('src/data/mozilla_js_tests', None)], |
| 167 } | 167 } |
| 168 | 168 |
| 169 # pylint: disable=E1101 | 169 # pylint: disable=E1101 |
| 170 if config.Master.trunk_internal_url: | 170 if config.Master.trunk_internal_url: |
| 171 CUSTOM_DEPS_DEVTOOLS_PERF.append(('src/data/devtools_test_pages', | 171 CUSTOM_DEPS_DEVTOOLS_PERF.append(('src/data/devtools_test_pages', |
| 172 config.Master.trunk_internal_url + | 172 config.Master.trunk_internal_url + |
| 173 '/data/devtools_test_pages')) | 173 '/data/devtools_test_pages')) |
| 174 | 174 |
| 175 def __init__(self, build_dir, target_platform=None, pull_internal=True, | 175 def __init__(self, build_dir, target_platform=None, pull_internal=True, |
| 176 full_checkout=False, additional_svn_urls=None, name=None, | 176 full_checkout=False, additional_repos=None, name=None, |
| 177 custom_deps_list=None, nohooks_on_update=False, target_os=None, | 177 custom_deps_list=None, nohooks_on_update=False, target_os=None, |
| 178 swarm_client_canary=False, internal_custom_deps_list=None): | 178 swarm_client_canary=False, internal_custom_deps_list=None): |
| 179 if full_checkout: | 179 if full_checkout: |
| 180 needed_components = None | 180 needed_components = None |
| 181 else: | 181 else: |
| 182 needed_components = self.NEEDED_COMPONENTS | 182 needed_components = self.NEEDED_COMPONENTS |
| 183 main = gclient_factory.GClientSolution(config.Master.trunk_url_src, | 183 main = gclient_factory.GClientSolution(config.Master.trunk_url_src, |
| 184 needed_components=needed_components, | 184 needed_components=needed_components, |
| 185 name=name, | 185 name=name, |
| 186 custom_deps_list=custom_deps_list, | 186 custom_deps_list=custom_deps_list, |
| 187 custom_vars_list=[self.CUSTOM_VARS_WEBKIT_MIRROR, | 187 custom_vars_list=[self.CUSTOM_VARS_WEBKIT_MIRROR, |
| 188 self.CUSTOM_VARS_GOOGLECODE_URL, | 188 self.CUSTOM_VARS_GOOGLECODE_URL, |
| 189 self.CUSTOM_VARS_SOURCEFORGE_URL, | 189 self.CUSTOM_VARS_SOURCEFORGE_URL, |
| 190 self.CUSTOM_VARS_LLVM_URL, | 190 self.CUSTOM_VARS_LLVM_URL, |
| 191 self.CUSTOM_VARS_NACL_TRUNK_URL]) | 191 self.CUSTOM_VARS_NACL_TRUNK_URL]) |
| 192 solutions = [main] | 192 solutions = [main] |
| 193 if config.Master.trunk_internal_url_src and pull_internal: | 193 if config.Master.trunk_internal_url_src and pull_internal: |
| 194 if full_checkout: | 194 if full_checkout: |
| 195 needed_components = None | 195 needed_components = None |
| 196 else: | 196 else: |
| 197 needed_components = self.NEEDED_COMPONENTS_INTERNAL | 197 needed_components = self.NEEDED_COMPONENTS_INTERNAL |
| 198 internal = gclient_factory.GClientSolution( | 198 internal = gclient_factory.GClientSolution( |
| 199 config.Master.trunk_internal_url_src, | 199 config.Master.trunk_internal_url_src, |
| 200 needed_components=needed_components, | 200 needed_components=needed_components, |
| 201 custom_deps_list=internal_custom_deps_list) | 201 custom_deps_list=internal_custom_deps_list) |
| 202 solutions.append(internal) | 202 solutions.append(internal) |
| 203 | 203 |
| 204 additional_svn_urls = additional_svn_urls or [] | 204 additional_repos = additional_repos or [] |
| 205 for svn_url in additional_svn_urls: | 205 for name, url in additional_repos: |
| 206 solution = gclient_factory.GClientSolution(svn_url) | 206 solution = gclient_factory.GClientSolution(url, name=name) |
| 207 solutions.append(solution) | 207 solutions.append(solution) |
| 208 | 208 |
| 209 gclient_factory.GClientFactory.__init__(self, | 209 gclient_factory.GClientFactory.__init__(self, |
| 210 build_dir, solutions, target_platform=target_platform, | 210 build_dir, solutions, target_platform=target_platform, |
| 211 nohooks_on_update=nohooks_on_update, target_os=target_os, | 211 nohooks_on_update=nohooks_on_update, target_os=target_os, |
| 212 revision_mapping=self.CHROMIUM_GOT_REVISION_MAPPINGS) | 212 revision_mapping=self.CHROMIUM_GOT_REVISION_MAPPINGS) |
| 213 if swarm_client_canary: | 213 if swarm_client_canary: |
| 214 # Contrary to other canaries like blink, v8, we don't really care about | 214 # Contrary to other canaries like blink, v8, we don't really care about |
| 215 # having one build per swarm_client commits by having an additional source | 215 # having one build per swarm_client commits by having an additional source |
| 216 # change listener so just fetching @ToT all the time is good enough. | 216 # change listener so just fetching @ToT all the time is good enough. |
| (...skipping 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1248 factory_properties) | 1248 factory_properties) |
| 1249 | 1249 |
| 1250 def ChromiumCodesearchFactory(self, target='Release', clobber=False, | 1250 def ChromiumCodesearchFactory(self, target='Release', clobber=False, |
| 1251 tests=None, mode=None, | 1251 tests=None, mode=None, |
| 1252 slave_type='BuilderTester', options=None, | 1252 slave_type='BuilderTester', options=None, |
| 1253 compile_timeout=1200, build_url=None, | 1253 compile_timeout=1200, build_url=None, |
| 1254 project=None, factory_properties=None): | 1254 project=None, factory_properties=None): |
| 1255 # Make sure the solution is not already there. | 1255 # Make sure the solution is not already there. |
| 1256 assert 'clang_indexer.DEPS' not in [s.name for s in self._solutions] | 1256 assert 'clang_indexer.DEPS' not in [s.name for s in self._solutions] |
| 1257 self._solutions.append(gclient_factory.GClientSolution( | 1257 self._solutions.append(gclient_factory.GClientSolution( |
| 1258 'svn://svn.chromium.org/chrome-internal/trunk/deps/' | 1258 'https://chrome-internal.googlesource.com/chrome/tools/clang_indexer')) |
| 1259 'clang_indexer.DEPS')) | |
| 1260 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, | 1259 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, |
| 1261 options, compile_timeout, build_url, project, | 1260 options, compile_timeout, build_url, project, |
| 1262 factory_properties) | 1261 factory_properties) |
| 1263 | 1262 |
| 1264 def ChromiumOSASANFactory(self, target='Release', clobber=False, tests=None, | 1263 def ChromiumOSASANFactory(self, target='Release', clobber=False, tests=None, |
| 1265 mode=None, slave_type='BuilderTester', options=None, | 1264 mode=None, slave_type='BuilderTester', options=None, |
| 1266 compile_timeout=1200, build_url=None, project=None, | 1265 compile_timeout=1200, build_url=None, project=None, |
| 1267 factory_properties=None): | 1266 factory_properties=None): |
| 1268 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, | 1267 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, |
| 1269 options, compile_timeout, build_url, project, | 1268 options, compile_timeout, build_url, project, |
| 1270 factory_properties) | 1269 factory_properties) |
| OLD | NEW |