| 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 |
| 11 env.Prepend( | 11 env.Prepend( |
| 12 CPPPATH = [ | 12 CPPPATH = [ |
| 13 '$ZLIB_DIR', | 13 '$ZLIB_DIR', |
| 14 '$ICU38_DIR/public/common', | 14 '$ICU38_DIR/public/common', |
| 15 '$ICU38_DIR/public/i18n', | 15 '$ICU38_DIR/public/i18n', |
| 16 '$SDCH_DIR/open_vcdiff/depot/opensource/open-vcdiff/src', |
| 16 '..', | 17 '..', |
| 17 ], | 18 ], |
| 18 ) | 19 ) |
| 19 | 20 |
| 20 env.Append( | 21 env.Append( |
| 21 CPPDEFINES = [ | 22 CPPDEFINES = [ |
| 22 'U_STATIC_IMPLEMENTATION', | 23 'U_STATIC_IMPLEMENTATION', |
| 23 ], | 24 ], |
| 24 ) | 25 ) |
| 25 | 26 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 'url_request/url_request_test_job.cc', | 79 'url_request/url_request_test_job.cc', |
| 79 'url_request/url_request_view_cache_job.cc', | 80 'url_request/url_request_view_cache_job.cc', |
| 80 ] | 81 ] |
| 81 | 82 |
| 82 if env['PLATFORM'] == 'win32': | 83 if env['PLATFORM'] == 'win32': |
| 83 input_files.extend([ | 84 input_files.extend([ |
| 84 'base/client_socket_factory.cc', | 85 'base/client_socket_factory.cc', |
| 85 'base/directory_lister.cc', | 86 'base/directory_lister.cc', |
| 86 'base/dns_resolution_observer.cc', | 87 'base/dns_resolution_observer.cc', |
| 87 'base/listen_socket.cc', | 88 'base/listen_socket.cc', |
| 89 'base/sdch_filter.cc', |
| 90 'base/sdch_manager.cc', |
| 88 'base/ssl_client_socket.cc', | 91 'base/ssl_client_socket.cc', |
| 89 'base/ssl_config_service.cc', | 92 'base/ssl_config_service.cc', |
| 90 'base/tcp_client_socket.cc', | 93 'base/tcp_client_socket.cc', |
| 91 'base/telnet_server.cc', | 94 'base/telnet_server.cc', |
| 92 'base/upload_data_stream.cc', | 95 'base/upload_data_stream.cc', |
| 93 'base/wininet_util.cc', | 96 'base/wininet_util.cc', |
| 94 'base/winsock_init.cc', | 97 'base/winsock_init.cc', |
| 95 'base/x509_certificate_win.cc', | 98 'base/x509_certificate_win.cc', |
| 96 'http/http_network_layer.cc', | 99 'http/http_network_layer.cc', |
| 97 'http/http_network_transaction.cc', | 100 'http/http_network_transaction.cc', |
| 98 'http/http_transaction_winhttp.cc', | 101 'http/http_transaction_winhttp.cc', |
| 99 'http/winhttp_request_throttle.cc', | 102 'http/winhttp_request_throttle.cc', |
| 100 'proxy/proxy_resolver_fixed.cc', | 103 'proxy/proxy_resolver_fixed.cc', |
| 101 'proxy/proxy_resolver_winhttp.cc', | 104 'proxy/proxy_resolver_winhttp.cc', |
| 102 'proxy/proxy_service.cc', | 105 'proxy/proxy_service.cc', |
| 103 'url_request/url_request_file_dir_job.cc', | 106 'url_request/url_request_file_dir_job.cc', |
| 104 'url_request/url_request_file_job.cc', | 107 'url_request/url_request_file_job.cc', |
| 105 'url_request/url_request_filter.cc', | 108 'url_request/url_request_filter.cc', |
| 106 'url_request/url_request_ftp_job.cc', | 109 'url_request/url_request_ftp_job.cc', |
| 107 'url_request/url_request_inet_job.cc', | 110 'url_request/url_request_inet_job.cc', |
| 108 'url_request/url_request_job_manager.cc', | 111 'url_request/url_request_job_manager.cc', |
| 109 ]) | 112 ]) |
| 110 | 113 |
| 111 if env['PLATFORM'] == 'win32': | 114 if env['PLATFORM'] == 'win32': |
| 112 env.Append( | |
| 113 CCFLAGS = [ | |
| 114 '/Wp64', | |
| 115 ], | |
| 116 ) | |
| 117 input_files.extend([ | 115 input_files.extend([ |
| 118 'base/net_util_win.cc', | 116 'base/net_util_win.cc', |
| 119 'base/platform_mime_util_win.cc', | 117 'base/platform_mime_util_win.cc', |
| 120 'disk_cache/cache_util_win.cc', | 118 'disk_cache/cache_util_win.cc', |
| 121 'disk_cache/file_win.cc', | 119 'disk_cache/file_win.cc', |
| 122 'disk_cache/mapped_file_win.cc', | 120 'disk_cache/mapped_file_win.cc', |
| 123 'disk_cache/os_file_win.cc', | 121 'disk_cache/os_file_win.cc', |
| 124 ]) | 122 ]) |
| 125 | 123 |
| 126 if env['PLATFORM'] == 'darwin': | 124 if env['PLATFORM'] == 'darwin': |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 CPPPATH = [ | 180 CPPPATH = [ |
| 183 '$GTEST_DIR/include', | 181 '$GTEST_DIR/include', |
| 184 ], | 182 ], |
| 185 ) | 183 ) |
| 186 | 184 |
| 187 if env['PLATFORM'] == 'win32': | 185 if env['PLATFORM'] == 'win32': |
| 188 env_tests.Prepend( | 186 env_tests.Prepend( |
| 189 CCFLAGS = [ | 187 CCFLAGS = [ |
| 190 '/TP', | 188 '/TP', |
| 191 '/WX', | 189 '/WX', |
| 192 '/Wp64', | |
| 193 ], | 190 ], |
| 194 CPPDEFINES = [ | 191 CPPDEFINES = [ |
| 195 '_WIN32_WINNT=0x0600', | 192 '_WIN32_WINNT=0x0600', |
| 196 'WINVER=0x0600', | 193 'WINVER=0x0600', |
| 197 '_HAS_EXCEPTIONS=0', | 194 '_HAS_EXCEPTIONS=0', |
| 198 ], | 195 ], |
| 199 LINKFLAGS = [ | 196 LINKFLAGS = [ |
| 200 '/DELAYLOAD:"dwmapi.dll"', | 197 '/DELAYLOAD:"dwmapi.dll"', |
| 201 '/DELAYLOAD:"uxtheme.dll"', | 198 '/DELAYLOAD:"uxtheme.dll"', |
| 202 '/MACHINE:X86', | 199 '/MACHINE:X86', |
| 203 '/FIXED:No', | 200 '/FIXED:No', |
| 204 '/safeseh', | 201 '/safeseh', |
| 205 '/dynamicbase', | 202 '/dynamicbase', |
| 206 '/ignore:4199', | 203 '/ignore:4199', |
| 207 '/nxcompat', | 204 '/nxcompat', |
| 208 ], | 205 ], |
| 206 LIBS =[ |
| 207 'sdch', |
| 208 ], |
| 209 ) | 209 ) |
| 210 | 210 |
| 211 if env['PLATFORM'] == 'posix': | 211 if env['PLATFORM'] == 'posix': |
| 212 env_tests.Append( | 212 env_tests.Append( |
| 213 LIBS = [ | 213 LIBS = [ |
| 214 'event', | 214 'event', |
| 215 ], | 215 ], |
| 216 ) | 216 ) |
| 217 | 217 |
| 218 | 218 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 243 'disk_cache/mapped_file_unittest.cc', | 243 'disk_cache/mapped_file_unittest.cc', |
| 244 'disk_cache/storage_block_unittest.cc', | 244 'disk_cache/storage_block_unittest.cc', |
| 245 'http/http_chunked_decoder_unittest.cc', | 245 'http/http_chunked_decoder_unittest.cc', |
| 246 'http/http_response_headers_unittest.cc', | 246 'http/http_response_headers_unittest.cc', |
| 247 'http/http_vary_data_unittest.cc', | 247 'http/http_vary_data_unittest.cc', |
| 248 ] | 248 ] |
| 249 | 249 |
| 250 if env['PLATFORM'] == 'win32': | 250 if env['PLATFORM'] == 'win32': |
| 251 unittest_files.extend([ | 251 unittest_files.extend([ |
| 252 'base/directory_lister_unittest.cc', | 252 'base/directory_lister_unittest.cc', |
| 253 'base/sdch_filter_unitest.cc', |
| 253 'base/ssl_config_service_unittest.cc', | 254 'base/ssl_config_service_unittest.cc', |
| 254 'base/ssl_client_socket_unittest.cc', | 255 'base/ssl_client_socket_unittest.cc', |
| 255 'base/wininet_util_unittest.cc', | 256 'base/wininet_util_unittest.cc', |
| 256 'http/http_cache_unittest.cc', | 257 'http/http_cache_unittest.cc', |
| 257 'http/http_network_layer_unittest.cc', | 258 'http/http_network_layer_unittest.cc', |
| 258 'http/http_network_transaction_unittest.cc', | 259 'http/http_network_transaction_unittest.cc', |
| 259 'http/http_transaction_unittest.cc', | 260 'http/http_transaction_unittest.cc', |
| 260 'http/http_transaction_winhttp_unittest.cc', | 261 'http/http_transaction_winhttp_unittest.cc', |
| 261 'http/http_util_unittest.cc', | 262 'http/http_util_unittest.cc', |
| 262 'http/winhttp_request_throttle_unittest.cc', | 263 'http/winhttp_request_throttle_unittest.cc', |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 # TODO: We need to port tld_cleanup before this will work on other | 333 # TODO: We need to port tld_cleanup before this will work on other |
| 333 # platforms. | 334 # platforms. |
| 334 sconscript_files = [ | 335 sconscript_files = [ |
| 335 'tools/tld_cleanup/SConscript', | 336 'tools/tld_cleanup/SConscript', |
| 336 ] | 337 ] |
| 337 | 338 |
| 338 SConscript(sconscript_files, exports=['env']) | 339 SConscript(sconscript_files, exports=['env']) |
| 339 | 340 |
| 340 | 341 |
| 341 env.Alias('net', ['.', installed_tests]) | 342 env.Alias('net', ['.', installed_tests]) |
| OLD | NEW |