| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 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 Import('env') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 env_tests = env.Clone() | 8 env_tests = env.Clone() |
| 9 | 9 |
| 10 env.Prepend( | 10 env.Prepend( |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 'string_util_icu.cc', | 61 'string_util_icu.cc', |
| 62 'thread.cc', | 62 'thread.cc', |
| 63 'time.cc', | 63 'time.cc', |
| 64 'time_format.cc', | 64 'time_format.cc', |
| 65 'timer.cc', | 65 'timer.cc', |
| 66 'trace_event.cc', | 66 'trace_event.cc', |
| 67 'tracked.cc', | 67 'tracked.cc', |
| 68 'tracked_objects.cc', | 68 'tracked_objects.cc', |
| 69 'values.cc', | 69 'values.cc', |
| 70 'word_iterator.cc', | 70 'word_iterator.cc', |
| 71 'worker_pool.cc', | |
| 72 'third_party/nspr/prtime.cc', | 71 'third_party/nspr/prtime.cc', |
| 73 'third_party/nss/sha512.cc', | 72 'third_party/nss/sha512.cc', |
| 74 ] | 73 ] |
| 75 | 74 |
| 76 if env['PLATFORM'] == 'win32': | 75 if env['PLATFORM'] == 'win32': |
| 77 # Some of these aren't really Windows-specific, they're just here until | 76 # Some of these aren't really Windows-specific, they're just here until |
| 78 # we have the port versions working. | 77 # we have the port versions working. |
| 79 # TODO: move all these files to either the cross-platform block above or | 78 # TODO: move all these files to either the cross-platform block above or |
| 80 # a platform-specific block below. | 79 # a platform-specific block below. |
| 81 input_files.extend([ | 80 input_files.extend([ |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 'process_util_win.cc', | 115 'process_util_win.cc', |
| 117 'registry.cc', | 116 'registry.cc', |
| 118 'shared_memory_win.cc', | 117 'shared_memory_win.cc', |
| 119 'sys_string_conversions_win.cc', | 118 'sys_string_conversions_win.cc', |
| 120 'thread_local_storage_win.cc', | 119 'thread_local_storage_win.cc', |
| 121 'thread_local_win.cc', | 120 'thread_local_win.cc', |
| 122 'time_win.cc', | 121 'time_win.cc', |
| 123 'waitable_event_win.cc', | 122 'waitable_event_win.cc', |
| 124 'win_util.cc', | 123 'win_util.cc', |
| 125 'wmi_util.cc', | 124 'wmi_util.cc', |
| 125 'worker_pool.cc', |
| 126 ]) | 126 ]) |
| 127 | 127 |
| 128 if env['PLATFORM'] in ('darwin', 'posix'): | 128 if env['PLATFORM'] in ('darwin', 'posix'): |
| 129 input_files.extend([ | 129 input_files.extend([ |
| 130 'condition_variable_posix.cc', | 130 'condition_variable_posix.cc', |
| 131 'debug_util_posix.cc', | 131 'debug_util_posix.cc', |
| 132 'file_util_posix.cc', | 132 'file_util_posix.cc', |
| 133 'lock_impl_posix.cc', | 133 'lock_impl_posix.cc', |
| 134 'platform_thread_posix.cc', | 134 'platform_thread_posix.cc', |
| 135 'process_util_posix.cc', | 135 'process_util_posix.cc', |
| 136 'shared_memory_posix.cc', | 136 'shared_memory_posix.cc', |
| 137 'string16.cc', | 137 'string16.cc', |
| 138 'thread_local_storage_posix.cc', | 138 'thread_local_storage_posix.cc', |
| 139 'thread_local_posix.cc', | 139 'thread_local_posix.cc', |
| 140 'time_posix.cc', | 140 'time_posix.cc', |
| 141 'waitable_event_generic.cc', | 141 'waitable_event_generic.cc', |
| 142 ]) | 142 ]) |
| 143 | 143 |
| 144 if env['PLATFORM'] == 'darwin': | 144 if env['PLATFORM'] == 'darwin': |
| 145 input_files.extend([ | 145 input_files.extend([ |
| 146 'base_paths_mac.mm', | 146 'base_paths_mac.mm', |
| 147 'clipboard_mac.cc', | 147 'clipboard_mac.mm', |
| 148 'file_util_mac.mm', | 148 'file_util_mac.mm', |
| 149 'file_version_info_mac.mm', | 149 'file_version_info_mac.mm', |
| 150 'hmac_mac.cc', | 150 'hmac_mac.cc', |
| 151 'platform_thread_mac.mm', |
| 151 'sys_string_conversions_mac.cc', | 152 'sys_string_conversions_mac.cc', |
| 153 'worker_pool_mac.mm', |
| 152 ]) | 154 ]) |
| 153 | 155 |
| 154 if env['PLATFORM'] == 'posix': | 156 if env['PLATFORM'] == 'posix': |
| 155 input_files.extend([ | 157 input_files.extend([ |
| 156 'atomicops_internals_x86_gcc.cc', | 158 'atomicops_internals_x86_gcc.cc', |
| 157 'base_paths_linux.cc', | 159 'base_paths_linux.cc', |
| 158 'file_util_linux.cc', | 160 'file_util_linux.cc', |
| 159 'sys_string_conversions_linux.cc', | 161 'sys_string_conversions_linux.cc', |
| 162 'worker_pool.cc', |
| 160 ]) | 163 ]) |
| 161 | 164 |
| 162 env.ChromeStaticLibrary('base', input_files) | 165 env.ChromeStaticLibrary('base', input_files) |
| 163 | 166 |
| 164 | 167 |
| 165 env_tests.Prepend( | 168 env_tests.Prepend( |
| 166 CPPPATH = [ | 169 CPPPATH = [ |
| 167 '$GTEST_DIR/include', | 170 '$GTEST_DIR/include', |
| 168 '$GTEST_DIR', | 171 '$GTEST_DIR', |
| 169 '$SKIA_DIR/include', | 172 '$SKIA_DIR/include', |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 test_files.extend([ | 298 test_files.extend([ |
| 296 'file_version_info_unittest.cc', | 299 'file_version_info_unittest.cc', |
| 297 'object_watcher_unittest.cc', | 300 'object_watcher_unittest.cc', |
| 298 'pe_image_unittest.cc', | 301 'pe_image_unittest.cc', |
| 299 'sys_string_conversions_win_unittest.cc', | 302 'sys_string_conversions_win_unittest.cc', |
| 300 'time_unittest_win.cc', | 303 'time_unittest_win.cc', |
| 301 'win_util_unittest.cc', | 304 'win_util_unittest.cc', |
| 302 'wmi_util_unittest.cc', | 305 'wmi_util_unittest.cc', |
| 303 ]) | 306 ]) |
| 304 | 307 |
| 308 if env['PLATFORM'] == 'darwin': |
| 309 test_files.extend([ |
| 310 'platform_test_mac.mm', |
| 311 ]) |
| 312 |
| 305 base_unittests = env_tests.ChromeTestProgram('base_unittests', test_files) | 313 base_unittests = env_tests.ChromeTestProgram('base_unittests', test_files) |
| 306 | 314 |
| 307 # Install up a level to allow unit test path assumptions to be valid. | 315 # Install up a level to allow unit test path assumptions to be valid. |
| 308 installed_base_unittests = env.Install('$TARGET_ROOT', base_unittests) | 316 installed_base_unittests = env.Install('$TARGET_ROOT', base_unittests) |
| 309 | 317 |
| 310 | 318 |
| 311 sconscript_dirs = [ | 319 sconscript_dirs = [ |
| 312 'gfx/SConscript', | 320 'gfx/SConscript', |
| 313 ] | 321 ] |
| 314 | 322 |
| 315 SConscript(sconscript_dirs, exports=['env']) | 323 SConscript(sconscript_dirs, exports=['env']) |
| 316 | 324 |
| 317 | 325 |
| 318 # Setup alias for all base related targets. | 326 # Setup alias for all base related targets. |
| 319 if env['PLATFORM'] == 'win32': | 327 if env['PLATFORM'] == 'win32': |
| 320 icudata = '../icudt38.dll' | 328 icudata = '../icudt38.dll' |
| 321 else: | 329 else: |
| 322 icudata = '../icudt38l.dat' | 330 icudata = '../icudt38l.dat' |
| 323 env.Alias('base', ['.', installed_base_unittests, icudata]) | 331 env.Alias('base', ['.', installed_base_unittests, icudata]) |
| 324 | 332 |
| 325 # TODO(sgk) should this be moved into base.lib like everything else? This will | 333 # TODO(sgk) should this be moved into base.lib like everything else? This will |
| 326 # require updating a bunch of other SConscripts which link directly against | 334 # require updating a bunch of other SConscripts which link directly against |
| 327 # this generated object file. | 335 # this generated object file. |
| 328 env_tests.StaticObject('perftimer.cc') | 336 env_tests.StaticObject('perftimer.cc') |
| 329 | 337 |
| 330 # Since run_all_perftests supplies a main, we cannot have it in base.lib | 338 # Since run_all_perftests supplies a main, we cannot have it in base.lib |
| 331 env_tests.StaticObject('run_all_perftests.cc') | 339 env_tests.StaticObject('run_all_perftests.cc') |
| 332 | 340 |
| OLD | NEW |