| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 os | 9 import os |
| 10 import re | 10 import re |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 # The commented parts of this list are wannabes but don't work yet. | 56 # The commented parts of this list are wannabes but don't work yet. |
| 57 DR_MEMORY_GYP_DEFINES = ( | 57 DR_MEMORY_GYP_DEFINES = ( |
| 58 'win_debug_RuntimeChecks=0 ' | 58 'win_debug_RuntimeChecks=0 ' |
| 59 'win_debug_disable_iterator_debugging=1 ' | 59 'win_debug_disable_iterator_debugging=1 ' |
| 60 # 'win_debug_Optimization=1 ' | 60 # 'win_debug_Optimization=1 ' |
| 61 # 'win_debug_InlineFunctionExpansion=0 ' | 61 # 'win_debug_InlineFunctionExpansion=0 ' |
| 62 # 'win_debug_OmitFramePointers=0 ' | 62 # 'win_debug_OmitFramePointers=0 ' |
| 63 | 63 |
| 64 'win_release_InlineFunctionExpansion=0 ' | 64 'win_release_InlineFunctionExpansion=0 ' |
| 65 'win_release_OmitFramePointers=0 ' | 65 'win_release_OmitFramePointers=0 ' |
| 66 'release_valgrind_build=1 ' # Keep the code under #ifndef NVALGRIND |
| 66 ) | 67 ) |
| 67 | 68 |
| 68 # gclient custom vars | 69 # gclient custom vars |
| 69 CUSTOM_VARS_GOOGLECODE_URL = ('googlecode_url', config.Master.googlecode_url) | 70 CUSTOM_VARS_GOOGLECODE_URL = ('googlecode_url', config.Master.googlecode_url) |
| 70 CUSTOM_VARS_SOURCEFORGE_URL = ('sourceforge_url', | 71 CUSTOM_VARS_SOURCEFORGE_URL = ('sourceforge_url', |
| 71 config.Master.sourceforge_url) | 72 config.Master.sourceforge_url) |
| 72 CUSTOM_VARS_WEBKIT_MIRROR = ('webkit_trunk', config.Master.webkit_trunk_url) | 73 CUSTOM_VARS_WEBKIT_MIRROR = ('webkit_trunk', config.Master.webkit_trunk_url) |
| 73 # $$WK_REV$$ below will be substituted with the revision that triggered the | 74 # $$WK_REV$$ below will be substituted with the revision that triggered the |
| 74 # build in chromium_step.py@GClient.startVC. Use this only with builds | 75 # build in chromium_step.py@GClient.startVC. Use this only with builds |
| 75 # triggered by a webkit poller. | 76 # triggered by a webkit poller. |
| (...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 848 if 'cros_deps' not in [s.name for s in self._solutions]: | 849 if 'cros_deps' not in [s.name for s in self._solutions]: |
| 849 self._solutions.append(gclient_factory.GClientSolution( | 850 self._solutions.append(gclient_factory.GClientSolution( |
| 850 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) | 851 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) |
| 851 if 'asan.DEPS' not in [s.name for s in self._solutions]: | 852 if 'asan.DEPS' not in [s.name for s in self._solutions]: |
| 852 self._solutions.append(gclient_factory.GClientSolution( | 853 self._solutions.append(gclient_factory.GClientSolution( |
| 853 'http://src.chromium.org/svn/trunk/deps/asan.DEPS', | 854 'http://src.chromium.org/svn/trunk/deps/asan.DEPS', |
| 854 'asan.DEPS')) | 855 'asan.DEPS')) |
| 855 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, | 856 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, |
| 856 options, compile_timeout, build_url, project, | 857 options, compile_timeout, build_url, project, |
| 857 factory_properties) | 858 factory_properties) |
| OLD | NEW |