Chromium Code Reviews| 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 master import master_config | 5 from master import master_config |
| 6 from master.factory import chromium_factory | 6 from master.factory import chromium_factory |
| 7 | 7 |
| 8 import master_site_config | 8 import master_site_config |
| 9 | 9 |
| 10 ActiveMaster = master_site_config.Chromium | 10 ActiveMaster = master_site_config.Chromium |
| 11 | 11 |
| 12 defaults = {} | 12 defaults = {} |
| 13 | 13 |
| 14 helper = master_config.Helper(defaults) | 14 helper = master_config.Helper(defaults) |
| 15 B = helper.Builder | 15 B = helper.Builder |
| 16 D = helper.Dependent | 16 D = helper.Dependent |
| 17 F = helper.Factory | 17 F = helper.Factory |
| 18 S = helper.Scheduler | 18 S = helper.Scheduler |
| 19 T = helper.Triggerable | 19 T = helper.Triggerable |
| 20 | 20 |
| 21 def win(): return chromium_factory.ChromiumFactory('src/build', 'win32') | 21 def win(): return chromium_factory.ChromiumFactory('src/build', 'win32') |
|
iannucci1
2013/05/22 22:39:47
add a win_out() which has build_dir set to 'src/ou
scottmg
2013/05/22 22:48:27
Done.
| |
| 22 def linux(): return chromium_factory.ChromiumFactory('src/out', 'linux2') | 22 def linux(): return chromium_factory.ChromiumFactory('src/out', 'linux2') |
| 23 def mac(): return chromium_factory.ChromiumFactory('src/xcodebuild', 'darwin') | 23 def mac(): return chromium_factory.ChromiumFactory('src/xcodebuild', 'darwin') |
| 24 def linux_android(): return chromium_factory.ChromiumFactory( | 24 def linux_android(): return chromium_factory.ChromiumFactory( |
| 25 'src/out', 'linux2', nohooks_on_update=True, target_os='android') | 25 'src/out', 'linux2', nohooks_on_update=True, target_os='android') |
| 26 | 26 |
| 27 defaults['category'] = '1clobber' | 27 defaults['category'] = '1clobber' |
| 28 | 28 |
| 29 # Global scheduler | 29 # Global scheduler |
| 30 S('chromium', branch='src', treeStableTimer=60) | 30 S('chromium', branch='src', treeStableTimer=60) |
| 31 | 31 |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 51 'perf_id': 'chromium-rel-xp', | 51 'perf_id': 'chromium-rel-xp', |
| 52 'expectations': True, | 52 'expectations': True, |
| 53 'process_dumps': True, | 53 'process_dumps': True, |
| 54 'start_crash_handler': True, | 54 'start_crash_handler': True, |
| 55 'generate_gtest_json': ActiveMaster.is_production_host, | 55 'generate_gtest_json': ActiveMaster.is_production_host, |
| 56 'gclient_env': { | 56 'gclient_env': { |
| 57 'GYP_DEFINES': 'test_isolation_mode=noop', | 57 'GYP_DEFINES': 'test_isolation_mode=noop', |
| 58 }, | 58 }, |
| 59 })) | 59 })) |
| 60 | 60 |
| 61 B('Win Split', 'win_split', 'compile|windows', 'chromium') | |
| 62 F('win_split', win().ChromiumFactory( | |
|
iannucci1
2013/05/22 22:39:47
use it here
scottmg
2013/05/22 22:48:27
Done.
| |
| 63 target='Release', | |
| 64 options=['--build-tool=ninja'] | |
|
iannucci1
2013/05/22 22:39:47
Do you want to specify the targets to build a la t
scottmg
2013/05/22 22:48:27
Sorry, not sure what you mean here. Adding a 'test
iannucci
2013/05/22 23:04:08
Meaning, do you want to compile something specific
| |
| 65 factory_properties={ | |
| 66 'expectations': True, | |
| 67 'process_dumps': True, | |
| 68 'start_crash_handler': True, | |
| 69 'gclient_env': { | |
| 70 'GYP_DEFINES': 'fastbuild=1 chrome_split_dll=1', | |
|
iannucci1
2013/05/22 22:39:47
I think you need GYP_GENERATORS=ninja here
scottmg
2013/05/22 22:48:27
Done.
| |
| 71 }, | |
| 72 })) | |
| 73 | |
| 74 | |
| 61 ################################################################################ | 75 ################################################################################ |
| 62 ## Mac | 76 ## Mac |
| 63 ################################################################################ | 77 ################################################################################ |
| 64 | 78 |
| 65 B('Mac', 'mac_clobber', 'compile|testers', 'chromium', | 79 B('Mac', 'mac_clobber', 'compile|testers', 'chromium', |
| 66 notify_on_missing=True) | 80 notify_on_missing=True) |
| 67 F('mac_clobber', mac().ChromiumFactory( | 81 F('mac_clobber', mac().ChromiumFactory( |
| 68 clobber=True, | 82 clobber=True, |
| 69 tests=[ | 83 tests=[ |
| 70 'check_deps2git', | 84 'check_deps2git', |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 155 'gs_bucket': 'gs://chromium-browser-snapshots', | 169 'gs_bucket': 'gs://chromium-browser-snapshots', |
| 156 'perf_id': 'android-release', | 170 'perf_id': 'android-release', |
| 157 'show_perf_results': True, | 171 'show_perf_results': True, |
| 158 }, | 172 }, |
| 159 annotation_script='src/build/android/buildbot/bb_run_bot.py', | 173 annotation_script='src/build/android/buildbot/bb_run_bot.py', |
| 160 )) | 174 )) |
| 161 | 175 |
| 162 | 176 |
| 163 def Update(_config, active_master, c): | 177 def Update(_config, active_master, c): |
| 164 return helper.Update(c) | 178 return helper.Update(c) |
| OLD | NEW |