summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 22:05:12 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 22:05:12 +0000
commit0fad1f1a74408b939d1b09dcc2f9391544e7e692 (patch)
treec62164260c26f143c9ae43c32694142a725bc7eb /base
parenta9b826af8ef183810c176b9ede4a2934f4678d50 (diff)
downloadchromium_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 'base')
-rw-r--r--base/SConstruct8
-rw-r--r--base/base.scons490
-rw-r--r--base/base_gfx.scons95
-rw-r--r--base/base_main.scons27
-rw-r--r--base/base_sln.scons46
-rw-r--r--base/base_unittests.scons236
-rw-r--r--base/debug_message.scons71
-rw-r--r--base/gfx/using_base_gfx.scons15
-rw-r--r--base/using_base.scons21
9 files changed, 0 insertions, 1009 deletions
diff --git a/base/SConstruct b/base/SConstruct
deleted file mode 100644
index 61e65e1..0000000
--- a/base/SConstruct
+++ /dev/null
@@ -1,8 +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.
-
-build_component = 'base'
-SConscript('../build/SConscript.main',
- exports=['build_component'])
-
diff --git a/base/base.scons b/base/base.scons
deleted file mode 100644
index 44d2730..0000000
--- a/base/base.scons
+++ /dev/null
@@ -1,490 +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.lib / libbase.a.
-"""
-
-Import('env')
-
-env = env.Clone()
-
-env.ApplySConscript([
- '$ICU38_DIR/using_icu38.scons',
-])
-
-if env.Bit('windows'):
- env.Prepend(
- CCFLAGS = [
- '/Wp64',
- ],
- )
-
-# Add object files David M Gay's dtoa and g_fmt third party lib. We
-# compile these separately so we can disable warnings.
-env_dmg_fp = env.Clone()
-if env_dmg_fp.Bit('windows'):
- env_dmg_fp.Append(
- CCFLAGS = [
- '/wd4018',
- '/wd4102',
- '/wd4244',
- '/wd4554',
- ],
- )
-elif env_dmg_fp.Bit('posix'):
- for var in ['CCFLAGS', 'CXXFLAGS']:
- if '-Wall' in env_dmg_fp[var]:
- env_dmg_fp[var].remove('-Wall')
- env_dmg_fp[var].append('-Wno-write-strings')
-
-dtoa_cc = env_dmg_fp.ChromeObject('third_party/dmg_fp/dtoa.cc')
-
-g_fmt_cc = env_dmg_fp.ChromeObject('third_party/dmg_fp/g_fmt.cc')
-
-# Some files from this list are not yet ported. They are removed from
-# the list, see code below.
-input_files = ChromeFileList([
- 'at_exit.cc',
- 'at_exit.h',
- 'atomic_ref_count.h',
- 'atomic_sequence_num.h',
- 'atomicops.h',
- 'atomicops_internals_x86_msvc.h',
- 'base_drag_source.cc',
- 'base_drag_source.h',
- 'base_drop_target.cc',
- 'base_drop_target.h',
- 'base_paths.cc',
- 'base_paths.h',
- 'base_paths_win.cc',
- 'base_paths_win.h',
- 'base_switches.cc',
- 'base_switches.h',
- 'basictypes.h',
- 'third_party/nss/blapi.h',
- 'third_party/nss/blapit.h',
- '../build/build_config.h',
- 'bzip2_error_handler.cc',
- 'clipboard.cc',
- 'clipboard.h',
- 'clipboard_util.cc',
- 'clipboard_util.h',
- 'clipboard_win.cc',
- 'command_line.cc',
- 'command_line.h',
- 'compiler_specific.h',
- 'condition_variable.h',
- 'condition_variable_win.cc',
- 'cpu.cc',
- 'cpu.h',
- 'debug_on_start.cc',
- 'debug_on_start.h',
- 'debug_util.cc',
- 'debug_util.h',
- 'debug_util_win.cc',
- 'directory_watcher.h',
- 'directory_watcher_win.cc',
- 'third_party/dmg_fp/dmg_fp.h',
- dtoa_cc,
- 'event_recorder.cc',
- 'event_recorder.h',
- 'field_trial.cc',
- 'field_trial.h',
- 'file_path.cc',
- 'file_path.h',
- 'file_util.cc',
- 'file_util.h',
- 'file_util_win.cc',
- 'file_version_info.cc',
- 'file_version_info.h',
- 'fix_wp64.h',
- 'float_util.h',
- g_fmt_cc,
- 'hash_tables.h',
- 'histogram.cc',
- 'histogram.h',
- 'hmac.h',
- 'hmac_win.cc',
- 'iat_patch.cc',
- 'iat_patch.h',
- 'icu_util.cc',
- 'icu_util.h',
- 'id_map.h',
- 'idle_timer.cc',
- 'idle_timer.h',
- 'image_util.cc',
- 'image_util.h',
- 'json_reader.cc',
- 'json_reader.h',
- 'json_writer.cc',
- 'json_writer.h',
- 'keyboard_codes.h',
- 'keyboard_codes_posix.h',
- 'keyboard_codes_win.h',
- 'lazy_instance.cc',
- 'lazy_instance.h',
- 'linked_ptr.h',
- 'lock.cc',
- 'lock.h',
- 'lock_impl.h',
- 'lock_impl_win.cc',
- 'logging.cc',
- 'logging.h',
- 'md5.cc',
- 'md5.h',
- 'memory_debug.cc',
- 'memory_debug.h',
- 'message_loop.cc',
- 'message_loop.h',
- 'message_pump.h',
- 'message_pump_default.cc',
- 'message_pump_default.h',
- 'message_pump_win.cc',
- 'message_pump_win.h',
- 'non_thread_safe.cc',
- 'non_thread_safe.h',
- 'object_watcher.cc',
- 'object_watcher.h',
- 'observer_list.h',
- 'observer_list_threadsafe.h',
- 'path_service.cc',
- 'path_service.h',
- 'pe_image.cc',
- 'pe_image.h',
- 'pickle.cc',
- 'pickle.h',
- 'platform_file.h',
- 'platform_file_win.cc',
- 'platform_thread.h',
- 'platform_thread_win.cc',
- 'port.h',
- 'profiler.cc',
- 'profiler.h',
- 'third_party/nspr/prcpucfg.h',
- 'third_party/nspr/prcpucfg_win.h',
- 'process.h',
- 'process_util.h',
- 'process_util_win.cc',
- 'process_win.cc',
- 'third_party/nspr/prtime.cc',
- 'third_party/nspr/prtime.h',
- 'third_party/nspr/prtypes.h',
- 'third_party/purify/pure.h',
- 'third_party/purify/pure_api.c',
- 'rand_util.cc',
- 'rand_util.h',
- 'rand_util_win.cc',
- 'ref_counted.cc',
- 'ref_counted.h',
- 'registry.cc',
- 'registry.h',
- 'resource_util.cc',
- 'resource_util.h',
- 'revocable_store.cc',
- 'revocable_store.h',
- 'scoped_bstr_win.cc',
- 'scoped_bstr_win.h',
- 'scoped_clipboard_writer.cc',
- 'scoped_clipboard_writer.h',
- 'scoped_comptr_win.h',
- 'scoped_handle.h',
- 'scoped_handle_win.h',
- 'scoped_nsautorelease_pool.h',
- 'scoped_ptr.h',
- 'scoped_temp_dir.cc',
- 'scoped_temp_dir.h',
- 'sha2.cc',
- 'sha2.h',
- 'third_party/nss/sha256.h',
- 'third_party/nss/sha512.cc',
- 'shared_memory.h',
- 'shared_memory_win.cc',
- 'simple_thread.cc',
- 'simple_thread.h',
- 'singleton.h',
- 'spin_wait.h',
- 'stack_container.h',
- 'stats_counters.h',
- 'stats_table.cc',
- 'stats_table.h',
- 'string16.h',
- 'string_escape.cc',
- 'string_escape.h',
- 'string_piece.cc',
- 'string_piece.h',
- 'string_tokenizer.h',
- 'string_util.cc',
- 'string_util.h',
- 'string_util_icu.cc',
- 'string_util_win.h',
- 'sys_info.h',
- 'sys_info_win.cc',
- 'sys_string_conversions.h',
- 'sys_string_conversions_win.cc',
- 'system_monitor.cc',
- 'system_monitor.h',
- 'system_monitor_win.cc',
- 'task.h',
- 'test_file_util.h',
- 'test_file_util_win.cc',
- 'thread.cc',
- 'thread.h',
- 'thread_collision_warner.cc',
- 'thread_collision_warner.h',
- 'thread_local.h',
- 'thread_local_storage.h',
- 'thread_local_storage_win.cc',
- 'thread_local_win.cc',
- 'time.cc',
- 'time.h',
- 'time_format.cc',
- 'time_format.h',
- 'time_win.cc',
- 'timer.cc',
- 'timer.h',
- 'trace_event.cc',
- 'trace_event.h',
- 'tracked.cc',
- 'tracked.h',
- 'tracked_objects.cc',
- 'tracked_objects.h',
- 'tuple.h',
- 'values.cc',
- 'values.h',
- 'version.cc',
- 'version.h',
- 'waitable_event.h',
- 'waitable_event_watcher.h',
- 'waitable_event_watcher_win.cc',
- 'waitable_event_win.cc',
- 'watchdog.cc',
- 'watchdog.h',
- 'win_util.cc',
- 'win_util.h',
- 'windows_message_list.h',
- 'wmi_util.cc',
- 'wmi_util.h',
- 'word_iterator.cc',
- 'word_iterator.h',
- 'worker_pool.h',
- 'worker_pool_win.cc',
-])
-
-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(
- 'clipboard_util.cc',
- 'event_recorder.cc',
-
- # We have an implementation of idle_timer that depends on XScreenSaver,
- # but it's unclear if we want it yet, so it's commented out for now.
- # Leave this 'unported'.
- 'idle_timer.cc',
-
- 'object_watcher.cc',
-
- 'resource_util.cc', # Uses HMODULE, but may be abstractable.
- )
-
- input_files.Append(
- # See above note about idle_timer.cc.
- 'idle_timer_none.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_drag_source.cc',
- 'base_drop_target.cc',
- 'base_paths_win.cc',
- 'clipboard_win.cc',
- 'condition_variable_win.cc',
- 'cpu.cc',
- 'debug_on_start.cc',
- 'debug_util_win.cc',
- 'directory_watcher_win.cc',
- 'file_util_win.cc',
- 'file_version_info.cc',
- 'hmac_win.cc',
- 'iat_patch.cc',
- 'image_util.cc',
- 'lock_impl_win.cc',
- 'message_pump_win.cc',
- 'pe_image.cc',
- 'platform_file_win.cc',
- 'platform_thread_win.cc',
- 'process_util_win.cc',
- 'process_win.cc',
- 'rand_util_win.cc',
- 'registry.cc',
- 'scoped_bstr_win.cc',
- 'scoped_bstr_win.h',
- 'scoped_comptr_win.h',
- 'shared_memory_win.cc',
- 'sys_info_win.cc',
- 'sys_string_conversions_win.cc',
- 'system_monitor_win.cc',
- 'test_file_util_win.cc',
- 'thread_local_storage_win.cc',
- 'thread_local_win.cc',
- 'third_party/purify/pure_api.c',
- 'time_win.cc',
- 'waitable_event_win.cc',
- 'waitable_event_watcher_win.cc',
- 'win_util.cc',
- 'wmi_util.cc',
- 'worker_pool_win.cc',
- )
-
-if env.Bit('posix'):
- input_files.Extend([
- 'condition_variable_posix.cc',
- 'debug_util_posix.cc',
- 'file_util_posix.cc',
- 'lock_impl_posix.cc',
- 'message_pump_libevent.cc',
- 'platform_file_posix.cc',
- 'platform_thread_posix.cc',
- 'process_util_posix.cc',
- 'rand_util_posix.cc',
- 'shared_memory_posix.cc',
- 'string16.cc',
- 'sys_info_posix.cc',
- 'system_monitor_posix.cc',
- 'test_file_util_posix.cc',
- 'thread_local_storage_posix.cc',
- 'thread_local_posix.cc',
- 'time_posix.cc',
- 'waitable_event_posix.cc',
- 'waitable_event_watcher_posix.cc',
- ])
-
-if env.Bit('mac'):
- input_files.Extend([
- 'base_paths_mac.mm',
- 'event_recorder_stubs.cc',
- 'clipboard_mac.mm',
- 'file_util_mac.mm',
- 'file_version_info_mac.mm',
- 'hmac_mac.cc',
- 'mac_util.mm',
- 'message_pump_mac.mm',
- 'platform_thread_mac.mm',
- 'scoped_nsautorelease_pool.mm',
- 'sys_string_conversions_mac.mm',
- 'test_file_util_mac.cc',
- 'worker_pool_mac.mm',
- ])
-
-if env.Bit('linux'):
- input_files.Extend([
- 'atomicops_internals_x86_gcc.cc',
- 'base_paths_linux.cc',
- 'clipboard_linux.cc',
- 'data_pack.cc',
- 'directory_watcher_inotify.cc',
- 'event_recorder_stubs.cc',
- 'file_util_linux.cc',
- 'file_version_info_linux.cc',
- 'hmac_nss.cc',
- 'message_pump_glib.cc',
- 'nss_init.cc',
- 'process_posix.cc',
- 'process_util_linux.cc',
- 'sys_string_conversions_linux.cc',
- 'test_file_util_linux.cc',
- 'worker_pool_linux.cc',
- 'worker_pool_linux.h',
- ])
-
- linux_version = env.Command('$BASE_DIR/file_version_info_linux.h',
- 'file_version_info_linux.h.version',
- ('../chrome/tools/build/linux/version.sh'
- ' ${SOURCE}'
- ' ${TARGET}'))
- env.AlwaysBuild(linux_version)
- # Always generate version information, e.g. to capture revision changes, which
- # aren't captured by file dependencies.
- env.Append(CPPPATH = ['$OBJ_ROOT'])
-
-env.ChromeLibrary('base', input_files)
-
-p = env.ChromeMSVSProject('build/base.vcproj',
- dest='$CHROME_SRC_DIR/base/build/base.vcproj',
- guid='{1832A374-8A74-4F9E-B536-69A699B3E165}',
- keyword='Win32Proj',
- dependencies=[
- 'build/debug_message.vcproj',
- # Necessary for chrome.sln.
- '$ICU38_DIR/build/icu.vcproj',
- ],
- files=input_files,
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- 'VCCLCompilerTool',
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- 'VCLibrarianTool',
- 'VCALinkTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCPostBuildEventTool',
- ])
-
-p.AddConfig('Debug|Win32',
- ConfigurationType = '4',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/debug.vsprops',
- './base.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- ConfigurationType = '4',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/release.vsprops',
- './base.vsprops',
- ])
-
-p.AddFileConfig(
- 'third_party/dmg_fp/dtoa.cc',
- 'Debug|Win32',
- tools=[
- MSVSTool('VCCLCompilerTool',
- DisableSpecificWarnings='4244;4554;4018;4102'),
- ])
-
-p.AddFileConfig(
- 'third_party/dmg_fp/dtoa.cc',
- 'Release|Win32',
- tools=[
- MSVSTool('VCCLCompilerTool',
- DisableSpecificWarnings='4244;4554;4018;4102'),
- ])
-
-p.AddFileConfig(
- 'third_party/dmg_fp/g_fmt.cc',
- 'Debug|Win32',
- tools=[
- MSVSTool('VCCLCompilerTool', DisableSpecificWarnings='4102'),
- ])
-
-p.AddFileConfig(
- 'third_party/dmg_fp/g_fmt.cc',
- 'Release|Win32',
- tools=[
- MSVSTool('VCCLCompilerTool', DisableSpecificWarnings='4102'),
- ])
diff --git a/base/base_gfx.scons b/base/base_gfx.scons
deleted file mode 100644
index a2d26f0..0000000
--- a/base/base_gfx.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 base_gfx.lib / libbase_gfx.a.
-"""
-
-Import('env')
-
-env = env.Clone()
-
-env.ApplySConscript([
- '$ICU38_DIR/using_icu38.scons',
- '$LIBJPEG_DIR/using_libjpeg.scons',
- '$LIBPNG_DIR/using_libpng.scons',
- '$SKIA_DIR/using_skia.scons',
- '$ZLIB_DIR/using_zlib.scons',
-])
-
-if env.Bit('windows'):
- env.Prepend(
- CCFLAGS = [
- '/WX',
- ],
- )
-
-input_files = ChromeFileList([
- 'gfx/jpeg_codec.cc',
- 'gfx/jpeg_codec.h',
- 'gfx/png_decoder.cc',
- 'gfx/png_decoder.h',
- 'gfx/png_encoder.cc',
- 'gfx/png_encoder.h',
- 'gfx/point.cc',
- 'gfx/point.h',
- 'gfx/rect.cc',
- 'gfx/rect.h',
- 'gfx/size.cc',
- 'gfx/size.h',
-])
-
-if env.Bit('windows'):
- input_files.Extend([
- 'gfx/native_theme.cc',
- 'gfx/native_theme.h',
- 'gfx/gdi_util.cc',
- 'gfx/gdi_util.h',
- ])
-elif env.Bit('linux'):
- input_files.Extend([
- 'gfx/gtk_util.cc',
- 'gfx/gtk_util.h',
- ])
-
-env.ChromeLibrary('base_gfx', input_files)
-
-p = env.ChromeMSVSProject('build/base_gfx.vcproj',
- dest='$CHROME_SRC_DIR/base/build/base_gfx.vcproj',
- guid='{A508ADD3-CECE-4E0F-8448-2F5E454DF551}',
- keyword='Win32Proj',
- files=input_files,
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- 'VCCLCompilerTool',
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- 'VCLibrarianTool',
- 'VCALinkTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCPostBuildEventTool',
- ])
-
-p.AddConfig('Debug|Win32',
- ConfigurationType = '4',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/debug.vsprops',
- './base_gfx.vsprops',
- '../../skia/using_skia.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- ConfigurationType = '4',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/release.vsprops',
- './base_gfx.vsprops',
- '../../skia/using_skia.vsprops',
- ])
diff --git a/base/base_main.scons b/base/base_main.scons
deleted file mode 100644
index daecde9..0000000
--- a/base/base_main.scons
+++ /dev/null
@@ -1,27 +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 entire base "solution", including all
-the specific targets in various *.scons files, and a base.sln file
-on Windows.
-"""
-
-Import('env')
-
-# Arrange for Hammer to add all programs to the 'base' Alias.
-env.Append(
- COMPONENT_PROGRAM_GROUPS = ['base'],
- COMPONENT_TEST_PROGRAM_GROUPS = ['base'],
-)
-
-sconscript_files = [
- 'base.scons',
- 'base_gfx.scons',
- 'base_sln.scons',
- 'base_unittests.scons',
- 'debug_message.scons',
-]
-
-env.SConscript(sconscript_files, exports=['env'])
diff --git a/base/base_sln.scons b/base/base_sln.scons
deleted file mode 100644
index 046945b..0000000
--- a/base/base_sln.scons
+++ /dev/null
@@ -1,46 +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('base dependencies',
- name='dependencies',
- entries = [
- '$ZLIB_DIR/zlib.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$ICU38_DIR/build/icudt.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- '$LIBPNG_DIR/libpng.vcproj',
- '$SKIA_DIR/skia.vcproj',
- ],
- guid='{F216062D-F9C4-4883-A52C-2BE9ECADEEA0}')
-
-
-solution = env.ChromeMSVSSolution('base.sln',
- dest='$CHROME_SRC_DIR/base/base.sln',
- entries = [
- '$BASE_DIR/build/base.vcproj',
- '$BASE_DIR/build/base_unittests.vcproj',
- '$BASE_DIR/build/debug_message.vcproj',
- 'base dependencies',
- '$ICU38_DIR/build/icu.vcproj',
- '$ICU38_DIR/build/icudt.vcproj',
- '$BASE_DIR/build/base_gfx.vcproj',
- '$SKIA_DIR/skia.vcproj',
- '$LIBPNG_DIR/libpng.vcproj',
- '$ZLIB_DIR/zlib.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- ],
- variants = [
- 'Debug|Win32',
- 'Release|Win32',
- ])
diff --git a/base/base_unittests.scons b/base/base_unittests.scons
deleted file mode 100644
index c4cb2f7..0000000
--- a/base/base_unittests.scons
+++ /dev/null
@@ -1,236 +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_unittests{,.exe}.
-"""
-
-Import('env')
-
-env = env.Clone()
-
-env.ApplySConscript([
- '$BASE_DIR/using_base.scons',
- '$BASE_DIR/gfx/using_base_gfx.scons',
- '$GTEST_DIR/../using_gtest.scons',
- '$ICU38_DIR/using_icu38.scons',
- '$LIBJPEG_DIR/using_libjpeg.scons',
- '$LIBPNG_DIR/using_libpng.scons',
- '$SKIA_DIR/using_skia.scons',
- '$ZLIB_DIR/using_zlib.scons',
-])
-
-if env.Bit('posix'):
- env.ApplySConscript([
- '$LIBEVENT_DIR/using_libevent.scons',
- ])
-
-if env.Bit('windows'):
- env.Prepend(
- CCFLAGS = [
- '/TP',
- '/WX',
- ],
- )
-
-if env.Bit('linux'):
- env.Append(
- # We need 'Xss' (X Screen Saver) in LIBS if we want idletimer_unittest
- LIBS = [
- 'event',
- ],
- )
-
-input_files = ChromeFileList([
- # TODO(sgk):
- # We're deliberately mis-indenting the MSVSFilter() calls here
- # so we don't have to re-indent the file name entries when the
- # MSVSFilter() calls go away in (favor of automated generation
- # of the heirarchy).
- MSVSFilter('support', [
- 'multiprocess_test.h',
- 'no_windows2000_unittest.h',
- 'perf_test_suite.h',
- 'run_all_unittests.cc',
- 'test_suite.h',
- ]),
-
- MSVSFilter('base_tests', [
- 'at_exit_unittest.cc',
- 'atomicops_unittest.cc',
- 'clipboard_unittest.cc',
- 'command_line_unittest.cc',
- 'condition_variable_unittest.cc',
- 'directory_watcher_unittest.cc',
- 'field_trial_unittest.cc',
- 'file_path_unittest.cc',
- 'file_util_unittest.cc',
- 'file_version_info_unittest.cc',
- 'histogram_unittest.cc',
- 'hmac_unittest.cc',
- 'idletimer_unittest.cc',
- 'json_reader_unittest.cc',
- 'json_writer_unittest.cc',
- 'lazy_instance_unittest.cc',
- 'linked_ptr_unittest.cc',
- 'message_loop_unittest.cc',
- 'gfx/native_theme_unittest.cc',
- 'object_watcher_unittest.cc',
- 'observer_list_unittest.cc',
- 'path_service_unittest.cc',
- 'pe_image_unittest.cc',
- 'pickle_unittest.cc',
- 'pr_time_unittest.cc',
- 'process_util_unittest.cc',
- 'rand_util_unittest.cc',
- 'gfx/rect_unittest.cc',
- 'ref_counted_unittest.cc',
- 'scoped_bstr_win_unittest.cc',
- 'scoped_comptr_win_unittest.cc',
- 'scoped_ptr_unittest.cc',
- 'sha2_unittest.cc',
- 'shared_memory_unittest.cc',
- 'simple_thread_unittest.cc',
- 'singleton_unittest.cc',
- 'stack_container_unittest.cc',
- 'stats_table_unittest.cc',
- 'string_escape_unittest.cc',
- 'string_piece_unittest.cc',
- 'string_tokenizer_unittest.cc',
- 'string_util_unittest.cc',
- 'sys_info_unittest.cc',
- 'sys_string_conversions_unittest.cc',
- 'system_monitor_unittest.cc',
- 'thread_collision_warner_unittest.cc',
- 'thread_local_storage_unittest.cc',
- 'thread_local_unittest.cc',
- 'thread_unittest.cc',
- 'time_unittest.cc',
- 'time_win_unittest.cc',
- 'timer_unittest.cc',
- 'tracked_objects_unittest.cc',
- 'tuple_unittest.cc',
- 'values_unittest.cc',
- 'version_unittest.cc',
- 'waitable_event_unittest.cc',
- 'waitable_event_watcher_unittest.cc',
- 'watchdog_unittest.cc',
- 'win_util_unittest.cc',
- 'wmi_util_unittest.cc',
- 'word_iterator_unittest.cc',
- 'worker_pool_unittest.cc'
- ]),
-
- MSVSFilter('gfx_tests', [
- 'gfx/jpeg_codec_unittest.cc',
- 'gfx/png_codec_unittest.cc',
- ]),
-])
-
-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(
- # We have an implementation of idle_timer, but it's unclear if we want it
- # yet, so it's commented out for now. Leave this 'unported'.
- 'idletimer_unittest.cc',
-
- 'gfx/native_theme_unittest.cc',
- )
-
-if env.Bit('linux'):
- input_files.Append(
- 'data_pack_unittest.cc',
- 'worker_pool_linux_unittest.cc'
- )
-
-if env.Bit('mac'):
- # 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(
- 'process_util_unittest.cc',
- 'stats_table_unittest.cc',
- )
-
-
-if not env.Bit('windows'):
- # Remove Windows-specific tests.
- input_files.Remove(
- 'file_version_info_unittest.cc',
- 'object_watcher_unittest.cc',
- 'pe_image_unittest.cc',
- 'scoped_bstr_win_unittest.cc',
- 'scoped_comptr_win_unittest.cc',
- 'system_monitor_unittest.cc',
- 'time_win_unittest.cc',
- 'win_util_unittest.cc',
- 'wmi_util_unittest.cc',
- )
-
-if env.Bit('mac'):
- # Mac-specific tests.
- input_files.Extend([
- 'mac_util_unittest.cc',
- ])
-
-env.ChromeTestProgram('base_unittests', input_files)
-
-p = env.ChromeMSVSProject('build/base_unittests.vcproj',
- dest='$CHROME_SRC_DIR/base/build/base_unittests.vcproj',
- guid='{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}',
- dependencies=[
- '$BASE_DIR/build/base.vcproj',
- '$ZLIB_DIR/zlib.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$BASE_DIR/build/base_gfx.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- '$LIBPNG_DIR/libpng.vcproj',
- '$SKIA_DIR/skia.vcproj',
- ],
- files=input_files,
- tools = [
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- MSVSTool('VCCLCompilerTool',
- PreprocessorDefinitions='UNIT_TEST'),
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- 'VCLinkerTool',
- 'VCALinkTool',
- 'VCManifestTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCAppVerifierTool',
- 'VCWebDeploymentTool',
- 'VCPostBuildEventTool',
- ])
-
-p.AddConfig('Debug|Win32',
- ConfigurationType = '1',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/debug.vsprops',
- './base_unittests.vsprops',
- '$(SolutionDir)../testing/using_gtest.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- ConfigurationType = '1',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/release.vsprops',
- './base_unittests.vsprops',
- '$(SolutionDir)../testing/using_gtest.vsprops',
- ])
-
-# TODO(sgk) should this be moved into base.lib like everything else? This will
-# require updating a bunch of other SConscripts which link directly against
-# this generated object file.
-env.StaticObject('perftimer.cc')
-
-# Since run_all_perftests supplies a main, we cannot have it in base.lib
-env.StaticObject('run_all_perftests.cc')
diff --git a/base/debug_message.scons b/base/debug_message.scons
deleted file mode 100644
index 5e329f2..0000000
--- a/base/debug_message.scons
+++ /dev/null
@@ -1,71 +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_unittests{,.exe}.
-"""
-
-Import('env')
-
-env = env.Clone()
-
-if env.Bit('windows'):
- env.Append(
- LINKFLAGS = [
- '/SUBSYSTEM:WINDOWS',
- ],
- )
-
-input_files = ChromeFileList([
- 'debug_message.cc',
-])
-
-if env.Bit('windows'):
- # TODO(port): port this if it's needed on non-Windows systems,
- # or remove this comment (and merge with the above block?)
- # if it's really Windows-specific.
- env.ChromeProgram('debug_message', input_files)
-
-p = env.ChromeMSVSProject('build/debug_message.vcproj',
- dest=('$CHROME_SRC_DIR/base/'
- + 'build/debug_message.vcproj'),
- guid='{0E5474AC-5996-4B13-87C0-4AE931EE0815}',
- keyword='Win32Proj',
- files=input_files,
- root_namespace='DebugMessage',
- tools = [
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- 'VCCLCompilerTool',
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- MSVSTool('VCLinkerTool', SubSystem='2'),
- 'VCALinkTool',
- 'VCManifestTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCAppVerifierTool',
- 'VCWebDeploymentTool',
- 'VCPostBuildEventTool',
- ])
-
-p.AddConfig('Debug|Win32',
- ConfigurationType = '1',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/debug.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- ConfigurationType = '1',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/release.vsprops',
- ])
diff --git a/base/gfx/using_base_gfx.scons b/base/gfx/using_base_gfx.scons
deleted file mode 100644
index a428878..0000000
--- a/base/gfx/using_base_gfx.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 base_gfx library.
-"""
-
-Import("env")
-
-env.Append(
- LIBS = [
- 'base_gfx',
- ],
-)
diff --git a/base/using_base.scons b/base/using_base.scons
deleted file mode 100644
index a37652f..0000000
--- a/base/using_base.scons
+++ /dev/null
@@ -1,21 +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 base library.
-"""
-
-Import("env")
-
-env.Append(
- LIBS = [
- 'base',
- ],
-)
-
-# base depends on libevent on POSIX systems.
-if env.Bit('posix'):
- env.ApplySConscript([
- '$LIBEVENT_DIR/using_libevent.scons',
- ])