diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 22:05:12 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 22:05:12 +0000 |
commit | 0fad1f1a74408b939d1b09dcc2f9391544e7e692 (patch) | |
tree | c62164260c26f143c9ae43c32694142a725bc7eb /net | |
parent | a9b826af8ef183810c176b9ede4a2934f4678d50 (diff) | |
download | chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.zip chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.tar.gz chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.tar.bz2 |
Remove the checked-in scons configuration files.
Review URL: http://codereview.chromium.org/53121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/SConstruct | 3 | ||||
-rw-r--r-- | net/crash_cache.scons | 85 | ||||
-rw-r--r-- | net/dump_cache.scons | 84 | ||||
-rw-r--r-- | net/net_lib.scons | 447 | ||||
-rw-r--r-- | net/net_main.scons | 29 | ||||
-rw-r--r-- | net/net_perftests.scons | 117 | ||||
-rw-r--r-- | net/net_resources.scons | 17 | ||||
-rw-r--r-- | net/net_sln.scons | 70 | ||||
-rw-r--r-- | net/net_unittests.scons | 245 | ||||
-rw-r--r-- | net/stress_cache.scons | 95 | ||||
-rw-r--r-- | net/tools/tld_cleanup/tld_cleanup.scons | 79 | ||||
-rw-r--r-- | net/using_net.scons | 15 |
12 files changed, 0 insertions, 1286 deletions
diff --git a/net/SConstruct b/net/SConstruct deleted file mode 100644 index de24fa9..0000000 --- a/net/SConstruct +++ /dev/null @@ -1,3 +0,0 @@ -build_component = 'net' -SConscript('../build/SConscript.main', - exports=['build_component']) diff --git a/net/crash_cache.scons b/net/crash_cache.scons deleted file mode 100644 index 6ddb9d7..0000000 --- a/net/crash_cache.scons +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration the disk_cache{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$NET_DIR/using_net.scons', -]) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/WX', - ], - ) - -# 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.Bit('mac'): - # TODO(port): port to mac? - x = env.ChromeTestProgram('crash_cache', input_files) - -p = env.ChromeMSVSProject('$NET_DIR/build/crash_cache.vcproj', - dest='$CHROME_SRC_DIR/net/build/crash_cache.vcproj', - guid='{B0EE0599-2913-46A0-A847-A3EC813658D3}', - keyword='Win32Proj', - 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', - ]) diff --git a/net/dump_cache.scons b/net/dump_cache.scons deleted file mode 100644 index b118625..0000000 --- a/net/dump_cache.scons +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration the dump_cache{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$ICU38_DIR/using_icu38.scons', - '$NET_DIR/using_net.scons', -]) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/WX', - ], - ) - -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) - -p = env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj', - dest='$CHROME_SRC_DIR/net/build/dump_cache.vcproj', - guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}', - keyword='Win32Proj', - 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', - ]) diff --git a/net/net_lib.scons b/net/net_lib.scons deleted file mode 100644 index 739bd52..0000000 --- a/net/net_lib.scons +++ /dev/null @@ -1,447 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration for building net.lib / libnet.a. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$SDCH_DIR/using_sdch.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -input_files = ChromeFileList([ - MSVSFilter('base', [ - 'base/address_list.cc', - 'base/address_list.h', - 'base/auth.h', - 'base/base64.cc', - 'base/base64.h', - 'base/bzip2_filter.cc', - 'base/bzip2_filter.h', - 'base/cert_status_flags.cc', - 'base/cert_status_flags.h', - 'base/cert_verifier.cc', - 'base/cert_verifier.h', - 'base/cert_verify_result.h', - 'base/client_socket.cc', - '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/connection_type_histograms.cc', - 'base/connection_type_histograms.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.cc', - '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/io_buffer.cc', - 'base/io_buffer.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', - '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_new_ftp_job.cc', - 'url_request/url_request_new_ftp_job.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/des.cc', - 'http/des.h', - 'http/http_atom_list.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_handler_ntlm.cc', - 'http/http_auth_handler_ntlm.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.cc', - 'http/http_response_info.h', - 'http/http_transaction.h', - 'http/http_transaction_factory.h', - 'http/http_util.cc', - 'http/http_util.h', - 'http/http_vary_data.cc', - 'http/http_vary_data.h', - 'http/md4.cc', - 'http/md4.h', - ]), - MSVSFilter('disk_cache', [ - 'disk_cache/addr.cc', - '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.cc', - 'proxy/proxy_config.h', - 'proxy/proxy_config_service.h', - 'proxy/proxy_config_service_fixed.h', - 'proxy/proxy_config_service_win.cc', - 'proxy/proxy_config_service_win.h', - 'proxy/proxy_info.cc', - 'proxy/proxy_info.h', - 'proxy/proxy_list.cc', - 'proxy/proxy_list.h', - 'proxy/proxy_resolver.h', - 'proxy/proxy_resolver_script.h', - 'proxy/proxy_resolver_v8.cc', - 'proxy/proxy_resolver_winhttp.cc', - 'proxy/proxy_resolver_winhttp.h', - 'proxy/proxy_retry_info.h', - 'proxy/proxy_script_fetcher.cc', - 'proxy/proxy_script_fetcher.h', - 'proxy/proxy_server.cc', - 'proxy/proxy_server.h', - 'proxy/proxy_service.cc', - 'proxy/proxy_service.h', - ]), - MSVSFilter('ftp', [ - 'ftp/ftp_auth_cache.cc', - 'ftp/ftp_auth_cache.h', - 'ftp/ftp_directory_parser.cc', - 'ftp/ftp_directory_parser.h', - '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. - # TODO(port): delete files from this list as they get ported. - input_files.Remove( - 'base/ssl_config_service.cc', - 'url_request/url_request_ftp_job.cc', - ) - -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', - 'base/ssl_client_socket_win.cc', - 'base/tcp_client_socket_win.cc', - 'base/wininet_util.cc', - 'base/winsock_init.cc', - 'base/x509_certificate_win.cc', - 'build/precompiled_net.cc', - 'disk_cache/cache_util_win.cc', - 'disk_cache/file_win.cc', - 'disk_cache/mapped_file_win.cc', - 'proxy/proxy_config_service_win.cc', - 'proxy/proxy_resolver_winhttp.cc', - 'url_request/url_request_inet_job.cc', - ) - -if env.Bit('mac'): - input_files.Extend([ - 'base/platform_mime_util_mac.cc', - 'base/ssl_client_socket_mac.cc', - 'base/x509_certificate_mac.cc', - 'proxy/proxy_resolver_mac.cc', - ]) - -if env.Bit('linux'): - input_files.Extend([ - 'base/nss_memio.c', - # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? - 'base/platform_mime_util_linux.cc', - 'base/ssl_client_socket_nss.cc', - 'base/x509_certificate_nss.cc', - ]) - -if env.Bit('posix'): - input_files.Extend([ - 'base/file_stream_posix.cc', - 'base/net_util_posix.cc', - 'base/tcp_client_socket_libevent.cc', - 'disk_cache/cache_util_posix.cc', - 'disk_cache/file_posix.cc', - 'disk_cache/mapped_file_posix.cc', - ]) - -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() - # 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.Replace('build/precompiled_net.cc', obj) - -lib = env.ChromeLibrary('net', input_files) - -p = env.ChromeMSVSProject('$NET_DIR/build/net.vcproj', - dest='$CHROME_SRC_DIR/net/build/net.vcproj', - guid='{326E9795-E760-410A-B69A-3F79DB3F5243}', - keyword='Win32Proj', - dependencies = [ - '$NET_DIR/build/net_resources.vcproj', - '$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/debug.vsprops', - './net.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/release.vsprops', - './net.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', - ]) diff --git a/net/net_main.scons b/net/net_main.scons deleted file mode 100644 index 4548b03..0000000 --- a/net/net_main.scons +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Master configuration for building net components. -""" - -Import('env') - -# Arrange for Hammer to add all programs to the 'net' Alias. -env.Append( - COMPONENT_PROGRAM_GROUPS = ['net'], - COMPONENT_TEST_PROGRAM_GROUPS = ['net'], -) - -sconscript_files = [ - 'crash_cache.scons', - 'dump_cache.scons', - 'net_lib.scons', - 'net_perftests.scons', - 'net_resources.scons', - 'net_sln.scons', - 'net_unittests.scons', - 'stress_cache.scons', - 'tools/tld_cleanup/tld_cleanup.scons', -] - -SConscript(sconscript_files, exports=['env']) diff --git a/net/net_perftests.scons b/net/net_perftests.scons deleted file mode 100644 index 570eeca..0000000 --- a/net/net_perftests.scons +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration for building the net_perftests{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', -]) - -if env.Bit('posix'): - env.SConscript([ - '$LIBEVENT_DIR/using_libevent.scons', - ], {'env':env}) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/WX', - ], - ) -elif env.Bit('linux'): - env.Append( - # TODO(port): disk_cache_perftest breaks strict aliasing rules. - CCFLAGS = ['-fno-strict-aliasing'], - ) - -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', - ]), -]) - -if not env.Bit('mac'): - env.ChromeTestProgram('net_perftests', input_files) - -env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj', - guid='{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}') - -# TODO######################################################################## - -p = env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj', - dest='$CHROME_SRC_DIR/net/build/net_perftests.vcproj', - guid='{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}', - keyword='Win32Proj', - 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', - ]) diff --git a/net/net_resources.scons b/net/net_resources.scons deleted file mode 100644 index 6ccc55b..0000000 --- a/net/net_resources.scons +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration for building the net_resources.rc resources. -""" - -import os - -Import('env') - -env = env.Clone() - -# This dummy target is used to tell the emitter where to put the target files. -generated = env.GRIT('$TARGET_ROOT/grit_derived_sources/dummy_net_res', - 'base/net_resources.grd') diff --git a/net/net_sln.scons b/net/net_sln.scons deleted file mode 100644 index 7b7def1..0000000 --- a/net/net_sln.scons +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration for building base.sln. -""" - -Import('env') - -env = env.Clone() - -env.Tool('MSVSNew') - -env.ChromeMSVSFolder('net dependencies', - name='dependencies', - entries = [ - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$SDCH_DIR/sdch.vcproj', - ], - guid='{A04F65DF-D422-4E8F-B918-29EBA839363E}') - -env.ChromeMSVSFolder('net tools', - name='tools', - entries = [ - '$NET_DIR/build/dump_cache.vcproj', - #'build/stress_cache.vcproj', - '$NET_DIR/build/crash_cache.vcproj', - '$NET_DIR/build/tld_cleanup.vcproj', - ], - guid='{E7D78B1F-F7D3-47CB-BF51-3957C646B406}') - - -solution = env.ChromeMSVSSolution('net.sln', - dest='$CHROME_SRC_DIR/net/net.sln', - entries = [ - 'net dependencies', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$BASE_DIR/build/base.vcproj', - '$BASE_DIR/build/debug_message.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - '$NET_DIR/build/net.vcproj', - '$NET_DIR/build/net_unittests.vcproj', - '$NET_DIR/build/tld_cleanup.vcproj', - 'net tools', - '$ZLIB_DIR/zlib.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$NET_DIR/build/net_perftests.vcproj', - '$NET_DIR/build/crash_cache.vcproj', - '$NET_DIR/build/stress_cache.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$NET_DIR/build/dump_cache.vcproj', - '$NET_DIR/build/net_resources.vcproj', - - ], - variants = [ - 'Debug|Win32', - 'Release|Win32', - ]) diff --git a/net/net_unittests.scons b/net/net_unittests.scons deleted file mode 100644 index 8801e1d..0000000 --- a/net/net_unittests.scons +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration for building the net_unittests{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SDCH_DIR/using_sdch.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -if env.Bit('posix'): - env.SConscript([ - '$LIBEVENT_DIR/using_libevent.scons', - ], {'env':env}) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/WX', - ], - ) - -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', [ - # Built from build/precomiled_net.cc, net_lib.scons. - 'precompiled_net$OBJSUFFIX', - '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/des_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_transaction_unittest.h', - 'http/http_util_unittest.cc', - 'http/http_vary_data_unittest.cc', - ]), - MSVSFilter('base', [ - 'base/base64_unittest.cc', - 'base/bzip2_filter_unittest.cc', - 'base/client_socket_pool_unittest.cc', - 'base/tcp_pinger_unittest.cc', - 'base/cookie_monster_unittest.cc', - 'base/cookie_policy_unittest.cc', - 'base/data_url_unittest.cc', - 'base/directory_lister_unittest.cc', - 'base/escape_unittest.cc', - 'base/file_stream_unittest.cc', - 'base/filter_unittest.cc', - '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/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', - ]), - MSVSFilter('ftp', [ - 'ftp/ftp_auth_cache_unittest.cc', - ]), - MSVSFilter('url_request', [ - 'url_request/url_request_unittest.cc', - 'url_request/url_request_unittest.h', - ]), - MSVSFilter('proxy', [ - 'proxy/proxy_list_unittest.cc', - 'proxy/proxy_resolver_v8_unittest.cc', - 'proxy/proxy_script_fetcher_unittest.cc', - 'proxy/proxy_server_unittest.cc', - 'proxy/proxy_service_unittest.cc', - ]), - ]), -]) - -if not env.Bit('windows'): - input_files.Remove( - 'base/wininet_util_unittest.cc', - 'precompiled_net$OBJSUFFIX', - ) - -if env.Bit('linux'): - # TODO(port): - input_files.Remove( - 'base/sdch_filter_unittest.cc', - 'base/ssl_config_service_unittest.cc', - ) - -if env.Bit('mac'): - input_files.Extend([ - '../base/platform_test_mac$OBJSUFFIX', - ]) - - # TODO(port): - 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', - ) - -net_unittests = env.ChromeTestProgram('net_unittests', input_files) - -p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj', - dest='$CHROME_SRC_DIR/net/build/net_unittests.vcproj', - guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}', - keyword='Win32Proj', - 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', - ], - # 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', - ]) diff --git a/net/stress_cache.scons b/net/stress_cache.scons deleted file mode 100644 index d777d57..0000000 --- a/net/stress_cache.scons +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration for building the stress_cache{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', -]) - -if env.Bit('posix'): - env.ApplySConscript(['$THIRD_PARTY_DIR/libevent/using_libevent.scons']) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/WX', - ], - ) - -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) - -p = env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj', - dest='$CHROME_SRC_DIR/net/build/stress_cache.vcproj', - guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}', - keyword='Win32Proj', - 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', - ]) diff --git a/net/tools/tld_cleanup/tld_cleanup.scons b/net/tools/tld_cleanup/tld_cleanup.scons deleted file mode 100644 index 5708179..0000000 --- a/net/tools/tld_cleanup/tld_cleanup.scons +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration the tld_cleanup{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$ICU38_DIR/using_icu38.scons', -]) - -if env.Bit('windows'): - env.Append( - LINKFLAGS = [ - '/SUBSYSTEM:CONSOLE', - ], - ) - -input_files = ChromeFileList([ - 'tld_cleanup.cc', -]) - -env.ChromeProgram('tld_cleanup', input_files) - -p = env.ChromeMSVSProject('$NET_DIR/build/tld_cleanup.vcproj', - dest='$CHROME_SRC_DIR/net/build/tld_cleanup.vcproj', - guid='{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}', - keyword='Win32Proj', - 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', - ]) diff --git a/net/using_net.scons b/net/using_net.scons deleted file mode 100644 index f5fed16..0000000 --- a/net/using_net.scons +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Settings for other components using the net library. -""" - -Import("env") - -env.Append( - LIBS = [ - 'net', - ], -) |