Chromium Code Reviews Chromium Code Reviews
Issue 16959006:
Refactor WebRTC master configs. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/tools/build| 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 webrtc_factory | 6 from master.factory import webrtc_factory |
| 7 | 7 |
| 8 defaults = {} | 8 defaults = {} |
| 9 | 9 |
| 10 | 10 |
| 11 def ConfigureBuilders(c, svn_url, branch, custom_deps_list=None): | 11 def win(): |
|
kjellander_chromium
2013/06/19 09:52:48
It's just indent changes below (except the 'trunk'
| |
| 12 def win(): | 12 return webrtc_factory.WebRTCFactory('src/out', 'win32') |
| 13 return webrtc_factory.WebRTCFactory('src/out', 'win32', svn_url, | |
| 14 branch, custom_deps_list) | |
| 15 helper = master_config.Helper(defaults) | |
| 16 B = helper.Builder | |
| 17 F = helper.Factory | |
| 18 S = helper.Scheduler | |
| 19 | 13 |
| 20 scheduler = 'webrtc_win_scheduler' | 14 helper = master_config.Helper(defaults) |
| 21 S(scheduler, branch=branch, treeStableTimer=0) | 15 B = helper.Builder |
| 16 F = helper.Factory | |
| 17 S = helper.Scheduler | |
| 22 | 18 |
| 23 tests = [ | 19 scheduler = 'webrtc_win_scheduler' |
| 24 'audio_decoder_unittests', | 20 S(scheduler, branch='trunk', treeStableTimer=0) |
| 25 'common_audio_unittests', | |
| 26 'common_video_unittests', | |
| 27 'metrics_unittests', | |
| 28 'modules_integrationtests', | |
| 29 'modules_unittests', | |
| 30 'neteq_unittests', | |
| 31 'system_wrappers_unittests', | |
| 32 'test_support_unittests', | |
| 33 'tools_unittests', | |
| 34 'video_engine_core_unittests', | |
| 35 'voice_engine_unittests', | |
| 36 ] | |
| 37 ninja_options = ['--build-tool=ninja'] | |
| 38 | 21 |
| 39 defaults['category'] = 'win' | 22 tests = [ |
| 23 'audio_decoder_unittests', | |
| 24 'common_audio_unittests', | |
| 25 'common_video_unittests', | |
| 26 'metrics_unittests', | |
| 27 'modules_integrationtests', | |
| 28 'modules_unittests', | |
| 29 'neteq_unittests', | |
| 30 'system_wrappers_unittests', | |
| 31 'test_support_unittests', | |
| 32 'tools_unittests', | |
| 33 'video_engine_core_unittests', | |
| 34 'voice_engine_unittests', | |
| 35 ] | |
| 36 ninja_options = ['--build-tool=ninja'] | |
| 40 | 37 |
| 41 B('Win32 Debug', 'win32_debug_factory', scheduler=scheduler) | 38 defaults['category'] = 'win' |
| 42 F('win32_debug_factory', win().WebRTCFactory( | |
| 43 target='Debug', | |
| 44 options=ninja_options, | |
| 45 tests=tests)) | |
| 46 | 39 |
| 47 B('Win32 Release', 'win32_release_factory', scheduler=scheduler) | 40 B('Win32 Debug', 'win32_debug_factory', scheduler=scheduler) |
| 48 F('win32_release_factory', win().WebRTCFactory( | 41 F('win32_debug_factory', win().WebRTCFactory( |
| 49 target='Release', | 42 target='Debug', |
| 50 options=ninja_options, | 43 options=ninja_options, |
| 51 tests=tests, | 44 tests=tests)) |
| 52 # No point having more than one bot complaining about missing sources. | |
| 53 factory_properties={ | |
| 54 'gclient_env': { | |
| 55 'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1', | |
| 56 }, | |
| 57 })) | |
| 58 | 45 |
| 59 B('Win64 Debug', 'win64_debug_factory', scheduler=scheduler) | 46 B('Win32 Release', 'win32_release_factory', scheduler=scheduler) |
| 60 F('win64_debug_factory', win().WebRTCFactory( | 47 F('win32_release_factory', win().WebRTCFactory( |
| 61 target='Debug_x64', | 48 target='Release', |
| 62 options=ninja_options, | 49 options=ninja_options, |
| 63 tests=tests, | 50 tests=tests, |
| 64 factory_properties={ | 51 # No point having more than one bot complaining about missing sources. |
| 65 'gclient_env': {'GYP_DEFINES': 'target_arch=x64'}, | 52 factory_properties={ |
| 66 })) | 53 'gclient_env': { |
| 54 'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1', | |
| 55 }, | |
| 56 })) | |
| 67 | 57 |
| 68 B('Win64 Release', 'win64_release_factory', scheduler=scheduler) | 58 B('Win64 Debug', 'win64_debug_factory', scheduler=scheduler) |
| 69 F('win64_release_factory', win().WebRTCFactory( | 59 F('win64_debug_factory', win().WebRTCFactory( |
| 70 target='Release_x64', | 60 target='Debug_x64', |
| 71 options=ninja_options, | 61 options=ninja_options, |
| 72 tests=tests, | 62 tests=tests, |
| 73 factory_properties={ | 63 factory_properties={ |
| 74 'gclient_env': {'GYP_DEFINES': 'target_arch=x64'}, | 64 'gclient_env': {'GYP_DEFINES': 'target_arch=x64'}, |
| 75 })) | 65 })) |
| 76 | 66 |
| 67 B('Win64 Release', 'win64_release_factory', scheduler=scheduler) | |
| 68 F('win64_release_factory', win().WebRTCFactory( | |
| 69 target='Release_x64', | |
| 70 options=ninja_options, | |
| 71 tests=tests, | |
| 72 factory_properties={ | |
| 73 'gclient_env': {'GYP_DEFINES': 'target_arch=x64'}, | |
| 74 })) | |
| 75 | |
| 76 | |
| 77 def Update(c): | |
| 77 helper.Update(c) | 78 helper.Update(c) |
| OLD | NEW |
