| 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 from buildbot.changes import svnpoller | 5 from buildbot.changes import svnpoller |
| 6 from buildbot.scheduler import Scheduler | 6 from buildbot.scheduler import Scheduler |
| 7 | 7 |
| 8 # These modules come from scripts/master, which must be in the PYTHONPATH. | 8 # These modules come from scripts/master, which must be in the PYTHONPATH. |
| 9 from master import build_utils | 9 from master import build_utils |
| 10 from master import master_utils | 10 from master import master_utils |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 # ---------------------------------------------------------------------------- | 93 # ---------------------------------------------------------------------------- |
| 94 # FACTORIES | 94 # FACTORIES |
| 95 | 95 |
| 96 F = chromium_factory.ChromiumFactory | 96 F = chromium_factory.ChromiumFactory |
| 97 def win(): return F('src/build', 'win32') | 97 def win(): return F('src/build', 'win32') |
| 98 def mac(): return F('src/xcodebuild', 'darwin') | 98 def mac(): return F('src/xcodebuild', 'darwin') |
| 99 def linux(): return F('src/out', 'linux2') | 99 def linux(): return F('src/out', 'linux2') |
| 100 def chromeos(): return F('src/out', 'linux2') | 100 def chromeos(): return F('src/out', 'linux2') |
| 101 | 101 |
| 102 # Please contact chrome-re before changing this _google_chrome_rel builder | 102 # Please contact chrome-re before changing this _google_chrome_rel builder |
| 103 # Please keep master.chromium.perf in sync with this |
| 103 f_google_chrome_rel_win = win().ChromiumFactory( | 104 f_google_chrome_rel_win = win().ChromiumFactory( |
| 104 clobber=True, | 105 clobber=True, |
| 105 compile_timeout=4800, | 106 compile_timeout=4800, |
| 106 mode='google_chrome', | 107 mode='google_chrome', |
| 107 project='all.sln;chrome_official_builder', | 108 project='all.sln;chrome_official_builder', |
| 108 tests=[], | 109 tests=[], |
| 109 factory_properties={ | 110 factory_properties={ |
| 110 'gclient_env': {'GYP_DEFINES': 'branding=Chrome ' | 111 'gclient_env': {'GYP_DEFINES': 'branding=Chrome ' |
| 111 'component=static_library'}}) | 112 'component=static_library'}}) |
| 112 | 113 |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 enable_http_status_push=ActiveMaster.is_production_host) | 244 enable_http_status_push=ActiveMaster.is_production_host) |
| 244 | 245 |
| 245 if TREE_GATE_KEEPER: | 246 if TREE_GATE_KEEPER: |
| 246 import master_gatekeeper_cfg | 247 import master_gatekeeper_cfg |
| 247 master_gatekeeper_cfg.Update(config, ActiveMaster, c) | 248 master_gatekeeper_cfg.Update(config, ActiveMaster, c) |
| 248 | 249 |
| 249 ####### PROJECT IDENTITY | 250 ####### PROJECT IDENTITY |
| 250 | 251 |
| 251 # Buildbot master url: | 252 # Buildbot master url: |
| 252 c['buildbotURL'] = 'http://build.chromium.org/buildbot/chromium.chrome/' | 253 c['buildbotURL'] = 'http://build.chromium.org/buildbot/chromium.chrome/' |
| OLD | NEW |