| 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_res = env.Clone() | 7 env_res = env.Clone() |
| 8 env_tests = env.Clone() | 8 env_tests = env.Clone() |
| 9 env = env.Clone() | 9 env = env.Clone() |
| 10 | 10 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 'base/filter.cc', | 41 'base/filter.cc', |
| 42 'base/gzip_filter.cc', | 42 'base/gzip_filter.cc', |
| 43 'base/gzip_header.cc', | 43 'base/gzip_header.cc', |
| 44 'base/host_resolver.cc', | 44 'base/host_resolver.cc', |
| 45 'base/mime_sniffer.cc', | 45 'base/mime_sniffer.cc', |
| 46 'base/mime_util.cc', | 46 'base/mime_util.cc', |
| 47 'base/net_errors.cc', | 47 'base/net_errors.cc', |
| 48 'base/net_module.cc', | 48 'base/net_module.cc', |
| 49 'base/net_util.cc', | 49 'base/net_util.cc', |
| 50 'base/registry_controlled_domain.cc', | 50 'base/registry_controlled_domain.cc', |
| 51 'base/sdch_filter.cc', |
| 52 'base/sdch_manager.cc', |
| 51 'base/upload_data.cc', | 53 'base/upload_data.cc', |
| 52 'base/x509_certificate.cc', | 54 'base/x509_certificate.cc', |
| 53 'disk_cache/backend_impl.cc', | 55 'disk_cache/backend_impl.cc', |
| 54 'disk_cache/block_files.cc', | 56 'disk_cache/block_files.cc', |
| 55 'disk_cache/entry_impl.cc', | 57 'disk_cache/entry_impl.cc', |
| 56 'disk_cache/file_lock.cc', | 58 'disk_cache/file_lock.cc', |
| 57 'disk_cache/hash.cc', | 59 'disk_cache/hash.cc', |
| 58 'disk_cache/mem_backend_impl.cc', | 60 'disk_cache/mem_backend_impl.cc', |
| 59 'disk_cache/mem_entry_impl.cc', | 61 'disk_cache/mem_entry_impl.cc', |
| 60 'disk_cache/mem_rankings.cc', | 62 'disk_cache/mem_rankings.cc', |
| (...skipping 23 matching lines...) Expand all Loading... |
| 84 'url_request/url_request_test_job.cc', | 86 'url_request/url_request_test_job.cc', |
| 85 'url_request/url_request_view_cache_job.cc', | 87 'url_request/url_request_view_cache_job.cc', |
| 86 ] | 88 ] |
| 87 | 89 |
| 88 if env['PLATFORM'] == 'win32': | 90 if env['PLATFORM'] == 'win32': |
| 89 input_files.extend([ | 91 input_files.extend([ |
| 90 'base/client_socket_factory.cc', | 92 'base/client_socket_factory.cc', |
| 91 'base/directory_lister.cc', | 93 'base/directory_lister.cc', |
| 92 'base/dns_resolution_observer.cc', | 94 'base/dns_resolution_observer.cc', |
| 93 'base/listen_socket.cc', | 95 'base/listen_socket.cc', |
| 94 'base/sdch_filter.cc', | |
| 95 'base/sdch_manager.cc', | |
| 96 'base/ssl_client_socket.cc', | 96 'base/ssl_client_socket.cc', |
| 97 'base/ssl_config_service.cc', | 97 'base/ssl_config_service.cc', |
| 98 'base/tcp_client_socket.cc', | 98 'base/tcp_client_socket.cc', |
| 99 'base/telnet_server.cc', | 99 'base/telnet_server.cc', |
| 100 'base/upload_data_stream.cc', | 100 'base/upload_data_stream.cc', |
| 101 'base/wininet_util.cc', | 101 'base/wininet_util.cc', |
| 102 'base/winsock_init.cc', | 102 'base/winsock_init.cc', |
| 103 'http/http_network_layer.cc', | 103 'http/http_network_layer.cc', |
| 104 'http/http_network_transaction.cc', | 104 'http/http_network_transaction.cc', |
| 105 'http/http_transaction_winhttp.cc', | 105 'http/http_transaction_winhttp.cc', |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 ], | 170 ], |
| 171 CPPDEFINES = [ | 171 CPPDEFINES = [ |
| 172 'UNIT_TEST', | 172 'UNIT_TEST', |
| 173 ], | 173 ], |
| 174 LIBS = [ # On Linux, dependencies must follow dependents, so... | 174 LIBS = [ # On Linux, dependencies must follow dependents, so... |
| 175 'net', # net must come before base and modp_b64 | 175 'net', # net must come before base and modp_b64 |
| 176 'bzip2', # bzip2 must come before base | 176 'bzip2', # bzip2 must come before base |
| 177 'base', | 177 'base', |
| 178 'googleurl', | 178 'googleurl', |
| 179 'gtest', | 179 'gtest', |
| 180 'sdch', |
| 180 env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed | 181 env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed |
| 181 'modp_b64', | 182 'modp_b64', |
| 182 'zlib', | 183 'zlib', |
| 183 ] | 184 ] |
| 184 ) | 185 ) |
| 185 | 186 |
| 186 env_tests.Append( | 187 env_tests.Append( |
| 187 CPPPATH = [ | 188 CPPPATH = [ |
| 188 '$GTEST_DIR/include', | 189 '$GTEST_DIR/include', |
| 189 ], | 190 ], |
| (...skipping 13 matching lines...) Expand all Loading... |
| 203 LINKFLAGS = [ | 204 LINKFLAGS = [ |
| 204 '/DELAYLOAD:"dwmapi.dll"', | 205 '/DELAYLOAD:"dwmapi.dll"', |
| 205 '/DELAYLOAD:"uxtheme.dll"', | 206 '/DELAYLOAD:"uxtheme.dll"', |
| 206 '/MACHINE:X86', | 207 '/MACHINE:X86', |
| 207 '/FIXED:No', | 208 '/FIXED:No', |
| 208 '/safeseh', | 209 '/safeseh', |
| 209 '/dynamicbase', | 210 '/dynamicbase', |
| 210 '/ignore:4199', | 211 '/ignore:4199', |
| 211 '/nxcompat', | 212 '/nxcompat', |
| 212 ], | 213 ], |
| 213 LIBS =[ | |
| 214 'sdch', | |
| 215 ], | |
| 216 ) | 214 ) |
| 217 | 215 |
| 218 if env['PLATFORM'] in ('posix', 'darwin'): | 216 if env['PLATFORM'] in ('posix', 'darwin'): |
| 219 env_tests.Append( | 217 env_tests.Append( |
| 220 LIBS = [ | 218 LIBS = [ |
| 221 'event', | 219 'event', |
| 222 ], | 220 ], |
| 223 ) | 221 ) |
| 224 | 222 |
| 225 | 223 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 # TODO: We need to port tld_cleanup before this will work on other | 342 # TODO: We need to port tld_cleanup before this will work on other |
| 345 # platforms. | 343 # platforms. |
| 346 sconscript_files = [ | 344 sconscript_files = [ |
| 347 'tools/tld_cleanup/SConscript', | 345 'tools/tld_cleanup/SConscript', |
| 348 ] | 346 ] |
| 349 | 347 |
| 350 SConscript(sconscript_files, exports=['env']) | 348 SConscript(sconscript_files, exports=['env']) |
| 351 | 349 |
| 352 | 350 |
| 353 env.Alias('net', ['.', installed_tests]) | 351 env.Alias('net', ['.', installed_tests]) |
| OLD | NEW |