diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/crash_cache.scons | 66 | ||||
| -rw-r--r-- | net/dump_cache.scons | 63 | ||||
| -rw-r--r-- | net/net_lib.scons | 357 | ||||
| -rw-r--r-- | net/net_perftests.scons | 88 | ||||
| -rw-r--r-- | net/net_unittests.scons | 212 | ||||
| -rw-r--r-- | net/stress_cache.scons | 65 | ||||
| -rw-r--r-- | net/tools/tld_cleanup/tld_cleanup.scons | 63 |
7 files changed, 761 insertions, 153 deletions
diff --git a/net/crash_cache.scons b/net/crash_cache.scons index 0aab3ec..834cb51 100644 --- a/net/crash_cache.scons +++ b/net/crash_cache.scons @@ -24,20 +24,66 @@ if env.Bit('windows'): ], ) -input_files = [ - 'disk_cache/disk_cache_test_util$OBJSUFFIX', +# TODO: restore to alphabetical order; below matches original .vcproj. +input_files = ChromeFileList([ 'tools/crash_cache/crash_cache.cc', -] + 'disk_cache/disk_cache_test_util$OBJSUFFIX', +]) if not env.AnyBits('linux', 'mac'): # TODO(port): port to linux and mac? env.ChromeTestProgram('crash_cache', input_files) -env.ChromeMSVSProject('$NET_DIR/build/crash_cache.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - '$ICU38_DIR/build/icu.vcproj', - ], - guid='{B0EE0599-2913-46A0-A847-A3EC813658D3}') +p = env.ChromeMSVSProject('$NET_DIR/build/crash_cache.vcproj', + guid='{B0EE0599-2913-46A0-A847-A3EC813658D3}', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$ICU38_DIR/build/icu.vcproj', + ], + # TODO: restore when we can derive all info, + # on all platforms, from the windows build targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + 'VCCLCompilerTool', + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + MSVSTool('VCLinkerTool', + SubSystem='1'), + 'VCALinkTool', + 'VCManifestTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCAppVerifierTool', + 'VCWebDeploymentTool', + 'VCPostBuildEventTool', + ], + ConfigurationType='1') + + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + ]) + +env.AlwaysBuild(p) + +i = env.Command('$CHROME_SRC_DIR/net/build/crash_cache.vcproj', p, + Copy('$TARGET', '$SOURCE')) +Alias('msvs', i) diff --git a/net/dump_cache.scons b/net/dump_cache.scons index 0dfa39c..75231bb 100644 --- a/net/dump_cache.scons +++ b/net/dump_cache.scons @@ -23,21 +23,66 @@ if env.Bit('windows'): ], ) -input_files = [ +input_files = ChromeFileList([ 'tools/dump_cache/dump_cache.cc', 'tools/dump_cache/dump_files.cc', 'tools/dump_cache/upgrade.cc', -] +]) if env.Bit('windows'): env.ChromeTestProgram('dump_cache', input_files) -env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$NET_DIR/build/net.vcproj', - ], - guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}') +p = env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj', + guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$NET_DIR/build/net.vcproj', + ], + # TODO: restore when we can derive all info, + # on all platforms, from the windows build targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + 'VCCLCompilerTool', + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + MSVSTool('VCLinkerTool', + SubSystem='1'), + 'VCALinkTool', + 'VCManifestTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCAppVerifierTool', + 'VCWebDeploymentTool', + 'VCPostBuildEventTool', + ], + ConfigurationType='1') + + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + ]) + +env.AlwaysBuild(p) + +i = env.Command('$CHROME_SRC_DIR/net/build/dump_cache.vcproj', p, + Copy('$TARGET', '$SOURCE')) +Alias('msvs', i) diff --git a/net/net_lib.scons b/net/net_lib.scons index 30e83a8..2b83995 100644 --- a/net/net_lib.scons +++ b/net/net_lib.scons @@ -8,7 +8,7 @@ Configuration for building net.lib / libnet.a. Import('env') -env = env.Clone() +env = env.Clone(COMPONENT_STATIC=True) env.ApplySConscript([ '$GRIT_DIR/build/using_generated_resources.scons', @@ -17,90 +17,250 @@ env.ApplySConscript([ '$ZLIB_DIR/using_zlib.scons', ]) -# These net files work on *all* platforms; files that don't work -# cross-platform live below. -input_files = [ +input_files = ChromeFileList([ + MSVSFilter('base', [ 'base/address_list.cc', + 'base/address_list.h', + 'base/auth.h', 'base/auth_cache.cc', + 'base/auth_cache.h', 'base/base64.cc', + 'base/base64.h', 'base/bzip2_filter.cc', + 'base/bzip2_filter.h', + 'base/cert_status_flags.h', + 'base/client_socket.h', 'base/client_socket_factory.cc', + 'base/client_socket_factory.h', 'base/client_socket_handle.cc', + 'base/client_socket_handle.h', 'base/client_socket_pool.cc', + 'base/client_socket_pool.h', + 'base/completion_callback.h', 'base/cookie_monster.cc', + 'base/cookie_monster.h', 'base/cookie_policy.cc', + 'base/cookie_policy.h', 'base/data_url.cc', + 'base/data_url.h', 'base/directory_lister.cc', + 'base/directory_lister.h', 'base/dns_resolution_observer.cc', + 'base/dns_resolution_observer.h', + 'base/effective_tld_names.dat', 'base/escape.cc', + 'base/escape.h', 'base/ev_root_ca_metadata.cc', + 'base/ev_root_ca_metadata.h', + 'base/file_stream.h', + 'base/file_stream_win.cc', 'base/filter.cc', + 'base/filter.h', 'base/gzip_filter.cc', + 'base/gzip_filter.h', 'base/gzip_header.cc', + 'base/gzip_header.h', 'base/host_resolver.cc', + 'base/host_resolver.h', 'base/listen_socket.cc', + 'base/listen_socket.h', + 'base/load_flags.h', 'base/mime_sniffer.cc', + 'base/mime_sniffer.h', 'base/mime_util.cc', + 'base/mime_util.h', + 'base/net_error_list.h', 'base/net_errors.cc', + 'base/net_errors.h', 'base/net_module.cc', + 'base/net_module.h', + 'base/net_resources.h', 'base/net_util.cc', + 'base/net_util.h', + 'base/net_util_win.cc', + 'base/platform_mime_util.h', + 'base/platform_mime_util_win.cc', + 'build/precompiled_net.cc', + 'build/precompiled_net.h', 'base/registry_controlled_domain.cc', + 'base/registry_controlled_domain.h', + 'base/scoped_cert_chain_context.h', 'base/sdch_filter.cc', + 'base/sdch_filter.h', 'base/sdch_manager.cc', + 'base/sdch_manager.h', + 'base/socket.h', + 'base/ssl_client_socket.h', + 'base/ssl_client_socket_win.cc', + 'base/ssl_client_socket_win.h', 'base/ssl_config_service.cc', + 'base/ssl_config_service.h', + 'base/ssl_info.h', + 'base/ssl_test_util.cc', + 'base/tcp_client_socket.h', + 'base/tcp_client_socket_win.cc', 'base/telnet_server.cc', + 'base/telnet_server.h', 'base/upload_data.cc', + 'base/upload_data.h', 'base/upload_data_stream.cc', + 'base/upload_data_stream.h', + 'base/wininet_util.cc', + 'base/wininet_util.h', + 'base/winsock_init.cc', + 'base/winsock_init.h', 'base/x509_certificate.cc', - 'disk_cache/backend_impl.cc', - 'disk_cache/block_files.cc', - 'disk_cache/entry_impl.cc', - 'disk_cache/eviction.cc', - 'disk_cache/file_lock.cc', - 'disk_cache/hash.cc', - 'disk_cache/mem_backend_impl.cc', - 'disk_cache/mem_entry_impl.cc', - 'disk_cache/mem_rankings.cc', - 'disk_cache/rankings.cc', - 'disk_cache/stats.cc', - 'disk_cache/stats_histogram.cc', - 'disk_cache/trace.cc', - 'ftp/ftp_network_layer.cc', - 'ftp/ftp_network_transaction.cc', - 'http/cert_status_cache.cc', - 'http/http_auth.cc', - 'http/http_auth_cache.cc', - 'http/http_auth_handler.cc', - 'http/http_auth_handler_basic.cc', - 'http/http_auth_handler_digest.cc', - 'http/http_cache.cc', - 'http/http_chunked_decoder.cc', - 'http/http_network_layer.cc', - 'http/http_network_transaction.cc', - 'http/http_response_headers.cc', - 'http/http_transaction_winhttp.cc', - 'http/http_util.cc', - 'http/http_vary_data.cc', - 'http/winhttp_request_throttle.cc', - 'proxy/proxy_script_fetcher.cc', - 'proxy/proxy_service.cc', + 'base/x509_certificate.h', + 'base/x509_certificate_win.cc', + ]), + MSVSFilter('url_request', [ 'url_request/mime_sniffer_proxy.cc', + 'url_request/mime_sniffer_proxy.h', 'url_request/url_request.cc', + 'url_request/url_request.h', 'url_request/url_request_about_job.cc', + 'url_request/url_request_about_job.h', + 'url_request/url_request_context.h', 'url_request/url_request_error_job.cc', + 'url_request/url_request_error_job.h', 'url_request/url_request_file_dir_job.cc', + 'url_request/url_request_file_dir_job.h', 'url_request/url_request_file_job.cc', + 'url_request/url_request_file_job.h', 'url_request/url_request_filter.cc', + 'url_request/url_request_filter.h', 'url_request/url_request_ftp_job.cc', + 'url_request/url_request_ftp_job.h', 'url_request/url_request_http_job.cc', + 'url_request/url_request_http_job.h', + 'url_request/url_request_inet_job.cc', + 'url_request/url_request_inet_job.h', 'url_request/url_request_job.cc', + 'url_request/url_request_job.h', 'url_request/url_request_job_manager.cc', + 'url_request/url_request_job_manager.h', 'url_request/url_request_job_metrics.cc', + 'url_request/url_request_job_metrics.h', 'url_request/url_request_job_tracker.cc', + 'url_request/url_request_job_tracker.h', 'url_request/url_request_simple_job.cc', + 'url_request/url_request_simple_job.h', + 'url_request/url_request_status.h', 'url_request/url_request_test_job.cc', + 'url_request/url_request_test_job.h', 'url_request/url_request_view_cache_job.cc', -] + 'url_request/url_request_view_cache_job.h', + ]), + MSVSFilter('http', [ + 'http/cert_status_cache.cc', + 'http/cert_status_cache.h', + 'http/http_atom_list.h', + 'http/http_cache.cc', + 'http/http_cache.h', + 'http/http_chunked_decoder.cc', + 'http/http_chunked_decoder.h', + 'http/http_network_layer.cc', + 'http/http_network_layer.h', + 'http/http_network_session.h', + 'http/http_network_transaction.cc', + 'http/http_network_transaction.h', + 'http/http_request_info.h', + 'http/http_response_headers.cc', + 'http/http_response_headers.h', + 'http/http_response_info.h', + 'http/http_transaction.h', + 'http/http_transaction_factory.h', + 'http/http_transaction_winhttp.cc', + 'http/http_transaction_winhttp.h', + 'http/http_util.cc', + 'http/http_util.h', + 'http/http_auth.cc', + 'http/http_auth.h', + 'http/http_auth_cache.cc', + 'http/http_auth_cache.h', + 'http/http_auth_handler.h', + 'http/http_auth_handler.cc', + 'http/http_auth_handler_basic.cc', + 'http/http_auth_handler_basic.h', + 'http/http_auth_handler_digest.cc', + 'http/http_auth_handler_digest.h', + 'http/http_auth.cc', + 'http/http_auth.h', + 'http/http_auth_handler.h', + 'http/http_auth_handler.cc', + 'http/http_auth_handler_basic.cc', + 'http/http_auth_handler_basic.h', + 'http/http_auth_handler_digest.cc', + 'http/http_auth_handler_digest.h', + 'http/http_vary_data.cc', + 'http/http_vary_data.h', + 'http/winhttp_request_throttle.cc', + 'http/winhttp_request_throttle.h', + ]), + MSVSFilter('disk_cache', [ + 'disk_cache/addr.h', + 'disk_cache/backend_impl.cc', + 'disk_cache/backend_impl.h', + 'disk_cache/block_files.cc', + 'disk_cache/block_files.h', + 'disk_cache/cache_util.h', + 'disk_cache/cache_util_win.cc', + 'disk_cache/disk_cache.h', + 'disk_cache/disk_format.h', + 'disk_cache/entry_impl.cc', + 'disk_cache/entry_impl.h', + 'disk_cache/errors.h', + 'disk_cache/eviction.cc', + 'disk_cache/eviction.h', + 'disk_cache/file.h', + 'disk_cache/file_block.h', + 'disk_cache/file_lock.cc', + 'disk_cache/file_lock.h', + 'disk_cache/file_win.cc', + 'disk_cache/hash.cc', + 'disk_cache/hash.h', + 'disk_cache/mapped_file.h', + 'disk_cache/mapped_file_win.cc', + 'disk_cache/mem_backend_impl.cc', + 'disk_cache/mem_backend_impl.h', + 'disk_cache/mem_entry_impl.cc', + 'disk_cache/mem_entry_impl.h', + 'disk_cache/mem_rankings.cc', + 'disk_cache/mem_rankings.h', + 'disk_cache/rankings.cc', + 'disk_cache/rankings.h', + 'disk_cache/stats.cc', + 'disk_cache/stats.h', + 'disk_cache/stats_histogram.cc', + 'disk_cache/stats_histogram.h', + 'disk_cache/storage_block-inl.h', + 'disk_cache/storage_block.h', + 'disk_cache/trace.cc', + 'disk_cache/trace.h', + ]), + MSVSFilter('proxy', [ + 'proxy/proxy_config_service_fixed.h', + 'proxy/proxy_config_service_win.cc', + 'proxy/proxy_config_service_win.h', + 'proxy/proxy_resolver_winhttp.cc', + 'proxy/proxy_resolver_winhttp.h', + 'proxy/proxy_script_fetcher.cc', + 'proxy/proxy_script_fetcher.h', + 'proxy/proxy_service.cc', + 'proxy/proxy_service.h', + ]), + MSVSFilter('ftp', [ + 'ftp/ftp_network_layer.cc', + 'ftp/ftp_network_layer.h', + 'ftp/ftp_network_session.h', + 'ftp/ftp_network_transaction.cc', + 'ftp/ftp_network_transaction.h', + 'ftp/ftp_request_info.h', + 'ftp/ftp_response_info.h', + 'ftp/ftp_transaction.h', + 'ftp/ftp_transaction_factory.h', + ]), +]) if env.Bit('posix'): # Remove files that still need to be ported from the input_files list. @@ -114,8 +274,14 @@ if env.Bit('posix'): for remove in to_be_ported_files: input_files.remove(remove) -if env.Bit('windows'): - input_files.extend([ +if not env.Bit('windows'): + # Remove windows-specific files on non-Windows platforms. + # TODO(sgk): + # Remove the windows-specific files from the input_files list above + # and turn this back in to an add-on-Windows list (like we used to) + # once we're comfortable re-ordering the files in the generated + # .vcproj file(s). + input_files.Remove([ 'base/file_stream_win.cc', 'base/net_util_win.cc', 'base/platform_mime_util_win.cc', @@ -133,7 +299,7 @@ if env.Bit('windows'): ]) if env.Bit('mac'): - input_files.extend([ + input_files.Extend([ 'base/platform_mime_util_mac.cc', 'base/ssl_client_socket_mac.cc', 'base/x509_certificate_mac.cc', @@ -141,7 +307,7 @@ if env.Bit('mac'): ]) if env.Bit('linux'): - input_files.extend([ + input_files.Extend([ 'base/nss_memio.c', # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 'base/platform_mime_util_linux.cc', @@ -150,7 +316,7 @@ if env.Bit('linux'): ]) if env.Bit('posix'): - input_files.extend([ + input_files.Extend([ 'base/file_stream_posix.cc', 'base/net_util_posix.cc', 'base/tcp_client_socket_libevent.cc', @@ -163,17 +329,108 @@ if env.Bit('windows'): # TODO(bradnelson): This step generates file precompiled_net.pch.ib_tag # possibly only on incredibuild, scons doesn't know this. env_p = env.Clone() - env_p.Append(CCFLAGS='/Ylnet') + # TODO(sgk): for now, add the same _LIB flag that Hammer adds to + # the other .obj files + env_p.Append(CCFLAGS='/Ylnet', + CPPDEFINES=['_LIB']) pch, obj = env_p.PCH('precompiled_net.pch', 'build/precompiled_net.cc') env['PCH'] = pch env['PCHSTOP'] = 'precompiled_net.h' env.Append(CCPCHFLAGS = ['/FIprecompiled_net.h']) - input_files += [obj] + input_files.Replace('build/precompiled_net.cc', obj) + +lib = env.ChromeLibrary('net', input_files) + +p = env.ChromeMSVSProject('$NET_DIR/build/net.vcproj', + guid='{326E9795-E760-410A-B69A-3F79DB3F5243}', + dependencies = [ + '$NET_DIR/build/tld_cleanup.vcproj' + ], + # TODO: restore when we can derive all info, + # on all platforms, from the windows build targets. + #buildtargets=[lib[0]], + files=input_files, + ConfigurationType='4') + +p.AddToolFile('build/convert_tld_data.rules') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', + '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', + '$(SolutionDir)../sdch/using_sdch.vsprops', + '$(SolutionDir)../tools/grit/build/using_generated_resources.vsprops', + ], + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'Convert TLD Data File', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + MSVSTool('VCCLCompilerTool', + PrecompiledHeaderThrough='precompiled_net.h', + ForcedIncludeFiles='precompiled_net.h', + UsePrecompiledHeader='2'), + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + 'VCLibrarianTool', + 'VCALinkTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCPostBuildEventTool', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', + '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', + '$(SolutionDir)../sdch/using_sdch.vsprops', + '$(SolutionDir)../tools/grit/build/using_generated_resources.vsprops', + ], + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'Convert TLD Data File', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + 'VCCLCompilerTool', + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + 'VCLibrarianTool', + 'VCALinkTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCPostBuildEventTool', + ]) + +# TODO(sgk): remove when we can derive this information +p.AddFileConfig('build/precompiled_net.cc', + 'Debug|Win32', + tools=[ + MSVSTool('VCCLCompilerTool', + UsePrecompiledHeader='1'), + ]) + +# TODO(sgk): remove when we can derive this information +p.AddFileConfig('build/precompiled_net.cc', + 'Release|Win32', + ExcludedFromBuild='true', + tools=[ + 'VCCLCompilerTool', + ]) -env.ChromeLibrary('net', input_files) +env.AlwaysBuild(p) -env.ChromeMSVSProject('$NET_DIR/build/net.vcproj', - dependencies = [ - '$NET_DIR/build/tld_cleanup.vcproj' - ], - guid='{326E9795-E760-410A-B69A-3F79DB3F5243}') +i = env.Command('$CHROME_SRC_DIR/net/build/net.vcproj', p, + Copy('$TARGET', '$SOURCE')) +Alias('msvs', i) diff --git a/net/net_perftests.scons b/net/net_perftests.scons index c2b16a2..5f0529a 100644 --- a/net/net_perftests.scons +++ b/net/net_perftests.scons @@ -37,27 +37,85 @@ elif env.Bit('linux'): CCFLAGS = ['-fno-strict-aliasing'], ) -input_files = [ +input_files = ChromeFileList([ + # TODO(sgk): violate standard indentation so we don't have to + # reindent too much when we remove the explicit MSVSFilter() calls + # in favor of generating the hierarchy to reflect the file system. + MSVSFilter('support', [ + '../base/perftimer$OBJSUFFIX', + '../base/run_all_perftests$OBJSUFFIX', + ]), + MSVSFilter('tests', [ 'base/cookie_monster_perftest.cc', 'disk_cache/disk_cache_perftest.cc', 'disk_cache/disk_cache_test_util$OBJSUFFIX', - - # TODO(sgk): avoid using .cc from base directly - '$OBJ_ROOT/base/run_all_perftests$OBJSUFFIX', - '$OBJ_ROOT/base/perftimer$OBJSUFFIX', -] + ]), +]) if not env.Bit('mac'): env.ChromeTestProgram('net_perftests', input_files) env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$SDCH_DIR/sdch.vcproj', - ], guid='{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}') + +# TODO######################################################################## + +p = env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj', + guid='{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$SDCH_DIR/sdch.vcproj', + ], + # TODO: restore when we can derive all info, + # on all platforms, from the windows build targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + # TODO(sgk): pull this from CPPDEFINES. + MSVSTool('VCCLCompilerTool', + PreprocessorDefinitions='PERF_TEST'), + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + 'VCLinkerTool', + 'VCALinkTool', + 'VCManifestTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCAppVerifierTool', + 'VCWebDeploymentTool', + 'VCPostBuildEventTool', + ], + ConfigurationType='1') + + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../testing/using_gtest.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../testing/using_gtest.vsprops', + ]) + +env.AlwaysBuild(p) + +i = env.Command('$CHROME_SRC_DIR/net/build/net_perftests.vcproj', p, + Copy('$TARGET', '$SOURCE')) +Alias('msvs', i) diff --git a/net/net_unittests.scons b/net/net_unittests.scons index 9d4fe72..a00078c 100644 --- a/net/net_unittests.scons +++ b/net/net_unittests.scons @@ -34,7 +34,46 @@ if env.Bit('windows'): ], ) -input_files = [ +input_files = ChromeFileList([ + # TODO(sgk): violate standard indentation so we don't have to + # reindent too much when we remove the explicit MSVSFilter() calls + # in favor of generating the hierarchy to reflect the file system. + MSVSFilter('support', [ + 'build/precompiled_net.cc', + 'build/precompiled_net.h', + 'base/run_all_unittests.cc', + ]), + MSVSFilter('tests', [ + MSVSFilter('disk_cache', [ + 'disk_cache/addr_unittest.cc', + 'disk_cache/backend_unittest.cc', + 'disk_cache/block_files_unittest.cc', + 'disk_cache/disk_cache_test_base.cc', + 'disk_cache/disk_cache_test_base.h', + 'disk_cache/disk_cache_test_util.cc', + 'disk_cache/disk_cache_test_util.h', + 'disk_cache/entry_unittest.cc', + 'disk_cache/mapped_file_unittest.cc', + 'disk_cache/storage_block_unittest.cc', + ]), + MSVSFilter('http', [ + 'http/http_auth_cache_unittest.cc', + 'http/http_auth_handler_basic_unittest.cc', + 'http/http_auth_handler_digest_unittest.cc', + 'http/http_auth_unittest.cc', + 'http/http_cache_unittest.cc', + 'http/http_chunked_decoder_unittest.cc', + 'http/http_network_layer_unittest.cc', + 'http/http_network_transaction_unittest.cc', + 'http/http_response_headers_unittest.cc', + 'http/http_transaction_unittest.cc', + 'http/http_transaction_unittest.h', + 'http/http_transaction_winhttp_unittest.cc', + 'http/http_util_unittest.cc', + 'http/http_vary_data_unittest.cc', + 'http/winhttp_request_throttle_unittest.cc', + ]), + MSVSFilter('base', [ 'base/auth_cache_unittest.cc', 'base/base64_unittest.cc', 'base/bzip2_filter_unittest.cc', @@ -49,44 +88,33 @@ input_files = [ 'base/gzip_filter_unittest.cc', 'base/host_resolver_unittest.cc', 'base/listen_socket_unittest.cc', + 'base/listen_socket_unittest.h', 'base/mime_sniffer_unittest.cc', 'base/mime_util_unittest.cc', 'base/net_util_unittest.cc', 'base/registry_controlled_domain_unittest.cc', - 'base/run_all_unittests.cc', - 'base/ssl_test_util.cc', + 'base/sdch_filter_unittest.cc', 'base/ssl_client_socket_unittest.cc', + 'base/ssl_config_service_unittest.cc', 'base/tcp_client_socket_unittest.cc', 'base/telnet_server_unittest.cc', 'base/test_completion_callback_unittest.cc', + 'base/wininet_util_unittest.cc', 'base/x509_certificate_unittest.cc', - 'disk_cache/addr_unittest.cc', - 'disk_cache/backend_unittest.cc', - 'disk_cache/block_files_unittest.cc', - 'disk_cache/disk_cache_test_base.cc', - 'disk_cache/disk_cache_test_util.cc', - 'disk_cache/entry_unittest.cc', - 'disk_cache/mapped_file_unittest.cc', - 'disk_cache/storage_block_unittest.cc', - 'http/http_auth_cache_unittest.cc', - 'http/http_auth_handler_basic_unittest.cc', - 'http/http_auth_handler_digest_unittest.cc', - 'http/http_auth_unittest.cc', - 'http/http_cache_unittest.cc', - 'http/http_chunked_decoder_unittest.cc', - 'http/http_network_layer_unittest.cc', - 'http/http_network_transaction_unittest.cc', - 'http/http_response_headers_unittest.cc', - 'http/http_transaction_unittest.cc', - 'http/http_util_unittest.cc', - 'http/http_vary_data_unittest.cc', + ]), + MSVSFilter('url_request', [ + 'url_request/url_request_unittest.cc', + 'url_request/url_request_unittest.h', + ]), + MSVSFilter('proxy', [ 'proxy/proxy_script_fetcher_unittest.cc', 'proxy/proxy_service_unittest.cc', - 'url_request/url_request_unittest.cc', -] + ]), + ]), +]) -if env.Bit('windows'): - input_files.extend([ +if not env.Bit('windows'): + input_files.Remove([ 'base/wininet_util_unittest.cc', 'http/http_transaction_winhttp_unittest.cc', 'http/winhttp_request_throttle_unittest.cc', @@ -94,38 +122,122 @@ if env.Bit('windows'): if env.Bit('linux'): # TODO(port): - to_be_ported_files = [ + input_files.Remove([ 'base/sdch_filter_unittest.cc', 'base/ssl_config_service_unittest.cc', - ] - input_files = list(set(input_files) - set(to_be_ported_files)) + ]) if env.Bit('mac'): - input_files.extend([ + input_files.Extend([ '../base/platform_test_mac$OBJSUFFIX', ]) # TODO(port): - to_be_ported_files = [ + input_files.Remove([ 'base/x509_certificate_unittest.cc', 'base/sdch_filter_unittest.cc', 'base/ssl_config_service_unittest.cc', 'url_request/url_request_unittest.cc', - ] - input_files = list(set(input_files) - set(to_be_ported_files)) - -env.ChromeTestProgram('net_unittests', input_files) - -env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$SDCH_DIR/sdch.vcproj', - ], - guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}') + ]) + +net_unittests = env.ChromeTestProgram('net_unittests', input_files) + +p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$SDCH_DIR/sdch.vcproj', + ], + guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}', + # TODO: restore when we can derive all info, + # on all platforms, from the windows build targets. + #buildtargets=net_unittests, + files=input_files, + ConfigurationType='1') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../testing/using_gtest.vsprops', + ], + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + MSVSTool('VCCLCompilerTool', + PrecompiledHeaderThrough='precompiled_net.h', + ForcedIncludeFiles='precompiled_net.h', + PreprocessorDefinitions='UNIT_TEST', + UsePrecompiledHeader='2'), + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + 'VCLinkerTool', + 'VCALinkTool', + 'VCManifestTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCAppVerifierTool', + 'VCWebDeploymentTool', + 'VCPostBuildEventTool', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../testing/using_gtest.vsprops', + ], + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + MSVSTool('VCCLCompilerTool', + PreprocessorDefinitions='UNIT_TEST'), + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + 'VCLinkerTool', + 'VCALinkTool', + 'VCManifestTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCAppVerifierTool', + 'VCWebDeploymentTool', + 'VCPostBuildEventTool', + ]) + +# TODO: Remove when we can derive this information +p.AddFileConfig('build/precompiled_net.cc', + 'Debug|Win32', + tools=[ + MSVSTool('VCCLCompilerTool', + UsePrecompiledHeader='1'), + ]) + +# TODO: Remove when we can derive this information +p.AddFileConfig('build/precompiled_net.cc', + 'Release|Win32', + ExcludedFromBuild='true', + tools=[ + 'VCCLCompilerTool', + ]) + +env.AlwaysBuild(p) + +i = env.Command('$CHROME_SRC_DIR/net/build/net_unittests.vcproj', p, + Copy('$TARGET', '$SOURCE')) +Alias('msvs', i) diff --git a/net/stress_cache.scons b/net/stress_cache.scons index 008683d..9f926e4 100644 --- a/net/stress_cache.scons +++ b/net/stress_cache.scons @@ -36,19 +36,64 @@ if env.Bit('windows'): ], ) -input_files = [ +input_files = ChromeFileList([ 'disk_cache/disk_cache_test_util$OBJSUFFIX', 'disk_cache/stress_cache.cc', -] +]) if not env.Bit('mac'): env.ChromeTestProgram('stress_cache', input_files) -env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}') +p = env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj', + guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$TESTING_DIR/gtest.vcproj', + ], + # TODO: restore when we can derive all info, + # on all platforms, from the windows build targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + 'VCCLCompilerTool', + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + MSVSTool('VCLinkerTool', + SubSystem='1'), + 'VCALinkTool', + 'VCManifestTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCAppVerifierTool', + 'VCWebDeploymentTool', + 'VCPostBuildEventTool', + ], + ConfigurationType='1') + + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + ]) + +env.AlwaysBuild(p) + +i = env.Command('$CHROME_SRC_DIR/net/build/stress_cache.vcproj', p, + Copy('$TARGET', '$SOURCE')) +Alias('msvs', i) diff --git a/net/tools/tld_cleanup/tld_cleanup.scons b/net/tools/tld_cleanup/tld_cleanup.scons index cd937ca..5f366c4 100644 --- a/net/tools/tld_cleanup/tld_cleanup.scons +++ b/net/tools/tld_cleanup/tld_cleanup.scons @@ -23,16 +23,61 @@ if env.Bit('windows'): ], ) -input_files = [ +input_files = ChromeFileList([ 'tld_cleanup.cc', -] +]) env.ChromeProgram('tld_cleanup', input_files) -env.ChromeMSVSProject('$NET_DIR/build/tld_cleanup.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - ], - guid='{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}') +p = env.ChromeMSVSProject('$NET_DIR/build/tld_cleanup.vcproj', + guid='{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + ], + # TODO: restore when we can derive all info, + # on all platforms, from the windows build targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCPreBuildEventTool', + 'VCCustomBuildTool', + 'VCXMLDataGeneratorTool', + 'VCWebServiceProxyGeneratorTool', + 'VCMIDLTool', + 'VCCLCompilerTool', + 'VCManagedResourceCompilerTool', + 'VCResourceCompilerTool', + 'VCPreLinkEventTool', + MSVSTool('VCLinkerTool', + SubSystem='1'), + 'VCALinkTool', + 'VCManifestTool', + 'VCXDCMakeTool', + 'VCBscMakeTool', + 'VCFxCopTool', + 'VCAppVerifierTool', + 'VCWebDeploymentTool', + 'VCPostBuildEventTool', + ], + ConfigurationType='1') + + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + ]) + +env.AlwaysBuild(p) + +i = env.Command('$CHROME_SRC_DIR/net/build/tld_cleanup.vcproj', p, + Copy('$TARGET', '$SOURCE')) +Alias('msvs', i) |