diff options
163 files changed, 0 insertions, 20713 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', - ]) diff --git a/breakpad/SConscript b/breakpad/SConscript deleted file mode 100644 index c68fc8a..0000000 --- a/breakpad/SConscript +++ /dev/null @@ -1,16 +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 breakpad libraries. -""" - -Import('env') - -sconscript_files = [ - 'breakpad_handler.scons', - 'breakpad_sender.scons', -] - -SConscript(sconscript_files, exports=['env']) diff --git a/breakpad/breakpad_handler.scons b/breakpad/breakpad_handler.scons deleted file mode 100644 index 43c7472..0000000 --- a/breakpad/breakpad_handler.scons +++ /dev/null @@ -1,96 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - 'src', - '$CHROME_SRC_DIR', - ], -) - -input_files = ChromeFileList([ - 'src/client/windows/crash_generation/client_info.cc', - 'src/client/windows/crash_generation/client_info.h', - 'src/client/windows/crash_generation/crash_generation_client.cc', - 'src/client/windows/crash_generation/crash_generation_client.h', - 'src/client/windows/crash_generation/crash_generation_server.cc', - 'src/client/windows/crash_generation/crash_generation_server.h', - 'src/client/windows/handler/exception_handler.cc', - 'src/client/windows/handler/exception_handler.h', - 'src/common/windows/guid_string.cc', - 'src/common/windows/guid_string.h', - 'src/google_breakpad/common/minidump_format.h', - 'src/client/windows/crash_generation/minidump_generator.cc', - 'src/client/windows/crash_generation/minidump_generator.h', - 'src/common/windows/string_utils-inl.h', -]) - -if not env.Bit('windows'): - input_files.Remove( - 'src/client/windows/crash_generation/client_info.cc', - 'src/client/windows/crash_generation/minidump_generator.cc', - 'src/common/windows/guid_string.cc', - 'src/client/windows/handler/exception_handler.cc', - 'src/client/windows/crash_generation/crash_generation_server.cc', - 'src/client/windows/crash_generation/crash_generation_client.cc', - ) - -if not env.Bit('linux'): - input_files.Remove( - 'src/common/linux/guid_creator.cc', - 'src/client/linux/handler/exception_handler.cc', - 'src/client/linux/handler/minidump_generator.cc', - 'src/client/linux/handler/linux_thread.cc', - ) - -env.ChromeLibrary('breakpad_handler', input_files) - -p = env.ChromeMSVSProject('breakpad_handler.vcproj', - dest=('$CHROME_SRC_DIR/breakpad/' + - 'breakpad_handler.vcproj'), - guid='{B55CA863-B374-4BAF-95AC-539E4FA4C90C}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - './using_breakpad.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - './using_breakpad.vsprops', - ]) diff --git a/breakpad/breakpad_sender.scons b/breakpad/breakpad_sender.scons deleted file mode 100644 index c97edb7..0000000 --- a/breakpad/breakpad_sender.scons +++ /dev/null @@ -1,63 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - 'src', - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - '/wd4800', - ], - ) - -input_files = ChromeFileList([ - 'src/client/windows/sender/crash_report_sender.cc', - 'src/common/windows/http_upload.cc', - 'src/client/windows/sender/crash_report_sender.h', - 'src/common/windows/http_upload.h', -]) - -if env.Bit('windows'): - env.ChromeLibrary('breakpad_sender', input_files) - -p = env.ChromeMSVSProject('breakpad_sender.vcproj', - dest=('$CHROME_SRC_DIR/breakpad/' + - 'breakpad_sender.vcproj'), - guid='{9946A048-043B-4F8F-9E07-9297B204714C}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCLibrarianTool', - 'VCCLCompilerTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - 'using_breakpad.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - 'using_breakpad.vsprops', - ]) diff --git a/breakpad/using_breakpad.scons b/breakpad/using_breakpad.scons deleted file mode 100644 index 27874fc..0000000 --- a/breakpad/using_breakpad.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 Breakpad. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$BREAKPAD_DIR/src', - ], -) diff --git a/build/SConscript.googleurl b/build/SConscript.googleurl deleted file mode 100644 index e69de29..0000000 --- a/build/SConscript.googleurl +++ /dev/null diff --git a/build/SConscript.main b/build/SConscript.main deleted file mode 100644 index 0f6d833..0000000 --- a/build/SConscript.main +++ /dev/null @@ -1,909 +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. - -import os -import shutil -import sys - - -if sys.platform == 'win32': - console = 'con' -else: - console = '/dev/tty' -p = ARGUMENTS.get('PROGRESS') -if p == 'spinner': - Progress(['/\r', '|\r', '\\\r', '-\r'], interval=5, file=open(console, 'w')) -elif p == 'name': - Progress('$TARGET\r', overwrite=True, file=open(console, 'w')) - - -default_warnings = ['no-missing-sconscript', 'no-no-parallel-support'] -default_warnings = ['no-no-parallel-support'] -SetOption('warn', default_warnings + GetOption('warn')) - - -# Variables for controlling the build. -# -# The following variables can be set either on the command line -# or in the external environment when executing SCons, with the -# command line overriding any environment setting. -# -# BUILD_TARGET_DIR -# Specifies the target subdirectory name in which we'll -# build everything. This is intended to mimic the Visual -# Visual Studio "Debug\" and "Release\" subdirectories. -# The default value is "Hammer." -# -# -# CHROME_BUILD_TYPE -# When set, applies settings from the file -# build\internal\release_impl${CHROME_BUILD_TYPE}.scons -# to be applied to the construction environment. -# -# CHROMIUM_BUILD -# When set, applies settings from the file -# build\internal\chromium_build${CHROMIUM_BUILD}.scons -# to be applied to the construction environment. -# -# INCREMENTAL -# Controls whether or not libraries and executable programs are -# linked incrementally. When set to any True value (1, T, y, True), -# uses the /INCREMENTAL flag to the Microsoft linker. An -# explicit False value (0, f, N, false) uses the /INCREMENTAL:NO. -# When not set, the default is to link debug (developer) builds -# incrementally, but release builds use full links. -# -clvars = Variables('scons.opts', ARGUMENTS) -clvars.AddVariables( - ('BUILD_TARGET_DIR', '', 'Hammer'), - ('CHROME_BUILD_TYPE', '', os.environ.get('CHROME_BUILD_TYPE', '')), - ('CHROMIUM_BUILD', '', os.environ.get('CHROMIUM_BUILD', '')), - BoolVariable('INCREMENTAL', '', os.environ.get('INCREMENTAL')), -) - - -if ARGUMENTS.get('_GYP'): - tool_list = ['chromium_builders'] -else: - tool_list = ['component_setup', - 'chromium_builders', - 'chromium_load_component', - 'MSVSNew'] - - -root_env = Environment( - # MSVSNew in the base environment? Yes, the point is we can (and - # want to) generate Visual Studio project and solution files from - # any platform. - tools = tool_list, - variables = clvars, - - # Requested list of system (shared) libraries, from the comma separated - # SYSTEM_LIBS command-line argument - req_system_libs = [], - # All supported system libraries, for the help message - all_system_libs = [], - - CHROME_SRC_DIR = '$MAIN_DIR/..', - SRC_DIR = '$MAIN_DIR/..', - DESTINATION_ROOT = '$MAIN_DIR/$BUILD_TARGET_DIR', - - # Where ComponentTestProgram() will build test executables. - TESTS_DIR = '$DESTINATION_ROOT', - - # Where ComponentProgram() will build program executables. - STAGING_DIR = '$DESTINATION_ROOT', - - # TODO(hammer): when Hammer supports this... - # Have Hammer prefix all Library aliases with lib_ (to avoid - # collisions with the component names themselves). - #COMPONENT_LIBRARY_ALIAS = 'lib_$LIBNAME', - - # Disable running of tests thru scons for now. - COMPONENT_TEST_RUNNABLE = False, - - BASE_DIR = '$OBJ_ROOT/base', - BREAKPAD_DIR = '$OBJ_ROOT/breakpad', - CHROME_DIR = '$OBJ_ROOT/chrome', - GEARS_DIR = '$OBJ_ROOT/gears', - GOOGLE_UPDATE_DIR = '$OBJ_ROOT/google_update', - GOOGLEURL_DIR = '$OBJ_ROOT/googleurl', - MEDIA_DIR = '$OBJ_ROOT/media', - NET_DIR = '$OBJ_ROOT/net', - PRINTING_DIR = '$OBJ_ROOT/printing', - RLZ_DIR = '$OBJ_ROOT/rlz', - SANDBOX_DIR = '$OBJ_ROOT/sandbox', - SDCH_DIR = '$OBJ_ROOT/sdch', - SKIA_DIR = '$OBJ_ROOT/skia', - TESTING_DIR = '$OBJ_ROOT/testing', - THIRD_PARTY_DIR = '$OBJ_ROOT/third_party', - TOOLS_DIR = '$OBJ_ROOT/tools', - V8_DIR = '$OBJ_ROOT/v8', - WEBKIT_DIR = '$OBJ_ROOT/webkit', - - GTEST_DIR = '$TESTING_DIR/gtest', - - BSDIFF_DIR = '$THIRD_PARTY_DIR/bsdiff', - BSPATCH_DIR = '$THIRD_PARTY_DIR/bspatch', - BZIP2_DIR = '$THIRD_PARTY_DIR/bzip2', - ICU38_DIR = '$THIRD_PARTY_DIR/icu38', - LIBEVENT_DIR = '$THIRD_PARTY_DIR/libevent', - LIBJPEG_DIR = '$THIRD_PARTY_DIR/libjpeg', - LIBPNG_DIR = '$THIRD_PARTY_DIR/libpng', - LIBXML_DIR = '$THIRD_PARTY_DIR/libxml', - LIBXSLT_DIR = '$THIRD_PARTY_DIR/libxslt', - LZMA_SDK_DIR = '$THIRD_PARTY_DIR/lzma_sdk', - MODP_B64_DIR = '$THIRD_PARTY_DIR/modp_b64', - NPAPI_DIR = '$THIRD_PARTY_DIR/npapi', - SQLITE_DIR = '$THIRD_PARTY_DIR/sqlite', - ZLIB_DIR = '$THIRD_PARTY_DIR/zlib', - - THIRD_PARTY_WEBKIT_DIR = '$THIRD_PARTY_DIR/WebKit', - - GTK_CLIP_DUMP_DIR = '$TOOLS_DIR/gtk_clipboard_dump', - GRIT_DIR = '$TOOLS_DIR/grit', - - PYTHON=sys.executable, - - PERL = 'perl', - PERL_INCLUDE_FLAG = '-I ', - PERL_INCLUDE_SUFFIX = '', - _PERL_INCLUDE_FLAGS = ('${_concat(PERL_INCLUDE_FLAG, ' - 'PERL_INCLUDE_PATH, ' - 'PERL_INCLUDE_SUFFIX,' - '__env__, RDirs, TARGET, SOURCE)}'), -) - -root_env['req_system_libs'] = [] -if 'SYSTEM_LIBS' in ARGUMENTS: - root_env['req_system_libs'] = ARGUMENTS['SYSTEM_LIBS'].split(',') - print "WARNING: Using system libs is not yet supported and may fail." - print "WARNING: You should only use this flag if you're willing to diagnose" - print "WARNING: and fix the inevitable link failures." - -root_env['_GYP'] = ARGUMENTS.get('GYP') and '_gyp' or '' - -def WantSystemLib(env, lib): - """ - Return true if lib has been requested as a system library in SYSTEM_LIBS. - """ - if lib not in env['all_system_libs']: - env['all_system_libs'].append(lib) - return (lib in env['req_system_libs']) -root_env.AddMethod(WantSystemLib, "WantSystemLib") - - -# TODO(bradnelson): pull this functionality into hammer. -# Auto select the number of processors -if root_env['PLATFORM'] in ['win32', 'cygwin']: - cpus = int(os.environ.get('NUMBER_OF_PROCESSORS', 1)) -elif root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: - # TODO(evanm): this is Linux-specific, not posix. - # Parse /proc/cpuinfo for processor count. - cpus = len([l for l in open('/proc/cpuinfo') if l.startswith('processor\t')]) -else: - cpus = 1 -SetOption('num_jobs', cpus + 1) - - -# Use timestamps change, followed by MD5 for speed -root_env.Decider('MD5-timestamp') - -# Incorporate settings that should apply globally (primarily to provide -# an obvious place for developmental experimentation). -root_env.ApplySConscript(['$CHROME_SRC_DIR/build/common.scons']) - -# The list of all leaf (fully described) environments. -environment_list = [] -components = [] - -# Figure out what SConscript files to load based on the user's request. -# Default is to load all SConscript files for a full-tree build. -# The keyword arguments in the call below (base, breakpad, etc.) can be -# specified in the LOAD= argument to cut down on the build. - -Default(None) # Reset default target to empty. -if root_env.get('_GYP'): - webkit_sconscript = '$WEBKIT_DIR/tools/test_shell/test_shell_main${_GYP}.scons' -else: - webkit_sconscript = '$WEBKIT_DIR/webkit_main${_GYP}.scons' - -sconscript_map = dict( - base = '$BASE_DIR/base_main${_GYP}.scons', - breakpad = '$BREAKPAD_DIR/SConscript', - chrome = '$CHROME_DIR/chrome_main${_GYP}.scons', - gears = '$GEARS_DIR/SConscript', - google_update = '$GOOGLE_UPDATE_DIR/SConscript', - googleurl = '$GOOGLEURL_DIR/googleurl.scons', - media = '$MEDIA_DIR/media.scons', - net = '$NET_DIR/net_main${_GYP}.scons', - printing = '$PRINTING_DIR/printing.scons', - rlz = '$RLZ_DIR/SConscript', - sandbox = '$SANDBOX_DIR/sandbox.scons', - sdch = '$SDCH_DIR/SConscript', - skia = '$SKIA_DIR/SConscript', - testing = '$TESTING_DIR/SConscript.gtest', - third_party = [ - '$BSDIFF_DIR/bsdiff.scons', - '$BSPATCH_DIR/bspatch.scons', - '$BZIP2_DIR/bzip2.scons', - '$ICU38_DIR/icu38_main${_GYP}.scons', - '$LIBJPEG_DIR/libjpeg${_GYP}.scons', - '$LIBPNG_DIR/libpng${_GYP}.scons', - '$LIBXML_DIR/libxml.scons', - '$LIBXSLT_DIR/libxslt.scons', - '$LZMA_SDK_DIR/lzma_sdk.scons', - '$MODP_B64_DIR/modp_b64.scons', - '$ZLIB_DIR/zlib${_GYP}.scons', - ], - tools = '$GTK_CLIP_DUMP_DIR/gcd.scons', - v8 = '$OBJ_ROOT/build/SConscript.v8', - webkit = webkit_sconscript, -) - -if root_env.get('_GYP'): - Import('build_component') - sconscripts = [sconscript_map[build_component]] - components = [build_component] -else: - sconscripts = root_env.ChromiumLoadComponentSConscripts(**sconscript_map) - -# Add the final list into the root environment to be build in BuildComponents. -root_env.Append(BUILD_SCONSCRIPTS = sconscripts) - -if not root_env.WantSystemLib('sqlite') and not root_env.get('_GYP'): - root_env.Append(BUILD_SCONSCRIPTS = ['$SQLITE_DIR/SConscript']) - - -# -------------------------------------------------------------------------- -# Windows specific - -windows_env = root_env.Clone() - -# TODO(siggi) Remove this code once SCons plays well when the -# Platform SDK 6.1 is installed with VS2005 but not VS2008. -if root_env['PLATFORM'] in ['win32', 'cygwin']: - windows_env['MSVS_VERSION'] = '8.0' - -windows_env.Tool('target_platform_windows') -windows_env.Tool('component_targets_msvs') # Per target project support. - -# Hammer's target_platform_windows module added the stock SCons -# MSVSProject() and MSVSSolution() Builders, which we're going to -# replace with our newer, more flexible implementation. Wipe out the -# older ones so they don't interfere with our initialization and so -# SCons doesn't propagate them to cloned construction environments. -del windows_env['BUILDERS']['MSVSProject'] -del windows_env['BUILDERS']['MSVSSolution'] -windows_env.Tool('MSVSNew') - -windows_env.Tool('midl') - -# TODO(bradnelson): target_platform_windows defines a whole bunch of -# flags that we don't care about, including defining OS_WINDOWS in a -# way that we don't want, and (most especially) adding *_DEBUG and -# *_OPTIMIZED constructionv variables that add magic values to -# CCFLAGS. We override the normal variables (CPPDEFINES, CCFLAGS, -# LINKFLAGS, ARFLAGS) below, but get rid of the special Hammer ones -# here, until Hammer can be made a little nicer about htis. - -del windows_env['CCFLAGS_DEBUG'] -del windows_env['LINKFLAGS_DEBUG'] -del windows_env['CCFLAGS_OPTIMIZED'] - -windows_env['PDB'] = '${TARGET.base}.pdb' -windows_env['MSVC_BATCH'] = True - -# TODO(bradnelson): this should not need to be gated on host platform. -if root_env['PLATFORM'] in ['win32', 'cygwin']: - msvs_env = Environment(tools=['msvc', 'mslink'])['ENV'] - msvs_drive = msvs_env['PATH'][0] -else: - msvs_env = {'PATH': '', 'INCLUDE': '', 'LIB': ''} - msvs_drive = 'C' - -# Use the absolute path for MSVC because it might not be on the same drive -# as our source checkout. -visual_studio_path = msvs_drive + ':/Program Files/Microsoft Visual Studio 8' - -# If side-by-side platform sdk is not available try local copy. -platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_win2008_6_1/files' -if (root_env['PLATFORM'] in ['win32', 'cygwin'] and - not os.path.exists(windows_env.subst(platform_sdk_path))): - platform_sdk_path = ( - msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.1') - -windows_env.Replace( - CSCRIPT = 'c:\\Windows\\System32\\cscript', - - PLATFORMSDK_6_1 = platform_sdk_path, - VISUAL_STUDIO = visual_studio_path, - - CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), - CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin', - - PERL = '$CYGWIN_BIN_DIR/perl.exe', - - MSVS_ENV = msvs_env, - - YACC = '$CYGWIN_BIN_DIR/bison.exe', - - ARFLAGS = [ - '/nologo', - ], - - CCFLAGS = [ - '/nologo', - '/errorReport:prompt', - ], - - CPPDEFINES = [ - '_UNICODE', - 'UNICODE', - ], - - - LIBS = [ - 'advapi32.lib', - 'comdlg32.lib', - 'gdi32.lib', - 'kernel32.lib', - 'odbc32.lib', - 'odbccp32.lib', - 'ole32.lib', - 'oleaut32.lib', - 'shell32.lib', - 'user32.lib', - 'uuid.lib', - 'winspool.lib', - - 'DelayImp.lib', - ], - - LINKFLAGS = [ - '/nologo', - ], - - ICU_LIBS = ['icu'], -) - -# Force scons to handle long include lines correctly. -pchcom_fixed = windows_env['PCHCOM'] -pchcom_fixed = pchcom_fixed.replace('${TARGETS[0]}', '$TARGET') -pchcom_fixed = pchcom_fixed.replace('${TARGETS[1]}', '$TARGETS1') - -# Below, we'll redefine $CXXFLAGS so its expansion doesn't include -# $CCFLAGS. Modify $PCHCOM, which was relying on this fact, so -# that $CCFLAGS still shows up in precompiled header compilations. -pchcom_fixed = pchcom_fixed.replace('$CXXFLAGS', '$CXXFLAGS $CCFLAGS') - -windows_env.Replace( - CCCOM = "${TEMPFILE('%s')}" % windows_env['CCCOM'], - CXXCOM = "${TEMPFILE('%s')}" % windows_env['CXXCOM'], - SHCCCOM = "${TEMPFILE('%s')}" % windows_env['SHCCCOM'], - SHCXXCOM = "${TEMPFILE('%s')}" % windows_env['SHCXXCOM'], - PCHCOM = "${TEMPFILE('%s')}" % pchcom_fixed, - TARGETS1 = '${TARGETS[1]}', - - # The SCons default for $CXXFLAGS contains $CCFLAGS, which is - # also on the $CCCOM command line string separately. Redefine - # $CXXFLAGS to avoid the duplication - CXXFLAGS = '$( /TP $)', -) - -windows_env['ENV']['PROGRAMFILES'] = os.environ.get('PROGRAMFILES', '') -windows_env['ENV']['SystemDrive'] = os.environ.get('SystemDrive', '') -windows_env['ENV']['USERPROFILE'] = os.environ.get('USERPROFILE', '') - -windows_env.AppendENVPath('PATH', ';C:\\WINDOWS\\system32') - -windows_dbg = windows_env.Clone() -environment_list.append(windows_dbg) -windows_dbg.Replace( - BUILD_TYPE = 'dbg', - BUILD_TYPE_DESCRIPTION = 'Windows debug build', -) -windows_dbg.Tool('target_debug') -windows_dbg.ApplySConscript(['$CHROME_SRC_DIR/build/debug.scons']) -windows_dbg.Append(BUILD_GROUPS = ['default']) - -windows_opt = windows_env.Clone() -environment_list.append(windows_opt) -windows_opt.Replace( - BUILD_TYPE = 'opt', - BUILD_TYPE_DESCRIPTION = 'Windows optimized build', -) -windows_opt.Tool('target_optimized') -windows_opt.ApplySConscript(['$CHROME_SRC_DIR/build/release.scons']) - -# -------------------------------------------------------------------------- -# Platform-independent "msvs" mode for generating Visual Studio -# project and solution files from any platform. - -DeclareBit('msvs', 'Generate Visual Studio files') - -msvs_env = windows_env.Clone() - -msvs_env.Tool('target_platform_windows') -msvs_env.Tool('component_targets_msvs') # Per target project support. - -del msvs_env['BUILDERS']['MSVSProject'] -del msvs_env['BUILDERS']['MSVSSolution'] -msvs_env.Tool('MSVSNew') - -msvs_env.Tool('midl') - -environment_list.append(msvs_env) -msvs_env.Replace( - BUILD_TYPE = 'msvs', - BUILD_TYPE_DESCRIPTION = 'Generate Visual Studio files', - HOST_PLATFORMS = ['*'], - ICU_LIBS = [], -) -msvs_env.SetBits('windows', 'msvs') -# TODO(sgk): turn into separate debug + release env adding -# to a common .sln file -msvs_env.Tool('target_debug') - -# -------------------------------------------------------------------------- -# Linux specific - -linux_env = root_env.Clone() -linux_env.Tool('target_platform_linux') -linux_env.Tool('yacc') - -# By default scons will depend on the first path element for any command line. -# For example, it will resolve 'gcc' with $PATH and depend on that for any -# action which runs gcc. This disables this behaviour: -linux_env['IMPLICIT_COMMAND_DEPENDENCIES'] = False - -# TODO(bradnelson): this is needed for now because target_platform_linux has -# OS_LINUX defined in a weird way. -linux_env.FilterOut(CPPDEFINES = ['OS_LINUX=OS_LINUX']) - -# Copy some environment variables from the outer environment to the -# SCons.Environment if they exist. -for envvar in ('CC', 'CXX', 'LINK'): - if envvar in os.environ: - linux_env[envvar] = os.environ[envvar] - linux_env['ENV'][envvar] = os.environ[envvar] -# Copy these environment variables from the outer environment to the -# environment that the build commands run in. -# $HOME is needed by distcc so it can find its lock file. -for envvar in ('HOME', 'DISTCC_DIR', 'DISTCC_HOSTS', 'CCACHE_DIR', - 'INTERCEPTOR_SOCKET', 'ENFORGE_DIGEST_CACHE', - 'CHROME_BUILD_TYPE', 'CHROMIUM_BUILD', - 'ENFORGE_CACHE_HOST', 'ENFORGE_CACHE_PORT'): - if envvar in os.environ: - linux_env['ENV'][envvar] = os.environ[envvar] - -excluded_warnings = [ - # TODO: Clean up uses of ext/hash_map and remove this. - # (see unordered_map and base/hash_tables.h) - '-Wno-deprecated', # Needed for using ext/hash_map on GCC 4.3 -] -if not root_env.get('_GYP'): - linux_env.Append( - BUILD_SCONSCRIPTS = [ - '$LIBEVENT_DIR/libevent${_GYP}.scons', - ], - ) -linux_env.Append( - ASFLAGS = ['-32'], - CCFLAGS = ['-m32', '-pthread', '-march=pentium4', '-fno-exceptions', - # All floating-point computations on x87 happens in 80-bit precision. - # Because the C and C++ language standards allow the compiler to keep the - # floating-point values in higher precision than what's specified in the - # source and doing so is more efficient than constantly rounding up to - # 64-bit or 32-bit precision as specified in the source, the compiler, - # especially in the optimized mode, tries very hard to keep values in x87 - # floating-point stack (in 80-bit precision) as long as possible. This has - # important side effects, that the real value used in computation may - # change depending on how the compiler did the optimization - that is, the - # value kept in 80-bit is different than the value rounded down to 64-bit - # or 32-bit. There are possible compiler options to make this behavior - # consistent (e.g. -ffloat-store would keep all floating-values in the - # memory, thus force them to be rounded to its original precision) but they - # have significant runtime performance penalty. - # - # -mfpmath=sse -msse2 makes the compiler use SSE instructions which keep - # floating-point values in SSE registers in its native precision (32-bit - # for single precision, and 64-bit for double precision values). This means - # the floating-point value used during computation does not change - # depending on how the compiler optimized the code, since the value is - # always kept in its specified precision. - '-msse2', '-mfpmath=sse'], - # GCC will generate ident directives with the GCC version. Accumulate - # these all up and you end up with ~80K repeated in a .comment section. - CCFLAGS_OPTIMIZED = ['-fno-ident'], - CXXFLAGS = ['-Wall', '-Werror', '-march=i686'] + excluded_warnings, - LINKFLAGS = ['-m32', '-pthread'], -) - -linux_env.Replace( - # Linking of large files uses lots of RAM, so serialize links - # using the handy flock command from util-linux. - LINK = 'flock $TARGET_ROOT/linker.lock ' + linux_env['LINK'], - - # We have several cases where archives depend on each other in a cyclic - # fashion. (V8Bindings, libport and WebCore being the most significant - # example.) Since the GNU linker does only a single pass over the archives - # we need some extra trickery to deal with these unavoidable cycles. That - # trickery is --start-group and --end-group (aka -( and -) ). That causes ld - # to loop over the group until no more undefined symbols are found. In an - # ideal world we would only make groups from those libraries which we knew - # to be in cycles. However, that's tough with SCons, so we bodge it by - # making all the archives a group by redefining the linking command here. - SHLINKCOM = ('$SHLINK -o $TARGET $SHLINKFLAGS $SOURCES ' - '$_LIBDIRFLAGS ' - '-Wl,--start-group $_LIBFLAGS -Wl,--end-group'), - LINKCOM = ('$LINK -o $TARGET $LINKFLAGS $SOURCES ' - '$_LIBDIRFLAGS ' - '-Wl,--start-group $_LIBFLAGS -Wl,--end-group'), -) - -linux_env.Replace( - PERL = '/usr/bin/perl', - PERL_INCLUDE_FLAG = '-I ', - PERL_INCLUDE_SUFFIX = '', - _PERL_INCLUDE_FLAGS = ('${_concat(PERL_INCLUDE_FLAG, ' - 'PERL_INCLUDE_PATH, ' - 'PERL_INCLUDE_SUFFIX,' - '__env__, RDirs, TARGET, SOURCE)}'), -) - -linux_env.FilterOut( - BUILD_SCONSCRIPTS = [ - '$BSPATCH_DIR/bspatch.scons', - '$BSDIFF_DIR/bsdiff.scons', - '$GOOGLE_UPDATE_DIR/SConscript', - '$RLZ_DIR/SConscript', - '$SANDBOX_DIR/sandbox.scons', - ], -) - -linux_env.Append( - # We need rt for clock_gettime. - LIBS = ['rt'], - - ICU_LIBS = ['icu'], -) - -# Build an "official" build (DCHECKs completely compiled out, etc). -if ARGUMENTS.get('OFFICIAL') == '1': - linux_env.Append(CPPDEFINES=['OFFICIAL_BUILD']) - # Make sure units of code and data go in their own section, and then GC them - # in the linker to remove unreferenced data and code. Currently gold doesn't - # support --gc-sections, so you'll have to build with the original GNU ld. - linux_env.Append(CCFLAGS_OPTIMIZED=['-ffunction-sections', '-fdata-sections']) - linux_env.Append(LINKFLAGS_OPTIMIZED=['-Wl,--gc-sections']) - -# Build with support for gcov when COVERAGE=1. -if ARGUMENTS.get('COVERAGE') == '1': - linux_env.Append(CCFLAGS=['-fprofile-arcs', '-ftest-coverage']) - linux_env.Append(LINKFLAGS=['-fprofile-arcs']) - -# Build with support for gprof when PROFILE=1. -if ARGUMENTS.get('PROFILE') == '1': - linux_env.Append(CCFLAGS=['-pg', '-g']) - linux_env.Append(LINKFLAGS=['-pg']) - -# Build with symbols (useful for opt builds, for example) when SYMBOLS=1. -if ARGUMENTS.get('SYMBOLS') == '1': - linux_env.Append(CCFLAGS=['-g']) - -# Build shared libraries (useful for fast links) when SHARED=1. -if ARGUMENTS.get('SHARED') == '1': - print "WARNING: The shared link frequently breaks and is unlikely to work." - print "WARNING: You should only use this flag if you're willing to diagnose" - print "WARNING: and fix the inevitable link failures." - linux_env.Replace(COMPONENT_STATIC=False) - -# Build with system-provided NSS and GTK. -if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: - try: - linux_env.ParseConfig('pkg-config --cflags --libs nss') - linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') - linux_env.ParseConfig('pkg-config --cflags --libs pangoft2') - except OSError, e: - print ('\n' - 'Failed to find a package dependency. Please install all the\n' - 'packages listed at\n' - 'http://code.google.com/p/chromium/wiki/LinuxBuildInstructions' - '#Software_Requirements') - - sys.exit(1) - - # TODO: Factor the code here into aits own function. - if root_env.WantSystemLib('libxml'): - try: - linux_env.ParseConfig('pkg-config --cflags --libs libxml-2.0') - except OSError, e: - print ('\n' - 'libxml requested in SYSTEM_LIBS but not found\n') - sys.exit(1) - if root_env.WantSystemLib('libxslt'): - try: - linux_env.ParseConfig('pkg-config --cflags --libs libxslt') - except OSError, e: - print ('\n' - 'libxslt requested in SYSTEM_LIBS but not found\n') - sys.exit(1) - if root_env.WantSystemLib('sqlite'): - try: - linux_env.ParseConfig('pkg-config --cflags --libs sqlite') - except OSError, e: - print ('\n' - 'sqlite requested in SYSTEM_LIBS but not found\n') - sys.exit(1) - -linux_dbg = linux_env.Clone() -environment_list.append(linux_dbg) -linux_dbg.Replace( - BUILD_TYPE = 'dbg', - BUILD_TYPE_DESCRIPTION = 'Linux debug build', -) -linux_dbg.Tool('target_debug') -linux_dbg.ApplySConscript(['$CHROME_SRC_DIR/build/debug.scons']) -linux_dbg.Append(BUILD_GROUPS = ['default']) - -linux_opt = linux_env.Clone() -environment_list.append(linux_opt) -# Disable rpath for faster startup. -linux_opt.Append(RPATH = []) -linux_opt.Replace( - BUILD_TYPE = 'opt', - BUILD_TYPE_DESCRIPTION = 'Linux optimized build', -) -linux_opt.Tool('target_optimized') -linux_opt.ApplySConscript(['$CHROME_SRC_DIR/build/release.scons']) - -# -------------------------------------------------------------------------- -# Mac specific - -mac_env = root_env.Clone() -environment_list.append(mac_env) -mac_env.Tool('target_platform_mac') -mac_env.Tool('target_debug') -mac_env.ApplySConscript(['$CHROME_SRC_DIR/build/debug.scons']) -mac_env.Replace( - BUILD_TYPE = 'debug-mac', - BUILD_TYPE_DESCRIPTION = 'Mac debug build', -) -mac_env.Append(BUILD_GROUPS = ['default']) - -mac_env.Replace( - # Reproduce XCode's behavior of using gcc even to link C++, - # and distinguishing it the -x c++ option. - CC = 'gcc-4.2', - CXX = 'g++-4.2', - LINK = '$CXX', -) -mac_env.FilterOut(SHCCFLAGS = ['-fPIC']) -mac_env.FilterOut(SHLINKFLAGS = ['-fPIC']) - -mac_env.FilterOut( - BUILD_SCONSCRIPTS = [ - '$BREAKPAD_DIR/SConscript', - '$BSDIFF_DIR/bsdiff.scons', - '$BSPATCH_DIR/bspatch.scons', - '$CHROME_DIR/chrome_main${_GYP}.scons', - '$GOOGLE_UPDATE_DIR/SConscript', - '$LIBJPEG_DIR/libjpeg.scons', - '$LIBXML_DIR/libxml.scons', - '$LIBXSLT_DIR/libxslt.scons', - '$RLZ_DIR/SConscript', - '$SANDBOX_DIR/sandbox.scons', - '$WEBKIT_DIR/SConscript', - 'build/SConscript.v8', - ], -) -# TODO(bradnelson): this is needed for now because target_platform_mac has -# OS_MACOSX defined in a weird way. -mac_env.FilterOut(CPPDEFINES = ['OS_MACOSX=OS_MACOSX']) - -if not root_env.WantSystemLib('libevent') and not root_env.get('_GYP'): - mac_env.Append( - BUILD_SCONSCRIPTS = [ - '$LIBEVENT_DIR/libevent${_GYP}.scons', - ], - ) -mac_env.Append( - CFLAGS = [ - '-std=c99', - ], - CXXFLAGS = [ - '-fvisibility-inlines-hidden', - '${str(SOURCE).endswith(".mm") and "-fobjc-gc" or ""}', - ], - CCFLAGS = [ - '-fmessage-length=0', - '-pipe', - '-O0', - '-mdynamic-no-pic', - '-Werror', - '-Wnewline-eof', - '-fvisibility=hidden', - '-gdwarf-2', - '-Wall', - '-Wendif-labels', - '-fstack-protector', - '-fstack-protector-all', - ], - CPPDEFINES = [ - 'DEBUG', - ], - - FRAMEWORKPATH = [ - mac_env.Dir('${TARGET_ROOT}'), - '/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks', - ], - FRAMEWORKS = [ - 'AppKit', - 'ApplicationServices', - 'Foundation', - ], - - ICU_LIBS = ['icui18n', 'icuuc', 'icudata'], -) - - -# -------------------------------------------------------------------------- -# Platform-independent "xcode" mode for generating XCode files -# from any platform. - -DeclareBit('xcode', 'Generate XCode files') - -# TODO(sgk): remove this after we update Hammer modules. -DeclareBit('mac', 'Target platform is mac.') - -xcode_env = mac_env.Clone() -# TODO(sgk): uncomment when xcode generation becomes real. -#environment_list.append(xcode_env) -xcode_env.Replace( - BUILD_TYPE = 'xcode', - BUILD_TYPE_DESCRIPTION = 'Generate XCode files', - HOST_PLATFORMS = ['*'], - ICU_LIBS = [], -) -xcode_env.SetBits('mac', 'xcode') -# TODO(sgk): turn into separate debug + release env adding -# to a common .sln file -xcode_env.Tool('target_debug') - - -# ------------------------------------------------------------------------- - - -# Overlay things from a layer below. -for env in environment_list: - env.Dir('$OBJ_ROOT').addRepository(env.Dir('$CHROME_SRC_DIR')) - env.Dir('$OBJ_ROOT/googleurl').addRepository(env.Dir('$CHROME_SRC_DIR/build')) - - # We pre-resolve some common targets. We end up spending lots of time - # resolving these over and over again. - env.Replace( - CHROME_SRC_DIR = str(env.Dir('$CHROME_SRC_DIR')), - SRC_DIR = str(env.Dir('$SRC_DIR')), - DESTINATION_ROOT = str(env.Dir('$DESTINATION_ROOT')), - TARGET_ROOT = str(env.Dir('$TARGET_ROOT')), - OBJ_ROOT = str(env.Dir('$OBJ_ROOT')), - WEBKIT_DIR = str(env.Dir('$WEBKIT_DIR')), - ) - - -help_fmt = """ -Usage: hammer [SCONS_OPTIONS] [VARIABLES] [TARGET] ... - -Supported build variables: - LOAD=[module,...] Comma-separated list of components to load in the - dependency graph ('-' prefix excludes): -%s - SYSTEM_LIBS=[lib,...] Comma-separated list of system libraries to link - dynamically (by default they are built in from - included sources): -%s - PROGRESS=type Display a progress indicator: - name: print each evaluated target name - spinner: print a spinner every 5 targets - GYP=1 Any non-null value uses GYP-generated files - (*_gyp.scons). -""" - -if GetOption('help'): - import textwrap - tw = textwrap.TextWrapper( - width = 78, - initial_indent = ' '*32, - subsequent_indent = ' '*32, - ) - components = tw.fill(', '.join(components)) - all_system_libs = tw.fill(', '.join(env['all_system_libs'])) - - Help(help_fmt % (components, all_system_libs)) - -# ------------------------------------------------------------------------- - -# Invoke all the SConscripts in each of the environments that make sense on -# this host-platform. -BuildComponents(environment_list) - -# ------------------------------------------------------------------------- - -if not root_env.get('_GYP'): - modes = GetTargetModes().keys() - - if set(modes) - set(['msvs', 'xcode']): - # There's at least one mode being built besides the platform- - # independent 'msvs' or 'xcode' modes. Build the current - # build_component's Alias as default--that is, "base" when we're - # in the base/ subdirectory, "chrome" under chrome/, etc. - Import('build_component') - Default(Alias(build_component)) # Set default target based on where built. - - if 'msvs' in modes: - # We're in --mode=msvs, so add its Alias(es) to the default targets. - Default(Alias('msvs')) - -# ------------------------------------------------------------------------- - -# This must occur after BuildComponents so that the dependency graph -# will be populated. -vs_env = windows_env.Clone() -vs_env.Append(COMPONENT_VS_SOURCE_SUFFIXES = [ - '.def', - '.ini', - '.txt', - '.ui', - '.xml', -]) -# Source project -p = vs_env.ComponentVSDirProject( - 'chrome_src', - [ - # TODO(bradnelson): need to make sure we can use $CHROME_SRC_DIR here - '$CHROME_SRC_DIR/base', - '$CHROME_SRC_DIR/breakpad', - '$CHROME_SRC_DIR/build', -# '$CHROME_SRC_DIR/chrome', - '.', - '$CHROME_SRC_DIR/data', - '$CHROME_SRC_DIR/gears', - '$CHROME_SRC_DIR/google_update', - '$CHROME_SRC_DIR/googleurl', - '$CHROME_SRC_DIR/net', - '$CHROME_SRC_DIR/rlz', - '$CHROME_SRC_DIR/sandbox', - '$CHROME_SRC_DIR/sdhc', - '$CHROME_SRC_DIR/site_scons', - '$CHROME_SRC_DIR/skia', - '$CHROME_SRC_DIR/testing', - '$CHROME_SRC_DIR/third_party', - '$CHROME_SRC_DIR/tools', - '$CHROME_SRC_DIR/v8', - '$CHROME_SRC_DIR/webkit', - ], - COMPONENT_VS_SOURCE_FOLDERS = [ - (None, '$DESTINATION_ROOT'), - ('src', '$CHROME_SRC_DIR'), - ], - COMPONENT_VS_PROJECT_DIR = '$MAIN_DIR', -) - -# Always try to (re)build the project files when requested. -vs_env.AlwaysBuild(p) - -vs_env.ComponentVSSolution( - 'chrome_solution', - [ - 'all_libraries', - 'all_languages', - 'all_programs', - 'all_test_programs', - ], projects = [p], - COMPONENT_VS_PROJECT_SCRIPT_PATH=( - 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), -) - -# ------------------------------------------------------------------------- diff --git a/build/SConscript.v8 b/build/SConscript.v8 deleted file mode 100644 index 7660b44..0000000 --- a/build/SConscript.v8 +++ /dev/null @@ -1,120 +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. - -import os - -Import('env') - -if not env.Dir('$CHROME_SRC_DIR/v8').exists(): - Return() - -# The v8 build script wants a 'debug'/'release' string to tell it whether -# to build optimized. Convert our build flags into that form. -mode = 'release' -if env['TARGET_DEBUG']: - mode = 'debug' - -# Don't build V8 as a shared object because the v8 scons file doesn't support -# it. -env.Replace(COMPONENT_STATIC=True) - -env = env.Clone( - V8_MODE = mode, - V8_MODE_DIR = '$V8_DIR/obj/$V8_MODE', - V8_SCONS_COM = '$PYTHON $SCONS $SCONSFLAGS mode=$V8_MODE', - SCONS = '$CHROME_SRC_DIR/third_party/scons/scons.py', - SCONSFLAGS = ('-Q ' - '-C $OBJ_ROOT/v8 ' - '-Y $CHROME_SRC_DIR/v8 ' - '--warn=no-deprecated ' - '--warn=no-no-parallel-support'), -) - -# Rather than build v8 with our own commands, we just shell out to v8's -# own SCons-based build, since their build system is complicated. -# This SConscript just declares dependencies on the outputs of that build. -# -# Arrange to make sure the build directory exists, since the subsidiary -# SCons we invoke will chdir there of its own accord. - -if not os.path.exists(env.Dir('$OBJ_ROOT/v8').abspath): - Mkdir(env.Dir('$OBJ_ROOT/v8').abspath) - - -# v8 builds all outputs "foo" instead as "foo_g" in debug mode. -binsuffix = '' -if env['TARGET_DEBUG']: - binsuffix = '_g' - -v8_scons_targets_off = [ - '$V8_DIR/shell%s${PROGSUFFIX}' % binsuffix, - '$V8_DIR/${LIBPREFIX}v8%s${LIBSUFFIX}' % binsuffix, - '$V8_MODE_DIR/mksnapshot${PROGSUFFIX}', - '$V8_MODE_DIR/libraries${OBJSUFFIX}', - '$V8_MODE_DIR/snapshot-empty${OBJSUFFIX}', -] - -v8_scons_targets_on = [ - '$V8_MODE_DIR/libraries-empty${OBJSUFFIX}', - '$V8_MODE_DIR/snapshot${OBJSUFFIX}', -] - -if env.Bit('windows'): - v8_scons_targets_off.extend([ - env.File('$V8_DIR/vc80.pdb') - ]) - -v8 = env.Command(v8_scons_targets_off + v8_scons_targets_on, - [], - ['$V8_SCONS_COM snapshot=off sample=shell', - '$V8_SCONS_COM snapshot=on ${TARGETS[-%d:].abspath}' - % len(v8_scons_targets_on)]) -env.AlwaysBuild(v8) - -# Tell our SCons invocation to *not* delete v8.lib and the other targets -# before building them, so the subsidiary v8 SCons call doesn't always -# rebuild them (thereby causing us to always rebuild their dependents). -env.Precious(v8) - - -env.Install('$TARGET_ROOT', v8[0]) -env.Install('$LIB_DIR', v8[1]) -env.Install('$V8_DIR', '$V8_MODE_DIR/snapshot-empty${OBJSUFFIX}') - -# To satisfy tests expecting the following .exe name. -if env.Bit('windows'): - # TODO(evanm): this may be necessary on other platforms(?) - i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8[0]) - -env.ChromeLibrary('v8_snapshot', - ['$V8_MODE_DIR/libraries-empty${OBJSUFFIX}', - '$V8_MODE_DIR/snapshot${OBJSUFFIX}']) - -env.ChromeMSVSProject('$V8_DIR/tools/visual_studio/v8.vcproj', - dependencies = [ - '$V8_DIR/tools/visual_studio/v8_base.vcproj', - ], - guid='{21E22961-22BF-4493-BD3A-868F93DA5179}') - -env.ChromeMSVSProject('$V8_DIR/tools/visual_studio/v8_base.vcproj', - guid='{EC8B7909-62AF-470D-A75D-E1D89C837142}') - -env.ChromeMSVSProject('$V8_DIR/tools/visual_studio/v8_mksnapshot.vcproj', - dependencies = [ - '$V8_DIR/tools/visual_studio/v8.vcproj', - ], - guid='{865575D0-37E2-405E-8CBA-5F6C485B5A26}') - -env.ChromeMSVSProject('$V8_DIR/tools/visual_studio/v8_shell_sample.vcproj', - dependencies = [ - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - ], - guid='{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}') - -env.ChromeMSVSProject('$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - dependencies = [ - '$V8_DIR/tools/visual_studio/v8_mksnapshot.vcproj', - '$V8_DIR/tools/visual_studio/v8_base.vcproj', - ], - guid='{C0334F9A-1168-4101-9DD8-C30FB252D435}') diff --git a/build/common.scons b/build/common.scons deleted file mode 100644 index 48c1f0e..0000000 --- a/build/common.scons +++ /dev/null @@ -1,16 +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__ = """ -Common (no-op) settings for Chromium builds. -""" - -# This is where you can set values to affect *everything* in the build. - -Import("env") - -env.Append( - #CCFLAGS = [], - #LIBFLAGS = [], -) diff --git a/build/debug.scons b/build/debug.scons deleted file mode 100644 index 3b0011a..0000000 --- a/build/debug.scons +++ /dev/null @@ -1,40 +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__ = """ -Debug settings for Chromium builds. - -Incorporates "essential" and "chromium_build" settings. -""" - -Import("env") - -env.ApplySConscript([ - 'internal/essential.scons', - 'internal/chromium_build${CHROMIUM_BUILD}.scons', -]) - -env.Append( - CPPDEFINES = [ - '_DEBUG', - ], -) - -if env.Bit('windows'): - if env.get('INCREMENTAL') is None: - # INCREMENTAL was not specified on the command line or in the - # external environment; debug default is incremental link. - env['INCREMENTAL'] = True - env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL' - - env.Append( - CCFLAGS = [ - '/Od', # VCCLCompilerTool.Optimization="0" - '/RTC1', # VCCLCompilerTool.BasicRuntimeChecks="3" - '/MTd', # VCCLCompilerTool.RuntimeLibrary="1" - ], - LINKFLAGS = [ - '/DEBUG', - ], - ) diff --git a/build/external_code.scons b/build/external_code.scons deleted file mode 100644 index 04ee866..0000000 --- a/build/external_code.scons +++ /dev/null @@ -1,28 +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__ = """ -External code settings for Chromium builds. -""" - -Import("env") - -if env.Bit('windows'): - env.Append( - CPPDEFINES = [ - '_CRT_SECURE_NO_DEPRECATE', - '_CRT_NONSTDC_NO_WARNINGS', - '_CRT_NONSTDC_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', - ], - CCFLAGS = [ - '/wd4800', - ], - ) - env.FilterOut( - CCFLAGS = [ - '/WX', # VCCLCompilerTool.WarnAsError="false" - '/Wp64', # VCCLCompilerTool.Detect64BitPortabilityProblems="false" - ], - ) diff --git a/build/googleurl.scons b/build/googleurl.scons deleted file mode 100644 index 6151fde..0000000 --- a/build/googleurl.scons +++ /dev/null @@ -1,16 +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 googleurl components. -""" - -Import('env') - -sconscript_files = [ - 'googleurl_lib.scons', - 'googleurl_unittests.scons', -] - -SConscript(sconscript_files, exports=['env']) diff --git a/build/googleurl_lib.scons b/build/googleurl_lib.scons deleted file mode 100644 index 9e4f325..0000000 --- a/build/googleurl_lib.scons +++ /dev/null @@ -1,52 +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 googleurl.lib / libgoogleurl.a. -""" - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$ICU38_DIR/using_icu38.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - ], - ) - -input_files = [ - 'src/gurl.cc', - 'src/url_canon_etc.cc', - 'src/url_canon_fileurl.cc', - 'src/url_canon_host.cc', - 'src/url_canon_icu.cc', - 'src/url_canon_internal.cc', - 'src/url_canon_ip.cc', - 'src/url_canon_mailtourl.cc', - 'src/url_canon_path.cc', - 'src/url_canon_pathurl.cc', - 'src/url_canon_query.cc', - 'src/url_canon_relative.cc', - 'src/url_canon_stdurl.cc', - 'src/url_parse.cc', - 'src/url_parse_file.cc', - 'src/url_util.cc', -] - -env.ChromeLibrary('googleurl', input_files) - -env.ChromeMSVSProject('$GOOGLEURL_DIR/build/googleurl.vcproj', - guid='{EF5E94AB-B646-4E5B-A058-52EF07B8351C}') diff --git a/build/googleurl_unittests.scons b/build/googleurl_unittests.scons deleted file mode 100644 index 7cdb6f3..0000000 --- a/build/googleurl_unittests.scons +++ /dev/null @@ -1,45 +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 googleurl_unittests{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$BASE_DIR/using_base.scons', - '$ICU38_DIR/using_icu38.scons', - '$GTEST_DIR/../using_gtest.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - ], - ) - -input_files = [ - 'src/gurl_unittest.cc', - 'src/url_canon_unittest.cc', - 'src/url_parse_unittest.cc', - 'src/url_util_unittest.cc', - '$OBJ_ROOT/base/run_all_unittests$OBJSUFFIX', -] - -gurl_unittests = env.ChromeTestProgram('googleurl_unittests', input_files) - -installed_gurl_unittests = env.Install('$TARGET_ROOT', gurl_unittests) - -env.Alias('googleurl', installed_gurl_unittests) diff --git a/build/internal/chromium_build.scons b/build/internal/chromium_build.scons deleted file mode 100644 index 397c365..0000000 --- a/build/internal/chromium_build.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__ = """ -Chromium build settings. -""" - -Import("env") - -env.Append( - CPPDEFINES = [ - 'CHROMIUM_BUILD', - ], -) diff --git a/build/internal/chromium_build_google_chrome.scons b/build/internal/chromium_build_google_chrome.scons deleted file mode 100644 index 01dca62..0000000 --- a/build/internal/chromium_build_google_chrome.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__ = """ -Release settings for Google Chrome. -""" - -Import("env") - -env.Append( - CPPDEFINES = [ - 'GOOGLE_CHROME_BUILD', - ], -) diff --git a/build/internal/essential.scons b/build/internal/essential.scons deleted file mode 100644 index 389ae35..0000000 --- a/build/internal/essential.scons +++ /dev/null @@ -1,114 +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__ = """ -Essential settings for Chromium builds. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CCFLAGS = [ - '$CHROMIUM_CC_OPT_FLAGS', - ], - LINKFLAGS = [ - '$CHROMIUM_LINK_OPT_FLAGS', - '$CHROMIUM_INCREMENTAL_FLAGS', - ], -) - -if env.Bit('windows'): - incremental = env.get('INCREMENTAL') - if incremental is not None: - if incremental: - env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL' - else: - env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL:NO' - env.Append( - ARFLAGS = [ - '/ignore:4221', - ], - CPPDEFINES = [ - ('_WIN32_WINNT', '0x0600'), - ('WINVER', '0x0600'), - 'WIN32', - '_WINDOWS', - ('_HAS_EXCEPTIONS', 0), - 'NOMINMAX', - '_CRT_RAND_S', - 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', - 'WIN32_LEAN_AND_MEAN', - '_SECURE_ATL', - ('_HAS_TR1', 0), - ], - CPPPATH = [ - '$PLATFORMSDK_6_1/Include', - '$VISUAL_STUDIO/VC/atlmfc/include', - ], - CCFLAGS = [ - '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false" - '/Gs', # VCCLCompilerTool.BufferSecurityCheck="true" - '/Gy', # VCCLCompilerTool.EnableFunctionLevelLinking="true" - '/W3', # VCCLCompilerTool.WarningLevel="3" - - # TODO(sgk): re-enable this - #'/WX', # WarnAsError="true" - - # In the old Visual Studio build, we used /Zi (edit and continue), - # VCCLComilerTool.DebugInformationFormat="3". - # - # /Zi ends up with multiple compiler invocations trying to updat - # the same vc80.pdb file at the same time, with race conditions - # and permission problems. We're using /Z7 because it makes things - # work even in parallel builds, without special config to avoid - # multiple simultaneous updates the vc80.pdb file. All the - # debugging information and capability still end up in the - # executables. - '/Z7', # VCCLCompilerTool.DebugInformationFormat="1" - - # VCCLCompilerTool.DisableSpecificWarnings="4503; 4819" - '/wd4503', - '/wd4819', - ], - LIBPATH = [ - '$PLATFORMSDK_6_1/Lib', - '$VISUAL_STUDIO/VC/atlmfc/lib', - ], - LIBS = [ - 'msimg32', - 'psapi', - 'usp10.lib', - 'version', - 'wininet', - 'ws2_32', - ], - LINKFLAGS = [ - '/DEBUG', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/ignore:4221', - '/nxcompat', - ], - ) - env.FilterOut( - CCFLAGS = [ - '/GM', # VCCLCompilerTool.MinimalRebuild="false" - '/EH', # VCCLCompilerTool.ExceptionHandling="0" - ], - ) -elif env.Bit('linux'): - pass -elif env.Bit('mac'): - pass diff --git a/build/internal/release_defaults.scons b/build/internal/release_defaults.scons deleted file mode 100644 index 5d36cf1..0000000 --- a/build/internal/release_defaults.scons +++ /dev/null @@ -1,47 +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__ = """ -Default settings for all Chromium release builds. - -Incorporates "essential" settings. -""" - -Import("env") - -env.ApplySConscript([ - 'essential.scons', -]) - -env.Append( - CPPDEFINES = [ - 'NDEBUG', - ], -) - -if env.Bit('windows'): - if env.get('INCREMENTAL') is None: - # INCREMENTAL was not specified on the command line or in the - # external environment; release default is full link. - env['INCREMENTAL'] = False - env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL:NO' - - env.Replace( - CHROMIUM_CC_OPT_FLAGS = [ - '/O2', # VCCLCompilerTool.Optimization="2" - ], - CHROMIUM_LINK_OPT_FLAGS = [ - '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" - '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" - '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" - ], - ), - env.Append( - CCFLAGS = [ - '/GF', # VCCLCompilerTool.StringPooling="true" - ], - LINKFLAGS = [ - '/INCREMENTAL:NO', # VCLinkerTool.LinkIncremental="1" - ], - ) diff --git a/build/internal/release_impl.scons b/build/internal/release_impl.scons deleted file mode 100644 index 23d0543..0000000 --- a/build/internal/release_impl.scons +++ /dev/null @@ -1,18 +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__ = """ -Release settings for Chromium builds. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/Oy-', - ], - ) diff --git a/build/internal/release_impl_checksenabled.scons b/build/internal/release_impl_checksenabled.scons deleted file mode 100644 index c0b4993..0000000 --- a/build/internal/release_impl_checksenabled.scons +++ /dev/null @@ -1,37 +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__ = """ -Release settings for Chromium builds with checks enabled. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -env.Append( - CPPDEFINES = [ - '_DEBUG', ' - ('_HAS_ITERATOR_DEBUGGING', '0'), - ('_SECURE_SCL', '0'), - ], -) - -if env.Bit('windows'): - env.Replace( - CHROMIUM_LINK_OPT_FLAGS = [ - '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" - '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" - '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" - ], - ), - env.Append( - CCFLAGS = [ - '/Oy-', - '/MTd', # VCCLCompilerTool.RuntimeLibrary="1" - ], - LINKFLAGS = [ - '/INCREMENTAL:NO', # VCLinkerTool.LinkIncremental="1" - ], - ) diff --git a/build/internal/release_impl_coverage.scons b/build/internal/release_impl_coverage.scons deleted file mode 100644 index ec8c547..0000000 --- a/build/internal/release_impl_coverage.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__ = """ -Release settings for Chromium builds with code coverage -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -env.Append( - LINKFLAGS = [ - '/PROFILE', # VCLinkerTool.Profile="1" - ], -) diff --git a/build/internal/release_impl_dom_stats.scons b/build/internal/release_impl_dom_stats.scons deleted file mode 100644 index 9dae238..0000000 --- a/build/internal/release_impl_dom_stats.scons +++ /dev/null @@ -1,35 +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__ = """ -Release settings for Chromium builds with DOM statistics. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -env.Append( - CPPDEFINES = [ - 'NDEBUG', - 'ENABLE_DOM_STATS_COUNTERS', - ], -) - -if env.Bit('windows'): - env.Replace( - CHROMIUM_LINK_OPT_FLAGS = [ - '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" - '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" - '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" - ], - ), - env.Append( - CCFLAGS = [ - '/Oy-', - ], - LINKFLAGS = [ - '/INCREMENTAL:NO', # VCLinkerTool.LinkIncremental="1" - ], - ) diff --git a/build/internal/release_impl_official.scons b/build/internal/release_impl_official.scons deleted file mode 100644 index 94e9670..0000000 --- a/build/internal/release_impl_official.scons +++ /dev/null @@ -1,37 +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__ = """ -Release settings for official Chromium builds. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -if env.Bit('windows'): - env.Replace( - CHROMIUM_CC_OPT_FLAGS = [ - '/Ox', # VCCLCompilerTool.Optimization="3" - ], - ), - env.Append( - ARFLAGS = [ - '/ltcg', - ], - CCFLAGS = [ - '/Ob2', # VCCLCompilerTool.InlineFunctionExpansion="2" - '/Oi', # VCCLCompilerTool.EnableIntrinsicFunctions="true" - '/Os', # VCCLCompilerTool.FavorSizeOrSpeed="2" - '/Ox', # VCCLCompilerTool.OmitFramePointers="true" - '/GT', # VCCLCompilerTool.EnableFiberSafeOptimizations="true" - '/GL', # VCCLCompilerTool.WholeProgramOptimization="true" - ], - CPPDEFINES = [ - 'OFFICIAL_BUILD', - ], - LINKFLAGS = [ - '/LTCG', # VCLinkerTool.LinkTimeCodeGeneration="1" - ], - ) diff --git a/build/internal/release_impl_purify.scons b/build/internal/release_impl_purify.scons deleted file mode 100644 index 912f555..0000000 --- a/build/internal/release_impl_purify.scons +++ /dev/null @@ -1,33 +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__ = """ -Release settings for Chromium builds with Purify. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -env.Append( - CPPDEFINES = [ - 'PURIFY', - ], -) - -if env.Bit('windows'): - env.Replace( - CHROMIUM_CC_OPT_FLAGS = [ - '/Od', # VCCLCompilerTool.Optimization="0" - ], - CHROMIUM_LINK_OPT_FLAGS = [ - '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" - ], - ), - env.Append( - CCFLAGS = [ - '/MT', # VCCLCompilerTool.RuntimeLibrary="0" - '/GS-', # VCCLCompilerTool.BufferSecurityCheck="false" - ], - ) diff --git a/build/release.scons b/build/release.scons deleted file mode 100644 index 2d7144e..0000000 --- a/build/release.scons +++ /dev/null @@ -1,18 +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__ = """ -Release settings for Chromium builds. - -Incorporates "release_impl" and "chromium_build" settings, -possibly specific versions selected by the $CHROME_BUILD_TYPE -and $CHROMIUM_BUILD variables. -""" - -Import("env") - -env.ApplySConscript([ - 'internal/release_impl${CHROME_BUILD_TYPE}.scons', - 'internal/chromium_build${CHROMIUM_BUILD}.scons', -]) diff --git a/build/using_googleurl.scons b/build/using_googleurl.scons deleted file mode 100644 index 3c2c3c6..0000000 --- a/build/using_googleurl.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 googleurl library. -""" - -Import("env") - -env.Append( - LIBS = [ - 'googleurl', - ], -) diff --git a/build/using_v8.scons b/build/using_v8.scons deleted file mode 100644 index 889bce1..0000000 --- a/build/using_v8.scons +++ /dev/null @@ -1,20 +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 v8 library. -""" - -Import("env") - -# v8 builds the lib as v8_g in debug mode. -v8_lib = 'v8' -if env['TARGET_DEBUG']: - v8_lib = 'v8_g' - -env.Append( - LIBS = [ - v8_lib, - ], -) diff --git a/chrome/SConscript b/chrome/SConscript deleted file mode 100644 index 1e7c797..0000000 --- a/chrome/SConscript +++ /dev/null @@ -1,645 +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. - -import os - -Import(['env']) - -env_res = env.Clone() -env_test = env.Clone() -env = env.Clone() - -install_targets = [] - -env.Prepend( - CPPPATH = [ - 'app', - '$CHROME_DIR/third_party/wtl/include', - ], -) - - -# TODO(port) -if env_res.Bit('windows'): - env_res.Append( - CPPPATH = [ - '.', - '$CHROME_SRC_DIR', - # For app/chrome_dll.res to #include installer_util_strings.rc. - '$CHROME_DIR/installer/util', - ], - RCFLAGS = [ - ['/l', '0x409'], - ], - ) - - browser_res = env_res.RES( - '$TARGET_ROOT/grit_derived_sources/browser_resources.rc') - chrome_exe_res = env_res.RES('app/chrome_exe.rc'), - chrome_dll_res = env_res.RES('app/chrome_dll.rc') - env_res.Depends(chrome_dll_res, 'installer/util/installer_util_strings.rc') - common_res = env_res.RES( - '$TARGET_ROOT/grit_derived_sources/common_resources.rc') - debugger_res = env_res.RES( - '$TARGET_ROOT/grit_derived_sources/debugger_resources.rc') - renderer_res = env_res.RES( - '$TARGET_ROOT/grit_derived_sources/renderer_resources.rc') - test_data_res = env_res.RES('test/data/resource.rc') - - net_res = '$TARGET_ROOT/grit_derived_sources/net_resources.res' - webkit_res = '$TARGET_ROOT/grit_derived_sources/webkit_resources.res' - - dll_resources = [ - browser_res, - chrome_dll_res, - common_res, - debugger_res, - net_res, - renderer_res, - webkit_res, - ] - -############################################################################## -# TODO(sgk): move to separate .scons file for chrome.dll #################### - -env_dll = env.Clone() - -env_dll.ApplySConscript([ - '$CHROME_SRC_DIR/build/using_v8.scons', - '$ICU38_DIR/using_icu38.scons', -]) - -env_dll.Prepend( - CPPPATH = [ - "..", - ], - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - 'PNG_USER_CONFIG', - 'CHROME_PNG_WRITE_SUPPORT', - 'LIBXSLT_STATIC', - 'LIBXML_STATIC', - ], -) - -env_dll.Append( - CPPPATH = [ - '$CHROME_DIR/app', - '$LIBPNG_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$LIBXSL_DIR', - '$LIBXML_DIR/DerivedSources/include', - '$LIBXML_DIR/include', - '$BREAKPAD_DIR/src', - ], - LIBS = [ - 'base', - 'base_gfx', - #'breakpad_handler', - 'googleurl', - 'media', - 'printing', - 'net', - 'skia', - 'bzip2', - 'libjpeg', - 'libpng', - 'libxml', - 'libxslt', - 'modp_b64', - 'zlib', - - 'WTF', - 'V8Bindings', - 'WebCore', - 'WebKit', - 'default_plugin', - 'glue', - 'JavaScriptCore_pcre', - 'port', - - 'browser', - 'common', - 'debugger', - 'util', - 'renderer', - 'hunspell', - 'sdch', - 'sqlite', - 'v8_snapshot', - 'views', - - 'X11', - 'Xrender', - 'Xext', - ], -) - -if env.Bit('windows'): - # These libraries don't work on non-Windows yet. - env_dll.Append( - LIBS = [ - 'plugin', - 'worker', - ] - ) - -if env_dll.Bit('windows'): - env_dll.Append( - CCFLAGS = [ - '/TP', - '/Wp64', - ], - CPPDEFINES = [ - '_WINDLL', - 'CHROME_DLL', - 'BROWSER_DLL', - 'RENDERER_DLL', - 'PLUGIN_DLL', - ], - LIBS = [ - 'activex_shim', - 'browser_views', - - #'comctl32.lib', - #'dwmapi.lib', - #'rpcrt4.lib', - #'shlwapi.lib', - #'winmm.lib', - #'wsock32.lib', - - 'Urlmon', - ], - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"comdlg32.dll"', - '/DELAYLOAD:"crypt32.dll"', - '/DELAYLOAD:"cryptui.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"imagehlp.dll"', - '/DELAYLOAD:"imm32.dll"', - '/DELAYLOAD:"oleacc.dll"', - '/DELAYLOAD:"oleaut32.dll"', - '/DELAYLOAD:"psapi.dll"', - '/DELAYLOAD:"urlmon.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/DELAYLOAD:"winhttp.dll"', - '/DELAYLOAD:"wininet.dll"', - '/DELAYLOAD:"winspool.drv"', - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"wsock32.dll"', - - '/SUBSYSTEM:WINDOWS', - '/BASE:"0x01000000"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/ignore:4221', - '/nxcompat', - - '/PDB:${TARGETS[1]}', - ], - ) - -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('resources', [ - '$WEBKIT_DIR/glue/resources/aliasb.cur', - Derived(env_dll.File('$TARGET_ROOT/' - + 'grit_derived_sources/browser_resources.rc')), - '$WEBKIT_DIR/glue/resources/cell.cur', - 'app/check_dependents.bat', - 'app/chrome.dll.deps', - 'app/chrome_dll.rc', - 'app/chrome_dll_resource.h', - 'app/chrome_dll_version.rc.version', - '$WEBKIT_DIR/glue/resources/col_resize.cur', - 'common/common_resources.rc', - '$WEBKIT_DIR/glue/resources/copy.cur', - 'browser/debugger/resources/debugger_resources.rc', - Derived(env_dll.File('$TARGET_ROOT/grit_derived_sources/net_resources.rc')), - 'renderer/renderer_resources.rc', - '$WEBKIT_DIR/glue/resources/row_resize.cur', - '$WEBKIT_DIR/glue/resources/vertical_text.cur', - Derived(env_dll.File('$TARGET_ROOT/' - + 'grit_derived_sources/webkit_resources.rc')), - '$WEBKIT_DIR/glue/resources/zoom_in.cur', - '$WEBKIT_DIR/glue/resources/zoom_out.cur', - ]), - 'app/chrome_dll_main.cc', -]) - -if env_dll.Bit('windows'): - additional = [ - '$V8_DIR/snapshot-empty$OBJSUFFIX' - ] - dll_targets = env_dll.ChromeSharedLibrary('app/chrome_dll/chrome', - #dll_resources + input_files, - input_files + additional, - PDB='chrome_dll.pdb') - install_targets.extend(dll_targets) - - chrome_exe_version_rc = env.ChromeVersionRC( - 'chrome_exe_version.rc', - 'app/chrome_exe_version.rc.version' - ) - - chrome_dll_version_rc = env.ChromeVersionRC( - 'chrome_dll_version.rc', - 'app/chrome_dll_version.rc.version', - ) - - # TODO(sgk): explicit dependencies => scanned implicit dependencies - Depends(chrome_exe_res, chrome_exe_version_rc) - Depends(chrome_dll_res, chrome_dll_version_rc) - - chrome_exe_version_res = env_res.RES(chrome_exe_version_rc) - chrome_dll_version_res = env_res.RES(chrome_dll_version_rc) - - install_targets.extend(chrome_exe_version_rc) - install_targets.extend(chrome_exe_version_res) - - install_targets.extend(chrome_dll_version_rc) - install_targets.extend(chrome_dll_version_res) - -if env_dll.Bit('linux'): - input_files = [ - 'app/chrome_dll_main.cc', - 'app/chrome_exe_main_gtk.cc', - ] - - env_dll.Append( - LIBS = [ - 'event', - ] - ) - chrome = env_dll.ChromeProgram('app/chrome', input_files) - - -p = env.ChromeMSVSProject('app/chrome_dll.vcproj', - dest='$CHROME_SRC_DIR/chrome/app/chrome_dll.vcproj', - guid='{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$CHROME_DIR/plugin/plugin.vcproj', - '$CHROME_DIR/worker/worker.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj', - ('$WEBKIT_DIR/build/JavaScriptCore/' + - 'JavaScriptCore_pcre.vcproj'), - '$WEBKIT_DIR/build/port/port.vcproj', - '$CHROME_DIR/browser/debugger/debugger.vcproj', - '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - '$CHROME_DIR/views/views.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$CHROME_DIR/renderer/renderer.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - ('$CHROME_DIR/browser/' - + 'resources/browser_resources.vcproj'), - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$SKIA_DIR/skia.vcproj', - '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', - '$GEARS_DIR/gears.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - relative_path_substitutions = [ - ('../../..', '$(OutDir)'), - ], - ConfigurationType='2') - -p.AddToolFile('tools/build/win/version.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './chrome_dll.vsprops', - '../installer/util/using_util.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Version', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - OutputFile='$(IntDir)/chrome.dll', - ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)/app/' - + 'chrome.dll.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - MSVSTool('VCPostBuildEventTool', - CommandLine=('call ' - + '$(SolutionDir)/tools/build/' - + 'win/hardlink_failsafe.bat ' - + '"$(TargetPath)" ' - + '"$(OutDir)/$(TargetFileName)"')), - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './chrome_dll.vsprops', - '../installer/util/using_util.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Version', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - OutputFile='$(OutDir)/chrome.dll', - ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)/app/' - + 'chrome.dll.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - MSVSTool('VCPostBuildEventTool', - CommandLine=('check_dependents.bat ' - + '$(TargetPath) chrome.dll.deps')), - ]) - - -############################################################################## -# TODO(sgk): move to separate .scons file for chrome.exe #################### - -env_exe = env.Clone() - -env_exe.Prepend( - CPPPATH = [ - '..', - '$BREAKPAD_DIR/src', - ], - LIBS = [ - 'base', - 'breakpad_handler', - 'chrome', - 'common', - 'icu', - 'sandbox', - 'util', - ], -) - -env_exe.Append( - LINKFLAGS = [ - '/INCREMENTAL', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/SUBSYSTEM:WINDOWS', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/PDB:${TARGETS[1]}', - #'/IMPLIB:${TARGETS[2]}', - ], -) - -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('resources', [ - 'app/check_dependents.bat', - 'app/chrome.exe.deps', - 'app/chrome_exe.rc', - 'app/chrome_exe_resource.h', - 'app/chrome_exe_version.rc.version', - ]), - 'app/breakpad.cc', - 'app/breakpad.h', - 'app/chrome_exe_main.cc', - 'common/chrome_switches$OBJSUFFIX', - 'app/client_util.cc', - 'app/client_util.h', - 'common/env_vars$OBJSUFFIX', - 'common/env_vars.h', - 'app/google_update_client.cc', - 'app/google_update_client.h', - 'common/result_codes.h', -]) - -# We only use a separate exe/dll on Windows. -if env.Bit('windows'): - chrome_exe = env_exe.ChromeProgram('chrome_exe/chrome', input_files) - - install_targets.append(chrome_exe[0]) - - env.Requires('$DESTINATION_ROOT/chrome.exe', - ['$DESTINATION_ROOT/chrome.dll', - '$DESTINATION_ROOT/icudt38.dll', - '$DESTINATION_ROOT/rlz.dll', - '$DESTINATION_ROOT/First Run', - '$DESTINATION_ROOT/themes', - Alias('chrome_locales'), - ]) - - env.Install('$DESTINATION_ROOT', '$CHROME_DIR/app/FirstRun') - - # For release we want to run dependencies.py, may look something like: - #env.AddPostAction('$TARGET_ROOT/chrome.exe', - # ('$PYTHON tools/build/win/dependencies.py ' + - # '$(TargetPath) chrome.exe.deps')) - -p = env.ChromeMSVSProject('app/chrome_exe.vcproj', - dest='$CHROME_SRC_DIR/chrome/app/chrome_exe.vcproj', - guid='{7B219FAA-E360-43C8-B341-804A94EEFFAC}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - ('$CHROME_DIR/tools/' - + 'crash_service/crash_service.vcproj'), - '$BREAKPAD_DIR/breakpad_handler.vcproj', - '$CHROME_DIR/app/chrome_dll.vcproj', - '$CHROME_DIR/app/locales/en-US.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - '$CHROME_DIR/app/theme/theme_dll.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - ConfigurationType='1') - -p.AddToolFile('tools/build/win/version.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './chrome_exe.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Version', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - BasicRuntimeChecks='0', - BufferSecurityCheck='false'), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)/app/' - + 'chrome.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - MSVSTool('VCPostBuildEventTool', - CommandLine=('copy ' - + '$(ProjectDir)/FirstRun ' - + '$(OutDir)/"First Run"'), - Description='Copy first run complete sentinel file'), - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './chrome_exe.vsprops', - '$(SolutionDir)../build/release.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Version', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)/app/' - + 'chrome.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - MSVSTool('VCPostBuildEventTool', - # TODO(sgk): figure out how to get \r\n through - # Python's XML generation? - #CommandLine=('copy ' - # + '$(ProjectDir)/FirstRun ' - # + '$(OutDir)/"First Run"\r\n' - # + 'check_dependents.bat ' - # + '$(TargetPath) ' - # + 'chrome.exe.deps\r\n'), - CommandLine=('copy ' - + '$(ProjectDir)/FirstRun ' - + '$(OutDir)/"First Run" ' - + '&& ' - + 'check_dependents.bat ' - + '$(TargetPath) ' - + 'chrome.exe.deps'), - Description='Copy first run complete sentinel file'), - ]) - - -############################################################################## -# TODO(sgk): Port these to browser_views.scons and views.scons. - -sconscript_files = [ - 'browser/views/SConscript', - 'views/SConscript', -] - -if not env.WantSystemLib('hunspell'): - sconscript_files.append('third_party/hunspell/SConscript') - -env.SConscript(sconscript_files, exports=['env', 'env_res', 'env_test']) - -# TODO(port) -if env.Bit('windows'): - env.InstallAs('$LIBS_DIR/${LIBPREFIX}jscre${LIBSUFFIX}', - '$WEBKIT_DIR/JavaScriptCore_pcre.lib') - - -env.Install('$DESTINATION_ROOT', install_targets) - - -gears_plugins = [ - '$GEARS_DIR/binaries/gears.dll', - '$GEARS_DIR/binaries/gears.pdb', -] - -# TODO(port) -if env.Bit('windows'): - env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins) - -env.Command('$DESTINATION_ROOT/resources/inspector', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector/front-end', - Copy('$TARGET', '$SOURCE'), - source_scanner=DirScanner) diff --git a/chrome/SConstruct b/chrome/SConstruct deleted file mode 100644 index dd84b36..0000000 --- a/chrome/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 = 'chrome' -SConscript('../build/SConscript.main', - exports=['build_component']) - diff --git a/chrome/app/chrome_resources.scons b/chrome/app/chrome_resources.scons deleted file mode 100644 index 309bf21..0000000 --- a/chrome/app/chrome_resources.scons +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2009 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. - -import os - -Import('env') - -env = env.Clone() - -grd_files = [ - '$CHROME_SRC_DIR/chrome/browser/browser_resources.grd', - '$CHROME_SRC_DIR/chrome/browser/debugger/resources/debugger_resources.grd', - '$CHROME_SRC_DIR/chrome/common/common_resources.grd', - '$CHROME_SRC_DIR/chrome/renderer/renderer_resources.grd', -] - -for grd_file in grd_files: - # The fake target gets replaced with real targets when the GRIT Builder - # runs. - generated = env.GRIT( - '$TARGET_ROOT/grit_derived_sources/fake_' + os.path.basename(grd_file), - grd_file) - -if env.Bit('linux'): - chrome_pak = env.Repack('$TARGET_ROOT/chrome.pak', - ['$TARGET_ROOT/grit_derived_sources/browser_resources.pak', - '$TARGET_ROOT/grit_derived_sources/debugger_resources.pak', - '$TARGET_ROOT/grit_derived_sources/common_resources.pak', - '$TARGET_ROOT/grit_derived_sources/net_resources.pak', - '$TARGET_ROOT/grit_derived_sources/renderer_resources.pak', - '$TARGET_ROOT/grit_derived_sources/webkit_resources.pak', - ] - ) - i = env.Install('$DESTINATION_ROOT', chrome_pak) - env.Requires('$DESTINATION_ROOT/chrome', i) - env.Requires('$DESTINATION_ROOT/unit_tests', i) diff --git a/chrome/app/chrome_strings.scons b/chrome/app/chrome_strings.scons deleted file mode 100644 index 605ee97..0000000 --- a/chrome/app/chrome_strings.scons +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2009 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. - -import os - -Import('env') - -env = env.Clone() - -grd_files = [ - '$CHROME_SRC_DIR/chrome/app/generated_resources.grd', - '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd', - '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd', - '$CHROME_SRC_DIR/chrome/app/resources/locale_settings.grd', -] - -for grd_file in grd_files: - # The fake target gets replaced with real targets when the GRIT Builder - # runs. - generated = env.GRIT( - '$TARGET_ROOT/grit_derived_sources/fake_' + os.path.basename(grd_file), - grd_file) - -languages = [ 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', - 'en-US', 'es', 'es-419', 'et', 'fi', 'fil', 'fr', 'gu', 'he', 'hi', 'hr', - 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', 'ml', 'mr', 'nl', 'nb', - 'or', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'ta', - 'te', 'th', 'tr', 'uk', 'vi', 'zh-CN', 'zh-TW' ] - -# TODO(tc): Handle official build vs chromium build. Currently we assume -# chromium builds only. -for lang in languages: - lang_pak = env.Repack('$TARGET_ROOT/locales/%s.pak' % lang, - ['$TARGET_ROOT/grit_derived_sources/chromium_strings_%s.pak' % lang, - '$TARGET_ROOT/grit_derived_sources/generated_resources_%s.pak' % lang, - '$TARGET_ROOT/grit_derived_sources/locale_settings_%s.pak' % lang, - '$TARGET_ROOT/grit_derived_sources/webkit_strings_%s.pak' % lang, - ] - ) - i = env.Install('$DESTINATION_ROOT/locales', lang_pak) - -# Only require that en-US.pak is build when building chrome. -env.Requires('$DESTINATION_ROOT/chrome', '$DESTINATION_ROOT/locales/en-US.pak') -env.Requires('$DESTINATION_ROOT/unit_tests', - '$DESTINATION_ROOT/locales/en-US.pak') diff --git a/chrome/app/locales/locales.scons b/chrome/app/locales/locales.scons deleted file mode 100644 index 0ce5df3c..0000000 --- a/chrome/app/locales/locales.scons +++ /dev/null @@ -1,119 +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__ = """ -locale resource configuration. -""" - -Import('env') - -def ChromiumLocaleProject(name, guid): - return env.ChromeMSVSProject(name, - dependencies = [ - '$WEBKIT_DIR/build/localized_strings/localized_strings.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - ], - guid=guid, - keyword='Win32Proj') - -ChromiumLocaleProject('$CHROME_DIR/app/locales/ar.vcproj', - guid='{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/bg.vcproj', - guid='{5BDB7EE1-A1FD-410C-9598-21519A1B7952}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/bn.vcproj', - guid='{4B60E8B8-416F-40B2-8A54-F75970A21992}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/ca.vcproj', - guid='{F7790A54-4078-4E4A-8231-818BE9FB1F94}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/cs.vcproj', - guid='{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/da.vcproj', - guid='{A493331B-3180-49FE-8D0E-D121645E63AD}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/de.vcproj', - guid='{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/el.vcproj', - guid='{D314F1B3-9299-4866-8362-08BF811B0FA3}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/en-GB.vcproj', - guid='{34231B28-C51C-4C1C-AF07-C763668B1404}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/en-US.vcproj', - guid='{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/es.vcproj', - guid='{5AEA4BF6-27CD-47FC-9370-D87771CFA196}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/es-419.vcproj', - guid='{FA660037-EB40-4A43-AA9D-9653C57F2789}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/et.vcproj', - guid='{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/fi.vcproj', - guid='{64D81334-DE73-457D-8FC1-9492508A2663}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/fil.vcproj', - guid='{3A932C39-AFA9-4BDC-B775-F71A426D04BF}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/fr.vcproj', - guid='{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/gu.vcproj', - guid='{256DECCE-9886-4C21-96A5-EE47DF5E07E9}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/he.vcproj', - guid='{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/hi.vcproj', - guid='{228DD844-9926-420E-B193-6973BF2A4D0B}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/hr.vcproj', - guid='{CE1426F6-7D2B-4574-9929-58387BF7B05F}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/hu.vcproj', - guid='{AFF332BF-AF3D-4D35-86FC-42A727F01D36}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/id.vcproj', - guid='{E3DF045F-2174-4685-9CF7-0630A79F324B}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/it.vcproj', - guid='{275F2993-EE9B-4E00-9C85-10A182FD423A}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/ja.vcproj', - guid='{B2D715CE-4CBB-415A-A032-E700C90ADF91}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/kn.vcproj', - guid='{3E6B24F6-9FA9-4066-859E-BF747FA3080A}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/ko.vcproj', - guid='{32167995-4014-4E4C-983B-F7E17C24EB25}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/lt.vcproj', - guid='{80E37CB5-059D-4F4B-AEF6-08265468D368}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/lv.vcproj', - guid='{A5C5D801-4026-49F2-BBF1-250941855306}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/ml.vcproj', - guid='{CAB69303-0F02-4C68-A12E-FFE55DB52526}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/mr.vcproj', - guid='{A464166F-8507-49B4-9B02-5CB77C498B25}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/nb.vcproj', - guid='{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/nl.vcproj', - guid='{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/or.vcproj', - guid='{E07D267C-34C3-4DDB-8B41-94697808714A}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/pl.vcproj', - guid='{9F53807E-9382-47BD-8371-E5D04F517E9C}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/pt-BR.vcproj', - guid='{2F914112-2657-49EC-8EA6-3BA63340DE27}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/pt-PT.vcproj', - guid='{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/ro.vcproj', - guid='{C70D3509-57C4-4326-90C1-2EC0AE34848D}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/ru.vcproj', - guid='{7D456640-3619-4D23-A56D-E0084400CCBF}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/sk.vcproj', - guid='{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/sl.vcproj', - guid='{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/sr.vcproj', - guid='{300C6A09-663E-48B6-8E07-A0D50CAF8F25}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/sv.vcproj', - guid='{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/ta.vcproj', - guid='{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/te.vcproj', - guid='{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/th.vcproj', - guid='{226B3533-1FF3-42F6-A8E3-C4DDBC955290}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/tr.vcproj', - guid='{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/uk.vcproj', - guid='{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/vi.vcproj', - guid='{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/zh-CN.vcproj', - guid='{C0C7DA58-C90D-4BDE-AE44-588997339F5D}') -ChromiumLocaleProject('$CHROME_DIR/app/locales/zh-TW.vcproj', - guid='{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}') diff --git a/chrome/app/theme/theme_dll.scons b/chrome/app/theme/theme_dll.scons deleted file mode 100644 index 9264c12..0000000 --- a/chrome/app/theme/theme_dll.scons +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2009 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. - -Import('env') - -env = env.Clone() - -# The fake target gets replaced with real targets when the GRIT Builder runs. -generated = env.GRIT( - '$TARGET_ROOT/grit_derived_sources/fake_theme_resources.grd', - '$CHROME_SRC_DIR/chrome/app/theme/theme_resources.grd') - -if env.Bit('linux'): - theme_default_pak = env.Repack('$TARGET_ROOT/themes/default.pak', - ['$TARGET_ROOT/grit_derived_sources/theme_resources.pak'] - ) - i = env.Install('$DESTINATION_ROOT/themes/', theme_default_pak) - env.Requires('$DESTINATION_ROOT/chrome', i) - env.Requires('$DESTINATION_ROOT/unit_tests', i) diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons deleted file mode 100644 index 21a35f3..0000000 --- a/chrome/browser/browser.scons +++ /dev/null @@ -1,908 +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. - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$GOOGLE_UPDATE_DIR/using_google_update.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$MEDIA_DIR/using_media.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Append( - LIBS = [ - 'debugger', - 'glue', - 'views', - ], -) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app', - '$CHROME_SRC_DIR', - # To get the #include of history_indexer.h, - # generated from history/history_indexer.idl. - 'history', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -# input_files initialized to common files + Windows specific ones. -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('Autocomplete', [ - 'autocomplete/autocomplete.cc', - 'autocomplete/autocomplete.h', - 'autocomplete/autocomplete_accessibility.cc', - 'autocomplete/autocomplete_accessibility.h', - 'autocomplete/autocomplete_edit.cc', - 'autocomplete/autocomplete_edit.h', - 'autocomplete/autocomplete_popup_model.cc', - 'autocomplete/autocomplete_popup_model.h', - 'autocomplete/autocomplete_popup_view_win.cc', - 'autocomplete/autocomplete_popup_view.h', - 'autocomplete/edit_drop_target.cc', - 'autocomplete/edit_drop_target.h', - 'autocomplete/history_contents_provider.cc', - 'autocomplete/history_contents_provider.h', - 'autocomplete/history_url_provider.cc', - 'autocomplete/history_url_provider.h', - 'autocomplete/keyword_provider.cc', - 'autocomplete/keyword_provider.h', - 'autocomplete/search_provider.cc', - 'autocomplete/search_provider.h', - ]), - MSVSFilter('Base', [ - 'alternate_nav_url_fetcher.cc', - 'alternate_nav_url_fetcher.h', - 'browser_about_handler.cc', - 'browser_about_handler.h', - 'browser_init.cc', - 'browser_init.h', - 'browser_main.cc', - 'browser_main_win.cc', - 'browser_prefs.cc', - 'browser_prefs.h', - 'browser_process.cc', - 'browser_process.h', - 'browser_process_impl.cc', - 'browser_process_impl.h', - 'browser_shutdown.cc', - 'browser_shutdown.h', - 'browser_url_handler.cc', - 'browser_url_handler.h', - 'browsing_data_remover.cc', - 'browsing_data_remover.h', - 'browsing_instance.cc', - 'browsing_instance.h', - 'cache_manager_host.h', - 'cancelable_request.cc', - 'cancelable_request.h', - 'character_encoding.cc', - 'character_encoding.h', - 'chrome_thread.cc', - 'chrome_thread.h', - 'cross_site_request_manager.cc', - 'cross_site_request_manager.h', - 'fav_icon_helper.cc', - 'fav_icon_helper.h', - 'first_run.cc', - 'first_run.h', - 'google_url_tracker.cc', - 'google_url_tracker.h', - 'google_util.cc', - 'google_util.h', - 'icon_loader.cc', - 'icon_loader.h', - 'icon_manager.cc', - 'icon_manager.h', - 'ime_input.cc', - 'ime_input.h', - 'jankometer.cc', - 'jankometer.h', - 'memory_details.cc', - 'memory_details.h', - 'meta_table_helper.cc', - 'meta_table_helper.h', - 'plugin_process_host.cc', - 'plugin_process_host.h', - 'plugin_service.cc', - 'plugin_service.h', - '../tools/build/win/precompiled_wtl.cc', - '../tools/build/win/precompiled_wtl.h', - 'profile.cc', - 'profile.h', - 'profile_manager.cc', - 'profile_manager.h', - 'session_startup_pref.cc', - 'session_startup_pref.h', - 'shell_dialogs.h', - 'shell_integration.cc', - 'shell_integration.h', - 'spellcheck_worditerator.cc', - 'spellcheck_worditerator.h', - 'spellchecker.cc', - 'spellchecker.h', - 'user_data_manager.cc', - 'user_data_manager.h', - 'visitedlink_master.cc', - 'visitedlink_master.h', - ]), - MSVSFilter('Bookmarks', [ - 'bookmarks/bookmark_codec.cc', - 'bookmarks/bookmark_codec.h', - 'bookmarks/bookmark_context_menu.cc', - 'bookmarks/bookmark_context_menu.h', - 'bookmarks/bookmark_drag_data.cc', - 'bookmarks/bookmark_drag_data.h', - 'bookmarks/bookmark_drop_info.cc', - 'bookmarks/bookmark_drop_info.h', - 'bookmarks/bookmark_folder_tree_model.cc', - 'bookmarks/bookmark_folder_tree_model.h', - 'bookmarks/bookmark_html_writer.cc', - 'bookmarks/bookmark_html_writer.h', - 'bookmarks/bookmark_model.cc', - 'bookmarks/bookmark_model.h', - 'bookmarks/bookmark_service.h', - 'bookmarks/bookmark_storage.cc', - 'bookmarks/bookmark_storage.h', - 'bookmarks/bookmark_table_model.cc', - 'bookmarks/bookmark_table_model.h', - 'bookmarks/bookmark_utils.cc', - 'bookmarks/bookmark_utils.h', - ]), - MSVSFilter('Browser Window', [ - 'app_modal_dialog_queue.cc', - 'app_modal_dialog_queue.h', - 'back_forward_menu_model.cc', - 'back_forward_menu_model.h', - 'back_forward_menu_model_win.cc', - 'back_forward_menu_model_win.h', - 'browser.cc', - 'browser.h', - 'browser_list.cc', - 'browser_list.h', - 'browser_window.h', - 'command_updater.cc', - 'controller.h', - 'dock_info.cc', - 'dock_info.h', - 'find_bar.h', - 'find_bar_controller.cc', - 'find_bar_controller.h', - 'find_notification_details.h', - 'js_before_unload_handler.h', - 'js_before_unload_handler_win.cc', - 'js_before_unload_handler_win.h', - 'jsmessage_box_handler.h', - 'jsmessage_box_handler_win.cc', - 'jsmessage_box_handler_win.h', - 'load_from_memory_cache_details.h', - 'load_notification_details.h', - 'login_prompt.cc', - 'login_prompt.h', - 'options_window.h', - 'task_manager.cc', - 'task_manager.h', - 'task_manager_resource_providers.cc', - 'task_manager_resource_providers.h', - 'window_sizer.cc', - 'window_sizer.h', - ]), - MSVSFilter('Automation', [ - 'automation/automation_autocomplete_edit_tracker.h', - 'automation/automation_browser_tracker.h', - 'automation/automation_constrained_window_tracker.h', - 'automation/automation_provider.cc', - 'automation/automation_provider.h', - 'automation/automation_provider_list.cc', - 'automation/automation_provider_list_generic.cc', - 'automation/automation_provider_list_mac.mm', - 'automation/automation_provider_list.h', - 'automation/automation_resource_tracker.cc', - 'automation/automation_resource_tracker.h', - 'automation/automation_tab_tracker.h', - 'automation/automation_window_tracker.h', - 'automation/ui_controls.cc', - 'automation/ui_controls.h', - 'automation/url_request_failed_dns_job.cc', - 'automation/url_request_failed_dns_job.h', - 'automation/url_request_mock_http_job.cc', - 'automation/url_request_mock_http_job.h', - 'automation/url_request_mock_net_error_job.cc', - 'automation/url_request_mock_net_error_job.h', - 'automation/url_request_slow_download_job.cc', - 'automation/url_request_slow_download_job.h', - 'view_ids.h', - ]), - MSVSFilter('History', [ - 'history/archived_database.cc', - 'history/archived_database.h', - 'history/download_database.cc', - 'history/download_database.h', - 'history/download_types.h', - 'history/expire_history_backend.cc', - 'history/expire_history_backend.h', - 'history/history.cc', - 'history/history.h', - 'history/history_backend.cc', - 'history/history_backend.h', - 'history/history_database.cc', - 'history/history_database.h', - 'history/history_indexer.idl', - 'history/history_marshaling.h', - 'history/history_notifications.h', - 'history/history_publisher.cc', - 'history/history_publisher_none.cc', - 'history/history_publisher_win.cc', - 'history/history_publisher.h', - 'history/history_types.cc', - 'history/history_types.h', - 'history/in_memory_database.cc', - 'history/in_memory_database.h', - 'history/in_memory_history_backend.cc', - 'history/in_memory_history_backend.h', - 'history/page_usage_data.cc', - 'history/page_usage_data.h', - 'history/query_parser.cc', - 'history/query_parser.h', - 'history/snippet.cc', - 'history/snippet.h', - 'history/starred_url_database.cc', - 'history/starred_url_database.h', - 'history/text_database.cc', - 'history/text_database.h', - 'history/text_database_manager.cc', - 'history/text_database_manager.h', - 'history/thumbnail_database.cc', - 'history/thumbnail_database.h', - 'history/url_database.cc', - 'history/url_database.h', - 'history/visit_database.cc', - 'history/visit_database.h', - 'history/visit_tracker.cc', - 'history/visit_tracker.h', - 'history/visitsegment_database.cc', - 'history/visitsegment_database.h', - MSVSFilter('HangMonitor', [ - 'hang_monitor/hung_plugin_action.cc', - 'hang_monitor/hung_plugin_action.h', - 'hang_monitor/hung_window_detector.cc', - 'hang_monitor/hung_window_detector.h', - ]), - ]), - MSVSFilter('Sessions and Tab Restore', [ - 'sessions/base_session_service.cc', - 'sessions/base_session_service.h', - 'sessions/session_backend.cc', - 'sessions/session_backend.h', - 'sessions/session_command.cc', - 'sessions/session_command.h', - 'sessions/session_id.cc', - 'sessions/session_id.h', - 'sessions/session_restore.cc', - 'sessions/session_restore.h', - 'sessions/session_service.cc', - 'sessions/session_service.h', - 'sessions/session_types.cc', - 'sessions/session_types.h', - 'sessions/tab_restore_service.cc', - 'sessions/tab_restore_service.h', - ]), - MSVSFilter('WebData', [ - 'webdata/web_data_service.cc', - 'webdata/web_data_service.h', - 'webdata/web_database.cc', - 'webdata/web_database.h', - 'webdata/web_database_win.cc', - ]), - MSVSFilter('Importer', [ - 'importer/firefox2_importer.cc', - 'importer/firefox2_importer.h', - 'importer/firefox3_importer.cc', - 'importer/firefox3_importer.h', - 'importer/firefox_importer_utils.cc', - 'importer/firefox_importer_utils.h', - 'importer/firefox_profile_lock.cc', - 'importer/firefox_profile_lock.h', - 'importer/firefox_profile_lock_win.cc', - 'importer/ie_importer.cc', - 'importer/ie_importer.h', - 'importer/importer.cc', - 'importer/importer.h', - 'importer/mork_reader.cc', - 'importer/mork_reader.h', - ]), - MSVSFilter('Drag & Drop', [ - 'drag_utils.cc', - 'drag_utils.h', - ]), - MSVSFilter('Tabs', [ - 'tabs/tab_strip_model.cc', - 'tabs/tab_strip_model.h', - 'tabs/tab_strip_model_order_controller.cc', - 'tabs/tab_strip_model_order_controller.h', - ]), - MSVSFilter('Printing', [ - 'printing/page_number.cc', - 'printing/page_number.h', - 'printing/page_overlays.cc', - 'printing/page_overlays.h', - 'printing/page_range.cc', - 'printing/page_range.h', - 'printing/page_setup.cc', - 'printing/page_setup.h', - 'printing/print_job.cc', - 'printing/print_job.h', - 'printing/print_job_manager.cc', - 'printing/print_job_manager.h', - 'printing/print_job_worker.cc', - 'printing/print_job_worker.h', - 'printing/print_job_worker_owner.h', - 'printing/print_settings.cc', - 'printing/print_settings.h', - 'printing/print_view_manager.cc', - 'printing/print_view_manager.h', - 'printing/printed_document.cc', - 'printing/printed_document.h', - 'printing/printed_page.cc', - 'printing/printed_page.h', - 'printing/printed_pages_source.h', - 'printing/printer_query.cc', - 'printing/printer_query.h', - 'printing/win_printing_context.cc', - 'printing/win_printing_context.h', - ]), - MSVSFilter('Sandbox', [ - 'sandbox_policy.cc', - 'sandbox_policy.h', - ]), - MSVSFilter('Password Manager', [ - 'password_manager/encryptor.cc', - 'password_manager/encryptor.h', - 'password_manager/ie7_password.cc', - 'password_manager/ie7_password.h', - 'password_manager/password_form_manager.cc', - 'password_manager/password_form_manager.h', - 'password_manager/password_manager.cc', - 'password_manager/password_manager.h', - ]), - MSVSFilter('External Tab', [ - 'external_tab_container.cc', - 'external_tab_container.h', - ]), - MSVSFilter('DOM UI', [ - 'dom_ui/chrome_url_data_manager.cc', - 'dom_ui/chrome_url_data_manager.h', - 'dom_ui/debugger_ui.cc', - 'dom_ui/debugger_ui.h', - 'dom_ui/devtools_ui.cc', - 'dom_ui/devtools_ui.h', - 'dom_ui/dom_ui.cc', - 'dom_ui/dom_ui.h', - 'dom_ui/dom_ui_factory.cc', - 'dom_ui/dom_ui_factory.h', - 'dom_ui/dom_ui_favicon_source.cc', - 'dom_ui/dom_ui_favicon_source.h', - 'dom_ui/dom_ui_host.cc', - 'dom_ui/dom_ui_host.h', - 'dom_ui/dom_ui_thumbnail_source.cc', - 'dom_ui/dom_ui_thumbnail_source.h', - 'dom_ui/downloads_ui.cc', - 'dom_ui/downloads_ui.h', - 'dom_ui/fileicon_source.cc', - 'dom_ui/fileicon_source.h', - 'dom_ui/history_ui.cc', - 'dom_ui/history_ui.h', - 'dom_ui/html_dialog_contents.cc', - 'dom_ui/html_dialog_contents.h', - 'dom_ui/new_tab_ui.cc', - 'dom_ui/new_tab_ui.h', - ]), - MSVSFilter('Net', [ - 'net/chrome_url_request_context.cc', - 'net/chrome_url_request_context.h', - 'net/dns_global.cc', - 'net/dns_global.h', - 'net/dns_host_info.cc', - 'net/dns_host_info.h', - 'net/dns_master.cc', - 'net/dns_master.h', - 'net/referrer.cc', - 'net/referrer.h', - 'net/resolve_proxy_msg_helper.cc', - 'net/resolve_proxy_msg_helper.h', - 'net/sdch_dictionary_fetcher.cc', - 'net/sdch_dictionary_fetcher.h', - 'net/url_fetcher.cc', - 'net/url_fetcher.h', - 'net/url_fetcher_protect.cc', - 'net/url_fetcher_protect.h', - 'net/url_fixer_upper.cc', - 'net/url_fixer_upper.h', - ]), - MSVSFilter('RLZ', [ - 'rlz/rlz.cc', - 'rlz/rlz.h', - ]), - MSVSFilter('Safe Browsing', [ - 'safe_browsing/bloom_filter.cc', - 'safe_browsing/bloom_filter.h', - 'safe_browsing/chunk_range.cc', - 'safe_browsing/chunk_range.h', - 'safe_browsing/protocol_manager.cc', - 'safe_browsing/protocol_manager.h', - 'safe_browsing/protocol_parser.cc', - 'safe_browsing/protocol_parser.h', - 'safe_browsing/safe_browsing_blocking_page.cc', - 'safe_browsing/safe_browsing_blocking_page.h', - 'safe_browsing/safe_browsing_database.cc', - 'safe_browsing/safe_browsing_database.h', - 'safe_browsing/safe_browsing_database_bloom.cc', - 'safe_browsing/safe_browsing_database_bloom.h', - 'safe_browsing/safe_browsing_service.cc', - 'safe_browsing/safe_browsing_service.h', - 'safe_browsing/safe_browsing_util.cc', - 'safe_browsing/safe_browsing_util.h', - ]), - MSVSFilter('Accessibility', [ - 'browser_accessibility.cc', - 'browser_accessibility.h', - 'browser_accessibility_manager.cc', - 'browser_accessibility_manager.h', - ]), - MSVSFilter('Download', [ - 'download/download_exe.cc', - 'download/download_file.cc', - 'download/download_file.h', - 'download/download_item_model.cc', - 'download/download_item_model.h', - 'download/download_manager.cc', - 'download/download_manager.h', - 'download/download_request_dialog_delegate.h', - 'download/download_request_manager.cc', - 'download/download_request_manager.h', - 'download/download_shelf.cc', - 'download/download_shelf.h', - 'download/download_util.cc', - 'download/download_util.h', - ]), - MSVSFilter('Save Page', [ - 'download/save_file.cc', - 'download/save_file.h', - 'download/save_file_manager.cc', - 'download/save_file_manager.h', - 'download/save_item.cc', - 'download/save_item.h', - 'download/save_package.cc', - 'download/save_package.h', - 'download/save_types.h', - ]), - MSVSFilter('Autofill', [ - 'autofill_manager.cc', - 'autofill_manager.h', - ]), - MSVSFilter('Extensions', [ - 'extensions/extension.cc', - 'extensions/extension.h', - 'extensions/extension_function.cc', - 'extensions/extension_function.h', - 'extensions/extension_function_dispatcher.cc', - 'extensions/extension_function_dispatcher.h', - 'extensions/extension_error_reporter.cc', - 'extensions/extension_error_reporter.h', - 'extensions/extension_message_service.cc', - 'extensions/extension_message_service.h', - 'extensions/extension_protocols.h', - 'extensions/extension_tabs_module.cc', - 'extensions/extension_tabs_module.h', - 'extensions/extension_view.cc', - 'extensions/extension_view.h', - 'extensions/extensions_service.cc', - 'extensions/extensions_service.h', - 'extensions/extensions_ui.cc', - 'extensions/extensions_ui.h', - 'extensions/user_script_master.cc', - 'extensions/user_script_master.h', - ]), - MSVSFilter('Renderer Host', [ - 'renderer_host/async_resource_handler.cc', - 'renderer_host/async_resource_handler.h', - 'renderer_host/audio_renderer_host.cc', - 'renderer_host/audio_renderer_host.h', - 'renderer_host/backing_store.h', - 'renderer_host/backing_store.cc', - 'renderer_host/backing_store_win.cc', - 'renderer_host/browser_render_process_host.cc', - 'renderer_host/browser_render_process_host.h', - 'renderer_host/buffered_resource_handler.cc', - 'renderer_host/buffered_resource_handler.h', - 'renderer_host/cross_site_resource_handler.cc', - 'renderer_host/cross_site_resource_handler.h', - 'renderer_host/download_resource_handler.cc', - 'renderer_host/download_resource_handler.h', - 'renderer_host/download_throttling_resource_handler.cc', - 'renderer_host/download_throttling_resource_handler.h', - 'renderer_host/media_resource_handler.cc', - 'renderer_host/media_resource_handler.h', - 'renderer_host/render_process_host.cc', - 'renderer_host/render_process_host.h', - 'renderer_host/render_view_host.cc', - 'renderer_host/render_view_host.h', - 'renderer_host/render_view_host_delegate.h', - 'renderer_host/render_widget_helper.cc', - 'renderer_host/render_widget_helper.h', - 'renderer_host/render_widget_host.cc', - 'renderer_host/render_widget_host.h', - 'renderer_host/render_widget_host_view.h', - 'renderer_host/render_widget_host_view_win.cc', - 'renderer_host/render_widget_host_view_win.h', - 'renderer_host/renderer_security_policy.cc', - 'renderer_host/renderer_security_policy.h', - 'renderer_host/resource_dispatcher_host.cc', - 'renderer_host/resource_dispatcher_host.h', - 'renderer_host/resource_handler.h', - 'renderer_host/resource_message_filter.cc', - 'renderer_host/resource_message_filter.h', - 'renderer_host/resource_message_filter_gtk.cc', - 'renderer_host/resource_request_details.h', - 'renderer_host/safe_browsing_resource_handler.cc', - 'renderer_host/safe_browsing_resource_handler.h', - 'renderer_host/save_file_resource_handler.cc', - 'renderer_host/save_file_resource_handler.h', - 'renderer_host/sync_resource_handler.cc', - 'renderer_host/sync_resource_handler.h', - 'renderer_host/web_cache_manager.cc', - ]), - MSVSFilter('Tab Contents', [ - 'tab_contents/constrained_window.h', - 'tab_contents/infobar_delegate.cc', - 'tab_contents/infobar_delegate.h', - 'tab_contents/interstitial_page.cc', - 'tab_contents/interstitial_page.h', - 'tab_contents/navigation_controller.cc', - 'tab_contents/navigation_controller.h', - 'tab_contents/navigation_entry.cc', - 'tab_contents/navigation_entry.h', - 'tab_contents/page_navigator.h', - 'tab_contents/provisional_load_details.cc', - 'tab_contents/provisional_load_details.h', - 'tab_contents/render_view_context_menu.cc', - 'tab_contents/render_view_context_menu.h', - 'tab_contents/render_view_host_manager.cc', - 'tab_contents/render_view_host_manager.h', - 'tab_contents/repost_form_warning.h', - 'tab_contents/security_style.h', - 'tab_contents/site_instance.cc', - 'tab_contents/site_instance.h', - 'tab_contents/tab_contents.cc', - 'tab_contents/tab_contents.h', - 'tab_contents/tab_contents_delegate.h', - 'tab_contents/tab_contents_factory.cc', - 'tab_contents/tab_contents_factory.h', - 'tab_contents/tab_contents_type.h', - 'tab_contents/tab_util.cc', - 'tab_contents/tab_util.h', - 'tab_contents/web_contents.cc', - 'tab_contents/web_contents.h', - 'tab_contents/web_contents_view.cc', - 'tab_contents/web_contents_view.h', - 'tab_contents/web_contents_view_win.cc', - 'tab_contents/web_contents_view_win.h', - 'tab_contents/web_drag_source.cc', - 'tab_contents/web_drag_source.h', - 'tab_contents/web_drop_target.cc', - 'tab_contents/web_drop_target.h', - ]), - MSVSFilter('Search Engines', [ - 'search_engines/template_url.cc', - 'search_engines/template_url.h', - 'search_engines/template_url_fetcher.cc', - 'search_engines/template_url_fetcher.h', - 'search_engines/template_url_model.cc', - 'search_engines/template_url_model.h', - 'search_engines/template_url_parser.cc', - 'search_engines/template_url_parser.h', - 'search_engines/template_url_prepopulate_data.cc', - 'search_engines/template_url_prepopulate_data.h', - ]), - MSVSFilter('Metrics', [ - 'metrics/metrics_log.cc', - 'metrics/metrics_log.h', - 'metrics/metrics_response.cc', - 'metrics/metrics_response.h', - 'metrics/metrics_service.cc', - 'metrics/metrics_service.h', - 'metrics/user_metrics.cc', - 'metrics/user_metrics.h', - ]), - MSVSFilter('SSL', [ - 'ssl/ssl_blocking_page.cc', - 'ssl/ssl_blocking_page.h', - 'ssl/ssl_error_info.cc', - 'ssl/ssl_error_info.h', - 'ssl/ssl_host_state.cc', - 'ssl/ssl_host_state.h', - 'ssl/ssl_manager.cc', - 'ssl/ssl_manager.h', - 'ssl/ssl_policy.cc', - 'ssl/ssl_policy.h', - ]), - 'browser_trial.cc', - 'browser_trial.h', - 'cert_store.cc', - 'cert_store.h', - 'chrome_plugin_browsing_context.cc', - 'chrome_plugin_browsing_context.h', - 'chrome_plugin_host.cc', - 'encoding_menu_controller_delegate.cc', - 'encoding_menu_controller_delegate.h', - 'external_protocol_handler.cc', - 'external_protocol_handler.h', - 'gears_integration.cc', - 'gears_integration.h', - 'google_update.cc', - 'google_update.h', - 'modal_html_dialog_delegate.cc', - 'modal_html_dialog_delegate.h', - 'page_state.cc', - 'page_state.h', - 'plugin_installer.cc', - 'plugin_installer.h', - 'toolbar_model.cc', - 'toolbar_model.h', - 'worker_host/worker_process_host.cc', - 'worker_host/worker_process_host.h', - 'worker_host/worker_service.cc', - 'worker_host/worker_service.h', -]) - -if not env.Bit('windows'): - # TODO: Port these. - input_files.Remove( - 'app_modal_dialog_queue.cc', - 'autocomplete/autocomplete_accessibility.cc', - 'autocomplete/autocomplete_popup_view_win.cc', - 'autocomplete/edit_drop_target.cc', - 'automation/ui_controls.cc', - 'browser_accessibility.cc', - 'browser_accessibility_manager.cc', - 'dock_info.cc', - 'dom_ui/html_dialog_contents.cc', - 'download/download_exe.cc', - 'download/download_util.cc', - 'drag_utils.cc', - 'encoding_menu_controller_delegate.cc', - 'external_tab_container.cc', - 'first_run.cc', - 'hang_monitor/hung_plugin_action.cc', - 'hang_monitor/hung_window_detector.cc', - 'icon_loader.cc', - 'icon_manager.cc', - 'ime_input.cc', - 'jankometer.cc', - 'login_prompt.cc', - 'memory_details.cc', - 'modal_html_dialog_delegate.cc', - 'google_update.cc', - 'password_manager/encryptor.cc', - 'printing/page_overlays.cc', - 'printing/print_job.cc', - 'printing/print_job_manager.cc', - 'printing/print_job_worker.cc', - 'printing/print_settings.cc', - 'printing/print_view_manager.cc', - 'printing/printed_document.cc', - 'printing/printed_page.cc', - 'printing/printer_query.cc', - 'printing/win_printing_context.cc', - 'rlz/rlz.cc', - 'sandbox_policy.cc', - 'shell_integration.cc', - 'tab_contents/web_drop_target.cc', - 'task_manager.cc', - 'task_manager_resource_providers.cc', - 'window_sizer.cc', - ) - - # Remove Windows-specific files on other platforms. - input_files.Remove( - 'back_forward_menu_model_win.cc', - 'browser_main_win.cc', - 'history/history_publisher_win.cc', - 'importer/firefox_profile_lock_win.cc', - 'importer/ie_importer.cc', - 'js_before_unload_handler_win.cc', - 'jsmessage_box_handler_win.cc', - 'password_manager/ie7_password.cc', - 'password_manager/password_form_manager_win.cc', - 'renderer_host/backing_store_win.cc', - 'renderer_host/render_widget_host_view_win.cc', - 'tab_contents/web_contents_view_win.cc', - 'webdata/web_data_service_win.cc', - 'webdata/web_database_win.cc', - '../tools/build/win/precompiled_wtl.cc', - '../tools/build/win/precompiled_wtl.h', - ) - - # Add files shared across non-Windows platforms. - input_files.Append( - 'importer/firefox_profile_lock_posix.cc', - 'renderer_host/backing_store_x.cc', - ) - - -if env.Bit('linux'): - input_files.Extend([ - 'autocomplete/autocomplete_edit_view_gtk.cc', - 'autocomplete/autocomplete_popup_view_gtk.cc', - 'browser_main_gtk.cc', - 'gtk/back_forward_menu_model_gtk.cc', - 'gtk/browser_toolbar_gtk.cc', - 'gtk/browser_window_factory_gtk.cc', - 'gtk/browser_window_gtk.cc', - 'gtk/custom_button.cc', - 'gtk/dialogs_gtk.cc', - 'gtk/download_item_gtk.cc', - 'gtk/download_shelf_gtk.cc', - 'gtk/find_bar_gtk.cc', - 'gtk/location_bar_view_gtk.cc', - 'gtk/menu_gtk.cc', - 'gtk/nine_box.cc', - 'gtk/standard_menus.cc', - 'gtk/status_bubble_gtk.cc', - 'gtk/tab_contents_container_gtk.cc', - 'gtk/tabs/tab_gtk.cc', - 'gtk/tabs/tab_renderer_gtk.cc', - 'gtk/tabs/tab_strip_gtk.cc', - 'process_singleton_linux.cc', - 'renderer_host/render_widget_host_view_gtk.cc', - 'tab_contents/web_contents_view_gtk.cc', - 'tab_contents/render_view_context_menu_gtk.cc', - ]) - -if env.Bit('mac'): - input_files.Remove( - 'spellchecker.cc', - 'tab_contents/web_contents_view.cc', - ) - -if not env.Bit('mac'): - # Mac-specific files - input_files.Remove( - 'automation/automation_provider_list_mac.mm', - ) - -if env.Bit('windows'): - env.TypeLibrary('history/history_indexer.idl') - - input_files.Remove( - 'history/history_publisher_none.cc', - 'importer/firefox_profile_lock_posix.cc', - ) - -if not env.Bit('mac'): - # TODO: This should work for all platforms. - env.ChromeLibrary('browser', input_files) - -p = env.ChromeMSVSProject('browser.vcproj', - dest='$CHROME_SRC_DIR/chrome/browser/browser.vcproj', - guid='{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}', - keyword='Win32Proj', - root_namespace='Browser', - dependencies = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', - '$NET_DIR/build/net_resources.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'Resource text file copy', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddToolFile('../tools/build/win/resource_text_file_copy.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './browser.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled_wtl.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './browser.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)/tools/build/win/js_engine.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) - -p.AddFileConfig('../tools/build/win/precompiled_wtl.cc', - 'Release|Win32', - ExcludedFromBuild='true', - tools=[ - 'VCCLCompilerTool', - ]) - -xmldoc_files = [ - 'net/url_fetcher.cc', - 'net/url_fetcher_protect.cc', - 'net/url_fixer_upper.cc', - 'password_manager/encryptor.cc', - 'search_engines/template_url.cc', - 'search_engines/template_url_fetcher.cc', - 'search_engines/template_url_model.cc', - 'search_engines/template_url_parser.cc', - 'search_engines/template_url_prepopulate_data.cc', - 'ssl/ssl_blocking_page.cc', - 'ssl/ssl_error_info.cc', - 'ssl/ssl_host_state.cc', - 'ssl/ssl_manager.cc', - 'ssl/ssl_policy.cc', - 'tab_contents/interstitial_page.cc', - 'tab_contents/native_ui_contents.cc', - 'tab_contents/navigation_controller.cc', - 'tab_contents/navigation_entry.cc', - 'tab_contents/provisional_load_details.cc', - 'tab_contents/site_instance.cc', - 'tab_contents/web_drag_source.cc', - 'tab_contents/web_drop_target.cc', -] - -xmldoc_tool_list = [ - MSVSTool('VCCLCompilerTool', - XMLDocumentationFileName=('$(IntDir)/$(InputName)1.xdc'), - ObjectFile='$(IntDir)/$(InputName)1.obj'), -] - -for filename in xmldoc_files: - p.AddFileConfig(filename, 'Debug|Win32', xmldoc_tool_list) - p.AddFileConfig(filename, 'Release|Win32', xmldoc_tool_list) diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons deleted file mode 100644 index 0990813..0000000 --- a/chrome/browser/debugger/debugger.scons +++ /dev/null @@ -1,191 +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. - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$BREAKPAD_DIR/using_breakpad.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app', - '$CHROME_SRC_DIR', - ], -) - -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('resources', [ - 'resources/debugger.css', - 'resources/debugger.html', - 'resources/debugger.js', - 'resources/debugger_shell.js', - ]), - 'debugger_host.h', - 'debugger_host_impl.cpp', - 'debugger_host_impl.h', - 'debugger_io.h', - 'debugger_io_socket.cc', - 'debugger_io_socket.h', - 'debugger_node.cc', - 'debugger_node.h', - 'debugger_shell.cc', - 'debugger_shell.h', - 'resources/debugger_resources.h', - 'debugger_view.cc', - 'debugger_view.h', - 'debugger_window.cc', - 'debugger_window.h', - 'debugger_wrapper.cc', - 'debugger_wrapper.h', - 'devtools_client_host.h', - 'devtools_manager.h', - 'devtools_manager.cc', - 'devtools_view.cc', - 'devtools_view.h', - 'devtools_window.h', -]) - -if env.Bit('linux'): - # TODO(port): Port these. - input_files.Remove( - 'debugger_view.cc', - 'debugger_window.cc', - 'devtools_view.cc', - ) - input_files.Append( - 'devtools_window_gtk.cc', - ) - -if env.Bit('mac'): - # TODO(port): Port these. - input_files.Remove( - 'debugger_contents.cc', - 'debugger_host_impl.cpp', - 'debugger_node.cc', - 'debugger_view.cc', - 'debugger_window.cc', - 'devtools_view.cc', - ) - input_files.Append( - 'devtools_window_mac.cc', - ) - - -if not env.Bit('mac'): - # TODO(port): Enable for Mac. - env.ChromeLibrary('debugger', input_files) - - -p = env.ChromeMSVSProject('debugger.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'browser/debugger/debugger.vcproj'), - guid='{57823D8C-A317-4713-9125-2C91FDFD12D6}', - keyword='Win32Proj', - dependencies = [ - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './debugger.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './debugger.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) - -############################################################################## -# TODO(sgk): move to a separate debugger_disabled.scons file? ############### - -input_files = ChromeFileList([ - 'debugger_contents.cc', - 'debugger_contents.h', - 'debugger_shell.h', - 'debugger_window.cc', - 'debugger_window.h', - 'debugger_wrapper.cc', - 'debugger_wrapper.h', -]) - -p = env.ChromeMSVSProject('debugger_disabled.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'browser/debugger/debugger_disabled.vcproj'), - guid='{369B9881-3F2C-464D-A96C-E281405DF8F6}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './debugger_disabled.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './debugger_disabled.vsprops', - ]) diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript deleted file mode 100644 index 6af89a0..0000000 --- a/chrome/browser/views/SConscript +++ /dev/null @@ -1,475 +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. - -Import('env') - -env = env.Clone() - - -env.Prepend( - CPPPATH = [ - '$TARGET_ROOT/grit_derived_sources', - #'$OBJ_ROOT/google_update', - '$OBJ_ROOT/chrome/tools/build/win', - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - 'USE_HUNSPELL', - 'HUNSPELL_CHROME_CLIENT', - 'LIBXML_STATIC', - 'PNG_USER_CONFIG', - 'CHROME_PNG_WRITE_SUPPORT', - ], -) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/TP', - ], - ) - -env.Append( - CPPPATH = [ - '$GTEST_DIR/include', - - '$GOOGLE_UPDATE_DIR', - '$CHROME_DIR/third_party/hunspell/src/hunspell', - '$CHROME_DIR/third_party/wtl/include', - '$NPAPI_DIR', - '$LIBXML_DIR/DerivedSources/include', - '$LIBXML_DIR/include', - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', - '$CHROME_DIR/app', - '$WEBKIT_DIR/build/localized_strings', - '$ZLIB_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$LIBPNG_DIR', - '$BREAKPAD_DIR/src', - ], -) - -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('Frame', [ - 'frame/aero_glass_frame.cc', - 'frame/aero_glass_frame.h', - 'frame/aero_glass_non_client_view.cc', - 'frame/aero_glass_non_client_view.h', - 'frame/browser_frame.h', - 'frame/browser_view.cc', - 'frame/browser_view.h', - 'frame/browser_window_factory.cc', - 'frame/opaque_frame.cc', - 'frame/opaque_frame.h', - 'frame/opaque_non_client_view.cc', - 'frame/opaque_non_client_view.h', - ]), - MSVSFilter('Info Bars', [ - 'infobars/infobar_container.cc', - 'infobars/infobar_container.h', - 'infobars/infobars.cc', - 'infobars/infobars.h', - ]), - MSVSFilter('Options', [ - 'options/advanced_contents_view.cc', - 'options/advanced_contents_view.h', - 'options/advanced_page_view.cc', - 'options/advanced_page_view.h', - 'options/content_page_view.cc', - 'options/content_page_view.h', - 'options/cookies_view.cc', - 'options/cookies_view.h', - 'options/fonts_languages_window_view.cc', - 'options/fonts_languages_window_view.h', - 'options/fonts_page_view.cc', - 'options/fonts_page_view.h', - 'options/general_page_view.cc', - 'options/general_page_view.h', - 'options/language_combobox_model.cc', - 'options/language_combobox_model.h', - 'options/languages_page_view.cc', - 'options/languages_page_view.h', - 'options/options_group_view.cc', - 'options/options_group_view.h', - 'options/options_page_view.cc', - 'options/options_page_view.h', - 'options/options_window_view.cc', - ]), - MSVSFilter('Tabs', [ - 'tabs/dragged_tab_controller.cc', - 'tabs/dragged_tab_controller.h', - 'tabs/dragged_tab_view.cc', - 'tabs/dragged_tab_view.h', - 'tabs/hwnd_photobooth.cc', - 'tabs/hwnd_photobooth.h', - 'tabs/tab.cc', - 'tabs/tab.h', - 'tabs/tab_renderer.cc', - 'tabs/tab_renderer.h', - 'tabs/tab_strip.cc', - 'tabs/tab_strip.h', - ]), - MSVSFilter('Find Bar', [ - 'find_bar_view.cc', - 'find_bar_view.h', - 'find_bar_win.cc', - 'find_bar_win.h', - ]), - 'about_chrome_view.cc', - 'about_chrome_view.h', - 'about_ipc_dialog.cc', - 'about_ipc_dialog.h', - 'about_network_dialog.cc', - 'about_network_dialog.h', - 'blocked_popup_container.cc', - 'blocked_popup_container.h', - 'bookmark_bar_view.cc', - 'bookmark_bar_view.h', - 'bookmark_bubble_view.cc', - 'bookmark_bubble_view.h', - 'bookmark_editor_view.cc', - 'bookmark_editor_view.h', - 'bookmark_folder_tree_view.cc', - 'bookmark_folder_tree_view.h', - 'bookmark_manager_view.cc', - 'bookmark_manager_view.h', - 'bookmark_table_view.cc', - 'bookmark_table_view.h', - 'bug_report_view.cc', - 'bug_report_view.h', - 'clear_browsing_data.cc', - 'clear_browsing_data.h', - 'constrained_window_impl.cc', - 'constrained_window_impl.h', - 'delay_view.cc', - 'delay_view.h', - 'dom_view.cc', - 'dom_view.h', - 'download_item_view.cc', - 'download_item_view.h', - 'download_shelf_view.cc', - 'download_shelf_view.h', - 'download_started_animation.cc', - 'download_started_animation.h', - 'edit_keyword_controller.cc', - 'edit_keyword_controller.h', - 'event_utils.cc', - 'event_utils.h', - 'external_protocol_dialog.cc', - 'external_protocol_dialog.h', - 'first_run_bubble.cc', - 'first_run_bubble.h', - 'first_run_customize_view.cc', - 'first_run_customize_view.h', - 'first_run_view.cc', - 'first_run_view.h', - 'first_run_view_base.cc', - 'first_run_view_base.h', - 'go_button.cc', - 'go_button.h', - 'html_dialog_view.cc', - 'html_dialog_view.h', - 'hung_renderer_view.cc', - 'hung_renderer_view.h', - 'hwnd_html_view.cc', - 'hwnd_html_view.h', - 'importer_lock_view.cc', - 'importer_lock_view.h', - 'importer_view.cc', - 'importer_view.h', - 'importing_progress_view.cc', - 'importing_progress_view.h', - 'info_bubble.cc', - 'info_bubble.h', - 'input_window.cc', - 'input_window.h', - 'keyword_editor_view.cc', - 'keyword_editor_view.h', - 'location_bar_view.cc', - 'location_bar_view.h', - 'login_view.cc', - 'login_view.h', - 'new_profile_dialog.cc', - 'new_profile_dialog.h', - 'page_info_window.cc', - 'page_info_window.h', - 'password_manager_view.cc', - 'password_manager_view.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'restart_message_box.cc', - 'restart_message_box.h', - 'sad_tab_view.cc', - 'sad_tab_view.h', - 'select_profile_dialog.cc', - 'select_profile_dialog.h', - 'shelf_item_dialog.cc', - 'shelf_item_dialog.h', - 'shell_dialogs_win.cc', - 'standard_layout.h', - 'star_toggle.cc', - 'star_toggle.h', - 'status_bubble.cc', - 'status_bubble.h', - 'tab_contents_container_view.cc', - 'tab_contents_container_view.h', - 'tab_icon_view.cc', - 'tab_icon_view.h', - 'theme_helpers.cc', - 'theme_helpers.h', - 'toolbar_star_toggle.cc', - 'toolbar_star_toggle.h', - 'toolbar_view.cc', - 'toolbar_view.h', - 'user_data_dir_dialog.cc', - 'user_data_dir_dialog.h', -]) - -if env.Bit('linux'): - # TODO(port): Port to Linux. - input_files.Remove( - 'about_chrome_view.cc', - 'about_ipc_dialog.cc', - 'about_network_dialog.cc', - 'blocked_popup_container.cc', - 'bookmark_bar_view.cc', - 'bookmark_bubble_view.cc', - 'bookmark_editor_view.cc', - 'bookmark_folder_tree_view.cc', - 'bookmark_manager_view.cc', - 'bookmark_table_view.cc', - 'bug_report_view.cc', - 'clear_browsing_data.cc', - 'constrained_window_impl.cc', - 'delay_view.cc', - 'dom_view.cc', - 'download_item_view.cc', - 'download_shelf_view.cc', - 'download_started_animation.cc', - 'edit_keyword_controller.cc', - 'external_protocol_dialog.cc', - 'find_bar_view.cc', - 'first_run_bubble.cc', - 'first_run_customize_view.cc', - 'first_run_view.cc', - 'first_run_view_base.cc', - 'frame/aero_glass_frame.cc', - 'frame/aero_glass_non_client_view.cc', - 'frame/browser_view.cc', - 'frame/browser_window_factory.cc', - 'frame/opaque_frame.cc', - 'frame/opaque_non_client_view.cc', - 'go_button.cc', - 'html_dialog_view.cc', - 'hung_renderer_view.cc', - 'hwnd_html_view.cc', - 'importer_lock_view.cc', - 'importer_view.cc', - 'importing_progress_view.cc', - 'info_bubble.cc', - 'infobars/infobar_container.cc', - 'infobars/infobars.cc', - 'input_window.cc', - 'keyword_editor_view.cc', - 'location_bar_view.cc', - 'login_view.cc', - 'new_profile_dialog.cc', - 'options/advanced_contents_view.cc', - 'options/advanced_page_view.cc', - 'options/content_page_view.cc', - 'options/cookies_view.cc', - 'options/fonts_languages_window_view.cc', - 'options/fonts_page_view.cc', - 'options/general_page_view.cc', - 'options/language_combobox_model.cc', - 'options/languages_page_view.cc', - 'options/options_group_view.cc', - 'options/options_page_view.cc', - 'options/options_window_view.cc', - 'page_info_window.cc', - 'password_manager_view.cc', - 'restart_message_box.cc', - 'select_profile_dialog.cc', - 'shelf_item_dialog.cc', - 'shell_dialogs_win.cc', - 'star_toggle.cc', - 'status_bubble.cc', - 'tab_contents_container_view.cc', - 'tab_icon_view.cc', - 'tabs/dragged_tab_controller.cc', - 'tabs/dragged_tab_view.cc', - 'tabs/hwnd_photobooth.cc', - 'tabs/tab.cc', - 'tabs/tab_renderer.cc', - 'tabs/tab_strip.cc', - 'theme_helpers.cc', - 'toolbar_star_toggle.cc', - 'toolbar_view.cc', - 'user_data_dir_dialog.cc', - ) - -if env.Bit('mac'): - # TODO(port): Port to Mac. - input_files.Remove( - 'about_chrome_view.cc', - 'about_ipc_dialog.cc' - 'about_network_dialog.cc' - 'blocked_popup_container.cc', - 'bookmark_bar_view.cc', - 'bookmark_bubble_view.cc', - 'bookmark_editor_view.cc', - 'bookmark_folder_tree_view.cc', - 'bookmark_manager_view.cc', - 'bookmark_table_view.cc', - 'bug_report_view.cc', - 'clear_browsing_data.cc', - 'constrained_window_impl.cc', - 'delay_view.cc', - 'dom_view.cc', - 'download_item_view.cc', - 'download_shelf_view.cc', - 'download_started_animation.cc', - 'edit_keyword_controller.cc', - 'event_utils.cc', - 'external_protocol_dialog.cc', - 'find_bar_view.cc', - 'first_run_bubble.cc', - 'first_run_customize_view.cc', - 'first_run_view.cc', - 'first_run_view_base.cc', - 'frame/aero_glass_frame.cc', - 'frame/aero_glass_non_client_view.cc', - 'frame/browser_view.cc', - 'frame/browser_window_factory.cc', - 'frame/opaque_frame.cc', - 'frame/opaque_non_client_view.cc', - 'go_button.cc', - 'html_dialog_view.cc', - 'hung_renderer_view.cc', - 'hwnd_html_view.cc', - 'importer_lock_view.cc', - 'importer_view.cc', - 'importing_progress_view.cc', - 'info_bubble.cc', - 'infobars/infobar_container.cc', - 'infobars/infobars.cc', - 'input_window.cc', - 'keyword_editor_view.cc', - 'location_bar_view.cc', - 'login_view.cc', - 'new_profile_dialog.cc', - 'options/advanced_contents_view.cc', - 'options/advanced_page_view.cc', - 'options/content_page_view.cc', - 'options/cookies_view.cc', - 'options/fonts_languages_window_view.cc', - 'options/fonts_page_view.cc', - 'options/general_page_view.cc', - 'options/language_combobox_model.cc', - 'options/languages_page_view.cc', - 'options/options_group_view.cc', - 'options/options_page_view.cc', - 'options/options_window_view.cc', - 'page_info_window.cc', - 'password_manager_view.cc', - 'restart_message_box.cc', - 'sad_tab_view.cc', - 'select_profile_dialog.cc', - 'shelf_item_dialog.cc', - 'shell_dialogs_win.cc', - 'star_toggle.cc', - 'status_bubble.cc', - 'tab_contents_container_view.cc', - 'tab_icon_view.cc', - 'tabs/dragged_tab_controller.cc', - 'tabs/dragged_tab_view.cc', - 'tabs/hwnd_photobooth.cc', - 'tabs/tab.cc', - 'tabs/tab_renderer.cc', - 'tabs/tab_strip.cc', - 'theme_helpers.cc', - 'toolbar_star_toggle.cc', - 'toolbar_view.cc', - 'user_data_dir_dialog.cc', - ) - -if not env.Bit('windows'): - input_files.Remove( - 'find_bar_win.cc', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -env.ChromeLibrary('browser_views', input_files) - -p = env.ChromeMSVSProject('browser_views.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'browser/views/browser_views.vcproj'), - root_namespace='Browser_views', - guid='{FA537565-7B03-4FFC-AF15-F7A979B72E22}', - keyword='Win32Proj', - dependencies = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '../browser.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '../browser.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)/tools/build/win/js_engine.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Release|Win32', - ExcludedFromBuild='true', - tools=[ - 'VCCLCompilerTool', - ]) diff --git a/chrome/chrome_main.scons b/chrome/chrome_main.scons deleted file mode 100644 index 75e3090..0000000 --- a/chrome/chrome_main.scons +++ /dev/null @@ -1,100 +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 chrome components. -""" - -Import('env') - -# Arrange for Hammer to add all programs to the 'chrome' Alias. -env.Append( - COMPONENT_PROGRAM_GROUPS = ['chrome'], - COMPONENT_TEST_PROGRAM_GROUPS = ['chrome'], - STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME = 1, -) - - -# TODO(sgk): move the ChromeVersionRC builder into a Tool module -def chrome_version_emitter(target, source, env): - source.append(env.File('$CHROME_SRC_DIR/chrome/VERSION')) - # TODO(sgk): parameterize for chromium-vs.-google_chrome - source.append(env.File('$CHROME_SRC_DIR/chrome/' - + 'app/theme/google_chrome/BRANDING')) - return target, source - -b = Builder(action = '$CHROME_VERSION_RC_COM', - emitter = chrome_version_emitter) - -env['BUILDERS']['ChromeVersionRC'] = b - -env.Replace( - # NOTE: the / after $CHROME_SRC_DIR/chrome/ is required because - # version.bat assumes a path with a trailing slash. - CHROME_VERSION_RC_COM = - '$VERSION_BAT $SOURCE $CHROME_SRC_DIR/chrome/ $PWD $TARGET', - VERSION_BAT = env.File( - '$CHROME_SRC_DIR/chrome/tools/build/win/version.bat'), - PWD = Dir('.'), -) - - -sconscript_files = env.ChromiumLoadComponentSConscripts( - 'SConscript', - - LOAD_NAMES = ['chrome'], - - chrome_sln = 'chrome_sln.scons', - - locales = 'app/locales/locales.scons', - chrome_resources = 'app/chrome_resources.scons', - chrome_strings = 'app/chrome_strings.scons', - theme_dll = 'app/theme/theme_dll.scons', - - browser = 'browser/browser.scons', - debugger = 'browser/debugger/debugger.scons', - - common = 'common/common.scons', - ipc_tests = 'common/ipc_tests.scons', - - #gcapi_dll = 'installer/gcapi/gcapi_dll.scons', - #gcapi_lib = 'installer/gcapi/gcapi_lib.scons', - #gcapi_test = 'installer/gcapi/gcapi_test.scons', - mini_installer = 'installer/mini_installer/mini_installer.scons', - setup = 'installer/setup/setup.scons', - #installer_unittests = 'installer/util/installer_unittests.scons', - util = 'installer/util/util.scons', - installer_unittests = 'installer/util/installer_unittests.scons', - - plugin = 'plugin/plugin.scons', - - renderer = 'renderer/renderer.scons', - - activex_test_controls = - 'test/activex_test_control/activex_test_control.scons', - automated_ui_tests = 'test/automated_ui_tests/automated_ui_tests.scons', - automtion = 'test/automation/automation.scons', - test_chrome_plugin = 'test/chrome_plugin/test_chrome_plugin.scons', - interactive_ui_tests = 'test/interactive_ui/interactive_ui_tests.scons', - memory_test = 'test/memory_test/memory_test.scons', - mini_installer_test = 'test/mini_installer_test/mini_installer_test.scons', - page_cycler_tests = 'test/page_cycler/page_cycler_tests.scons', - perf_tests = 'test/perf/perftests.scons', - plugin_tests = 'test/plugin/plugin_tests.scons', - reliability_tests = 'test/reliability/reliability_tests.scons', - security_tests = 'test/security_tests/security_tests.scons', - selenium_tests = 'test/selenium/selenium_tests.scons', - startup_tests = 'test/startup/startup_tests.scons', - tab_switching_test = 'test/tab_switching/tab_switching_test.scons', - ui_tests = 'test/ui/ui_tests.scons', - unit_tests = 'test/unit/unit_tests.scons', - - convert_dict = 'tools/convert_dict/convert_dict.scons', - crash_service = 'tools/crash_service/crash_service.scons', - flush_cache = 'tools/perf/flush_cache/flush_cache.scons', - generate_profile = 'tools/profiles/generate_profile.scons', - image_diff = 'tools/test/image_diff/image_diff.scons', -) - -SConscript(sconscript_files, exports=['env']) diff --git a/chrome/chrome_sln.scons b/chrome/chrome_sln.scons deleted file mode 100644 index b025320..0000000 --- a/chrome/chrome_sln.scons +++ /dev/null @@ -1,547 +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') - -# TODO(sgk): migrate these MSVSProject() definitions to other -# .scons files as we continue to rename SConscript files. -env.ChromeMSVSProject('$GEARS_DIR/gears.vcproj', - guid='{D703D7A0-EDC1-4FE6-9E22-56154155B24E}') - -env.ChromeMSVSProject('../tools/memory_watcher/memory_watcher.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - ], - guid='{3BD81303-4E14-4559-AA69-B30C3BAB08DD}') - -# Not until/unless we want to support C# projects. -#env.ChromeMSVSProject('$CHROME_SRC_DIR/tools/stats_viewer/stats_viewer.csproj', -# guid='{41735CD9-3E35-47F7-9FD1-4A9950B6B131}') - -env.ChromeMSVSProject('$CHROME_DIR/app/generated_resources.vcproj', - guid='{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}') - -env.ChromeMSVSProject('$CHROME_DIR/app/theme/theme_dll.vcproj', - guid='{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}') - -env.ChromeMSVSProject('$CHROME_DIR/browser/resources/browser_resources.vcproj', - guid='{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}') - -env.ChromeMSVSProject('$CHROME_DIR/installer/gcapi/gcapi_dll.vcproj', - dependencies = [ - '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', - ], - guid='{B802A2FE-E4E2-4F5A-905A-D5128875C954}') - -env.ChromeMSVSProject('$CHROME_DIR/installer/gcapi/gcapi_lib.vcproj', - dependencies = [ - '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', - ], - guid='{CD2FD73A-6AAB-4886-B887-760D18E8B635}') - -env.ChromeMSVSProject('$CHROME_DIR/installer/gcapi/gcapi_test.vcproj', - dependencies = [ - '$CHROME_DIR/installer/gcapi/gcapi_dll.vcproj', - '$CHROME_DIR/installer/gcapi/gcapi_lib.vcproj', - ], - guid='{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}') - -env.ChromeMSVSProject('$CHROME_DIR/installer/util/installer_unittests.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - ], - guid='{903F8C1E-537A-4C9E-97BE-075147CBE769}') - -env.ChromeMSVSProject('$CHROME_DIR/installer/util/prebuild/util_prebuild.vcproj', - guid='{0026A376-C4F1-4575-A1BA-578C69F07013}') - - -env.ChromeMSVSFolder('terms', - items = [ - # No $CHROME_DIR prefix because these go straight into - # the .sln file without substitution. - 'app/resources/terms/terms_ar.html', - 'app/resources/terms/terms_bg.html', - 'app/resources/terms/terms_bn.html', - 'app/resources/terms/terms_ca.html', - 'app/resources/terms/terms_chromium.html', - 'app/resources/terms/terms_cs.html', - 'app/resources/terms/terms_da.html', - 'app/resources/terms/terms_de.html', - 'app/resources/terms/terms_el.html', - 'app/resources/terms/terms_en-GB.html', - 'app/resources/terms/terms_en.html', - 'app/resources/terms/terms_es-419.html', - 'app/resources/terms/terms_es.html', - 'app/resources/terms/terms_et.html', - 'app/resources/terms/terms_fi.html', - 'app/resources/terms/terms_fil.html', - 'app/resources/terms/terms_fr.html', - 'app/resources/terms/terms_gu.html', - 'app/resources/terms/terms_he.html', - 'app/resources/terms/terms_hi.html', - 'app/resources/terms/terms_hr.html', - 'app/resources/terms/terms_hu.html', - 'app/resources/terms/terms_id.html', - 'app/resources/terms/terms_it.html', - 'app/resources/terms/terms_ja.html', - 'app/resources/terms/terms_kn.html', - 'app/resources/terms/terms_ko.html', - 'app/resources/terms/terms_lt.html', - 'app/resources/terms/terms_lv.html', - 'app/resources/terms/terms_ml.html', - 'app/resources/terms/terms_mr.html', - 'app/resources/terms/terms_nb.html', - 'app/resources/terms/terms_nl.html', - 'app/resources/terms/terms_or.html', - 'app/resources/terms/terms_pl.html', - 'app/resources/terms/terms_pt-BR.html', - 'app/resources/terms/terms_pt-PT.html', - 'app/resources/terms/terms_ro.html', - 'app/resources/terms/terms_ru.html', - 'app/resources/terms/terms_sk.html', - 'app/resources/terms/terms_sl.html', - 'app/resources/terms/terms_sr.html', - 'app/resources/terms/terms_sv.html', - 'app/resources/terms/terms_ta.html', - 'app/resources/terms/terms_te.html', - 'app/resources/terms/terms_th.html', - 'app/resources/terms/terms_tr.html', - 'app/resources/terms/terms_uk.html', - 'app/resources/terms/terms_vi.html', - 'app/resources/terms/terms_zh-CN.html', - 'app/resources/terms/terms_zh-TW.html', - ], - guid='{D13F055D-4428-48F4-ABF6-18359C76EDB0}') - -env.ChromeMSVSFolder('locales', - entries = [ - env.ChromeMSVSFolder('terms'), - - '$CHROME_DIR/app/locales/ar.vcproj', - '$CHROME_DIR/app/locales/bg.vcproj', - '$CHROME_DIR/app/locales/bn.vcproj', - '$CHROME_DIR/app/locales/ca.vcproj', - '$CHROME_DIR/app/locales/cs.vcproj', - '$CHROME_DIR/app/locales/da.vcproj', - '$CHROME_DIR/app/locales/de.vcproj', - '$CHROME_DIR/app/locales/el.vcproj', - '$CHROME_DIR/app/locales/en-GB.vcproj', - '$CHROME_DIR/app/locales/en-US.vcproj', - '$CHROME_DIR/app/locales/es.vcproj', - '$CHROME_DIR/app/locales/es-419.vcproj', - '$CHROME_DIR/app/locales/et.vcproj', - '$CHROME_DIR/app/locales/fi.vcproj', - '$CHROME_DIR/app/locales/fil.vcproj', - '$CHROME_DIR/app/locales/fr.vcproj', - '$CHROME_DIR/app/locales/gu.vcproj', - '$CHROME_DIR/app/locales/he.vcproj', - '$CHROME_DIR/app/locales/hi.vcproj', - '$CHROME_DIR/app/locales/hr.vcproj', - '$CHROME_DIR/app/locales/hu.vcproj', - '$CHROME_DIR/app/locales/id.vcproj', - '$CHROME_DIR/app/locales/it.vcproj', - '$CHROME_DIR/app/locales/ja.vcproj', - '$CHROME_DIR/app/locales/kn.vcproj', - '$CHROME_DIR/app/locales/ko.vcproj', - '$CHROME_DIR/app/locales/lt.vcproj', - '$CHROME_DIR/app/locales/lv.vcproj', - '$CHROME_DIR/app/locales/ml.vcproj', - '$CHROME_DIR/app/locales/mr.vcproj', - '$CHROME_DIR/app/locales/nb.vcproj', - '$CHROME_DIR/app/locales/nl.vcproj', - '$CHROME_DIR/app/locales/or.vcproj', - '$CHROME_DIR/app/locales/pl.vcproj', - '$CHROME_DIR/app/locales/pt-BR.vcproj', - '$CHROME_DIR/app/locales/pt-PT.vcproj', - '$CHROME_DIR/app/locales/ro.vcproj', - '$CHROME_DIR/app/locales/ru.vcproj', - '$CHROME_DIR/app/locales/sk.vcproj', - '$CHROME_DIR/app/locales/sl.vcproj', - '$CHROME_DIR/app/locales/sr.vcproj', - '$CHROME_DIR/app/locales/sv.vcproj', - '$CHROME_DIR/app/locales/ta.vcproj', - '$CHROME_DIR/app/locales/te.vcproj', - '$CHROME_DIR/app/locales/th.vcproj', - '$CHROME_DIR/app/locales/tr.vcproj', - '$CHROME_DIR/app/locales/uk.vcproj', - '$CHROME_DIR/app/locales/vi.vcproj', - '$CHROME_DIR/app/locales/zh-CN.vcproj', - '$CHROME_DIR/app/locales/zh-TW.vcproj', - ], - items = [ - # No $CHROME_DIR because this goes straight into - # the .sln file with no substitution. - 'app/locales/locale_settings.h', - ], - guid='{2325D8C4-8EF5-42AC-8900-492225750DE4}') - -env.ChromeMSVSFolder('App', - entries = [ - env.ChromeMSVSFolder('locales'), - '$CHROME_DIR/app/chrome_dll.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - '$CHROME_DIR/app/theme/theme_dll.vcproj', - ], - guid='{B6867423-23BD-4588-9321-2D500F128A3D}') - -env.ChromeMSVSFolder('Browser', - entries = [ - '$CHROME_DIR/browser/browser.vcproj', - '$CHROME_DIR/browser/resources/browser_resources.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$CHROME_DIR/browser/debugger/debugger.vcproj', - '$GEARS_DIR/gears.vcproj', - '$CHROME_DIR/plugin/plugin.vcproj', - '$CHROME_DIR/renderer/renderer.vcproj', - '$RLZ_DIR/rlz.vcproj', - '$CHROME_DIR/views/views.vcproj', - ], - guid='{97555540-8163-4D0F-BCAC-EFA0FFED3453}') - -env.ChromeMSVSFolder('Installer', - entries = [ - '$CHROME_DIR/installer/gcapi/gcapi_dll.vcproj', - '$CHROME_DIR/installer/gcapi/gcapi_lib.vcproj', - '$CHROME_DIR/installer/mini_installer/mini_installer.vcproj', - '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', - '$CHROME_DIR/installer/setup/setup.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - '$CHROME_DIR/installer/util/prebuild/util_prebuild.vcproj', - ], - guid='{EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}') - -env.ChromeMSVSFolder('Breakpad', - entries = [ - '$BREAKPAD_DIR/breakpad_handler.vcproj', - '$BREAKPAD_DIR/breakpad_sender.vcproj', - ], - guid='{873D095E-150E-4262-8C41-2D8ED02F0F57}') - -env.ChromeMSVSFolder('icu', - entries = [ - '$ICU38_DIR/build/icu.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - ], - guid='{1AFC1EC3-24FA-4260-B099-76319EC9977A}') - -env.ChromeMSVSFolder('chrome libxml projects', - name='libxml projects', - entries = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - '$LIBXML_DIR/build/libxml.vcproj', - ], - guid='{032541FB-1E7C-4423-B657-4A71FE180C8A}') - -env.ChromeMSVSFolder('chrome libxslt projects', - name='libxslt projects', - entries = [ - '$LIBXSLT_DIR/build/libxslt_config.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - ], - guid='{BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}') - -env.ChromeMSVSFolder('Libraries', - entries = [ - env.ChromeMSVSFolder('Breakpad'), - env.ChromeMSVSFolder('icu'), - env.ChromeMSVSFolder('chrome libxml projects'), - env.ChromeMSVSFolder('chrome libxslt projects'), - '$BASE_DIR/build/base.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$BSPATCH_DIR/bspatch.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$BASE_DIR/build/debug_message.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$LZMA_SDK_DIR/7z_C.vcproj', - '$MEDIA_DIR/build/media.vcproj', - '../tools/memory_watcher/memory_watcher.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$NET_DIR/build/net.vcproj', - '$NET_DIR/build/net_resources.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$SKIA_DIR/skia.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - '$ZLIB_DIR/zlib.vcproj', - ], - guid='{EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}') - -env.ChromeMSVSFolder('V8', - entries = [ - '$V8_DIR/tools/visual_studio/v8.vcproj', - '$V8_DIR/tools/visual_studio/v8_base.vcproj', - '$V8_DIR/tools/visual_studio/v8_mksnapshot.vcproj', - '$V8_DIR/tools/visual_studio/v8_shell_sample.vcproj', - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - ], - guid='{B353A6A5-9551-4B76-908E-0F0A9B31E4CE}') - -env.ChromeMSVSFolder('Test', - entries = [ - '$CHROME_DIR/test/activex_test_control/activex_test_control.vcproj', - '$CHROME_DIR/test/automated_ui_tests/automated_ui_tests.vcproj', - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base_unittests.vcproj', - '$CHROME_DIR/installer/gcapi/gcapi_test.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$CHROME_DIR/tools/test/image_diff/image_diff.vcproj', - '$CHROME_DIR/installer/util/installer_unittests.vcproj', - '$CHROME_DIR/test/interactive_ui/interactive_ui.vcproj', - '$CHROME_DIR/common/ipc_tests.vcproj', - '$MEDIA_DIR/build/media_unittests.vcproj', - '$CHROME_DIR/test/memory_test/memory_test.vcproj', - '$CHROME_DIR/test/mini_installer_test/mini_installer_test.vcproj', - '$NET_DIR/build/net_perftests.vcproj', - '$NET_DIR/build/net_unittests.vcproj', - '$WEBKIT_DIR/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.vcproj', - '$WEBKIT_DIR/glue/plugins/test/npapi_test_plugin.vcproj', - '$CHROME_DIR/test/page_cycler/page_cycler_tests.vcproj', - '$CHROME_DIR/test/perf/perftests.vcproj', - '$CHROME_DIR/test/plugin/plugin_tests.vcproj', - '$CHROME_DIR/test/reliability/reliability_tests.vcproj', - '$CHROME_DIR/test/security_tests/security_tests.vcproj', - '$CHROME_DIR/test/selenium/selenium_tests.vcproj', - '$CHROME_DIR/test/startup/startup_tests.vcproj', - '$CHROME_DIR/test/tab_switching/tab_switching.vcproj', - '$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj', - '$WEBKIT_DIR/tools/test_shell/test_shell.vcproj', - '$WEBKIT_DIR/tools/test_shell/test_shell_tests.vcproj', - '$CHROME_DIR/test/ui/ui_tests.vcproj', - '$CHROME_DIR/test/unit/unittests.vcproj', - ], - guid='{1174D37F-6ABB-45DA-81B3-C631281273B7}') - -env.ChromeMSVSFolder('Tools', - entries = [ - '$BSDIFF_DIR/bsdiff.vcproj', - '$CHROME_DIR/tools/convert_dict/convert_dict.vcproj', - '$CHROME_DIR/tools/crash_service/crash_service.vcproj', - '$CHROME_DIR/tools/perf/flush_cache/flush_cache.vcproj', - '$CHROME_DIR/tools/profiles/generate_profile.vcproj', - # Not until we actually want to support C# projects. - #'$CHROME_SRC_DIR/tools/stats_viewer/stats_viewer.csproj', - '$NET_DIR/build/tld_cleanup.vcproj', - ], - guid='{846901FD-A619-4BD5-A303-38174730CDD6}') - -env.ChromeMSVSFolder('WebKit (readonly)', - entries = [ - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - - ], - guid='{1088577A-0C49-4DE0-85CD-B68AD0BE55AA}') - -env.ChromeMSVSFolder('WebKit (ours)', - entries = [ - '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', - '$WEBKIT_DIR/activex_shim_dll/activex_shim_dll.vcproj', - '$WEBKIT_DIR/build/port/port.vcproj', - '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', - '$WEBKIT_DIR/build/localized_strings/localized_strings.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - ], - guid='{CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}') - - -solution = env.ChromeMSVSSolution('chrome.sln', - dest='$CHROME_SRC_DIR/chrome/chrome.sln', - entries = [ - env.ChromeMSVSFolder('App'), - env.ChromeMSVSFolder('Browser'), - '$CHROME_DIR/browser/browser.vcproj', - '$CHROME_DIR/renderer/renderer.vcproj', - '$CHROME_DIR/common/ipc_tests.vcproj', - '$CHROME_DIR/common/common.vcproj', - env.ChromeMSVSFolder('WebKit (readonly)'), - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$WEBKIT_DIR/build/port/port.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$SKIA_DIR/skia.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - '$CHROME_DIR/views/views.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - env.ChromeMSVSFolder('Libraries'), - env.ChromeMSVSFolder('WebKit (ours)'), - '$CHROME_DIR/test/automation/automation.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - env.ChromeMSVSFolder('icu'), - '$LIBPNG_DIR/libpng.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$CHROME_DIR/tools/test/image_diff/image_diff.vcproj', - env.ChromeMSVSFolder('Breakpad'), - '$BREAKPAD_DIR/breakpad_handler.vcproj', - '$BREAKPAD_DIR/breakpad_sender.vcproj', - '$LIBXML_DIR/build/libxml.vcproj', - '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - '$LZMA_SDK_DIR/7z_C.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$CHROME_DIR/app/chrome_dll.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$WEBKIT_DIR/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.vcproj', - '$WEBKIT_DIR/tools/test_shell/test_shell.vcproj', - '$CHROME_DIR/plugin/plugin.vcproj', - env.ChromeMSVSFolder('V8'), - '$CHROME_DIR/app/chrome_exe.vcproj', - '$CHROME_DIR/test/perf/perftests.vcproj', - '$CHROME_DIR/test/unit/unittests.vcproj', - env.ChromeMSVSFolder('Test'), - '$CHROME_DIR/test/page_cycler/page_cycler_tests.vcproj', - '$CHROME_DIR/test/reliability/reliability_tests.vcproj', - '$CHROME_DIR/test/selenium/selenium_tests.vcproj', - '$CHROME_DIR/test/startup/startup_tests.vcproj', - '$CHROME_DIR/test/ui/ui_tests.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - env.ChromeMSVSFolder('Tools'), - '$CHROME_DIR/tools/profiles/generate_profile.vcproj', - '$WEBKIT_DIR/tools/test_shell/test_shell_tests.vcproj', - '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', - # Not until we actually want to support C# projects. - #'$CHROME_SRC_DIR/tools/stats_viewer/stats_viewer.csproj', - '$CHROME_DIR/app/locales/en-US.vcproj', - env.ChromeMSVSFolder('locales'), - '$CHROME_DIR/browser/resources/browser_resources.vcproj', - '$WEBKIT_DIR/build/localized_strings/localized_strings.vcproj', - '$CHROME_DIR/app/theme/theme_dll.vcproj', - '$CHROME_DIR/test/security_tests/security_tests.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$WEBKIT_DIR/glue/plugins/test/npapi_test_plugin.vcproj', - '$CHROME_DIR/tools/perf/flush_cache/flush_cache.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - '$NET_DIR/build/net.vcproj', - '$NET_DIR/build/tld_cleanup.vcproj', - '$NET_DIR/build/net_unittests.vcproj', - '$NET_DIR/build/net_perftests.vcproj', - '$MEDIA_DIR/build/media.vcproj', - '$MEDIA_DIR/build/media_unittests.vcproj', - '$BASE_DIR/build/base.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base_unittests.vcproj', - '$CHROME_DIR/test/plugin/plugin_tests.vcproj', - '$CHROME_DIR/test/interactive_ui/interactive_ui.vcproj', - env.ChromeMSVSFolder('Installer'), - '$CHROME_DIR/installer/setup/setup.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - '$CHROME_DIR/installer/mini_installer/mini_installer.vcproj', - '$BSDIFF_DIR/bsdiff.vcproj', - '$BSPATCH_DIR/bspatch.vcproj', - '$CHROME_DIR/installer/util/installer_unittests.vcproj', - '$WEBKIT_DIR/activex_shim_dll/activex_shim_dll.vcproj', - '$CHROME_DIR/app/locales/da.vcproj', - '$CHROME_DIR/test/activex_test_control/activex_test_control.vcproj', - env.ChromeMSVSFolder('chrome libxml projects'), - '$LIBXML_DIR/build/libxml_config.vcproj', - env.ChromeMSVSFolder('chrome libxslt projects'), - '$LIBXSLT_DIR/build/libxslt_config.vcproj', - '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', - '$CHROME_DIR/app/locales/zh-TW.vcproj', - '$CHROME_DIR/app/locales/he.vcproj', - '$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj', - '$CHROME_DIR/test/automated_ui_tests/automated_ui_tests.vcproj', - '$CHROME_DIR/test/mini_installer_test/mini_installer_test.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', - '$GEARS_DIR/gears.vcproj', - '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj', - env.ChromeMSVSFolder('terms'), - '$CHROME_DIR/app/locales/ar.vcproj', - '$CHROME_DIR/app/locales/bg.vcproj', - '$CHROME_DIR/app/locales/ca.vcproj', - '$CHROME_DIR/app/locales/cs.vcproj', - '$CHROME_DIR/app/locales/de.vcproj', - '$CHROME_DIR/app/locales/el.vcproj', - '$CHROME_DIR/app/locales/en-GB.vcproj', - '$CHROME_DIR/app/locales/es.vcproj', - '$CHROME_DIR/app/locales/et.vcproj', - '$CHROME_DIR/app/locales/fi.vcproj', - '$CHROME_DIR/app/locales/fil.vcproj', - '$CHROME_DIR/app/locales/fr.vcproj', - '$CHROME_DIR/app/locales/hi.vcproj', - '$CHROME_DIR/app/locales/hr.vcproj', - '$CHROME_DIR/app/locales/hu.vcproj', - '$CHROME_DIR/app/locales/id.vcproj', - '$CHROME_DIR/app/locales/it.vcproj', - '$CHROME_DIR/app/locales/ja.vcproj', - '$CHROME_DIR/app/locales/ko.vcproj', - '$CHROME_DIR/app/locales/lt.vcproj', - '$CHROME_DIR/app/locales/lv.vcproj', - '$CHROME_DIR/app/locales/nl.vcproj', - '$CHROME_DIR/app/locales/nb.vcproj', - '$CHROME_DIR/app/locales/pl.vcproj', - '$CHROME_DIR/app/locales/pt-BR.vcproj', - '$CHROME_DIR/app/locales/pt-PT.vcproj', - '$CHROME_DIR/app/locales/ro.vcproj', - '$CHROME_DIR/app/locales/ru.vcproj', - '$CHROME_DIR/app/locales/sk.vcproj', - '$CHROME_DIR/app/locales/sl.vcproj', - '$CHROME_DIR/app/locales/sr.vcproj', - '$CHROME_DIR/app/locales/th.vcproj', - '$CHROME_DIR/app/locales/sv.vcproj', - '$CHROME_DIR/app/locales/tr.vcproj', - '$CHROME_DIR/app/locales/uk.vcproj', - '$CHROME_DIR/app/locales/vi.vcproj', - '$CHROME_DIR/app/locales/zh-CN.vcproj', - '$CHROME_DIR/tools/crash_service/crash_service.vcproj', - '../tools/memory_watcher/memory_watcher.vcproj', - '$RLZ_DIR/rlz.vcproj', - '$CHROME_DIR/app/locales/es-419.vcproj', - '$CHROME_DIR/test/tab_switching/tab_switching.vcproj', - '$CHROME_DIR/installer/util/prebuild/util_prebuild.vcproj', - '$CHROME_DIR/tools/convert_dict/convert_dict.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$CHROME_DIR/browser/debugger/debugger.vcproj', - '$CHROME_DIR/test/memory_test/memory_test.vcproj', - '$V8_DIR/tools/visual_studio/v8_base.vcproj', - '$V8_DIR/tools/visual_studio/v8.vcproj', - '$V8_DIR/tools/visual_studio/v8_mksnapshot.vcproj', - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - '$V8_DIR/tools/visual_studio/v8_shell_sample.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$CHROME_DIR/app/locales/kn.vcproj', - '$CHROME_DIR/app/locales/bn.vcproj', - '$CHROME_DIR/app/locales/gu.vcproj', - '$CHROME_DIR/app/locales/ml.vcproj', - '$CHROME_DIR/app/locales/mr.vcproj', - '$CHROME_DIR/app/locales/or.vcproj', - '$CHROME_DIR/app/locales/ta.vcproj', - '$CHROME_DIR/app/locales/te.vcproj', - '$CHROME_DIR/installer/gcapi/gcapi_lib.vcproj', - '$CHROME_DIR/installer/gcapi/gcapi_dll.vcproj', - '$CHROME_DIR/installer/gcapi/gcapi_test.vcproj', - '$NET_DIR/build/net_resources.vcproj', - ], - variants = [ - 'Debug|Win32', - 'Release|Win32', - ]) diff --git a/chrome/common/common.scons b/chrome/common/common.scons deleted file mode 100644 index 66b9add..0000000 --- a/chrome/common/common.scons +++ /dev/null @@ -1,371 +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. - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$BREAKPAD_DIR/using_breakpad.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app', - '$CHROME_SRC_DIR', - ], -) - -env.Append( - CPPPATH = [ - '$WEBKIT_DIR/build/localized_strings', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -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('extensions', [ - 'extensions/url_pattern.cc', - 'extensions/url_pattern.h', - 'extensions/user_script.cc', - 'extensions/user_script.h', - ]), - MSVSFilter('net', [ - 'net/cookie_monster_sqlite.cc', - 'net/cookie_monster_sqlite.h', - 'net/dns.h', - 'net/url_request_intercept_job.cc', - 'net/url_request_intercept_job.h', - ]), - MSVSFilter('gfx', [ - 'gfx/chrome_canvas.cc', - 'gfx/chrome_canvas.h', - 'gfx/chrome_canvas_skia.cc', - 'gfx/chrome_canvas_win.cc', - 'gfx/chrome_font.h', - 'gfx/chrome_font_gtk.cc', - 'gfx/chrome_font_skia.cc', - 'gfx/chrome_font_win.cc', - 'gfx/color_utils.cc', - 'gfx/color_utils.h', - 'gfx/emf.cc', - 'gfx/emf.h', - 'gfx/favicon_size.h', - 'gfx/icon_util.cc', - 'gfx/icon_util.h', - 'gfx/insets.h', - 'gfx/path_gtk.cc', - 'gfx/path_win.cc', - 'gfx/path.h', - 'gfx/text_elider.cc', - 'gfx/text_elider.h', - 'gfx/utils.h', - ]), - MSVSFilter('ipc', [ - 'ipc_channel.h', - 'ipc_channel_posix.cc', - 'ipc_channel_proxy.cc', - 'ipc_channel_proxy.h', - 'ipc_channel_win.cc', - 'ipc_logging.cc', - 'ipc_logging.h', - 'ipc_message.cc', - 'ipc_message.h', - 'ipc_message_macros.h', - 'ipc_message_utils.cc', - 'ipc_message_utils.h', - 'ipc_sync_channel.cc', - 'ipc_sync_channel.h', - 'ipc_sync_message.cc', - 'ipc_sync_message.h', - 'plugin_messages.h', - 'plugin_messages_internal.h', - 'render_messages.h', - 'render_messages_internal.h', - 'worker_messages.h', - 'worker_messages_internal.h', - ]), - 'accessibility.h', - 'animation.cc', - 'animation.h', - 'bindings_policy.h', - 'child_process.cc', - 'child_process.h', - 'child_process_host.cc', - 'child_process_host.h', - 'child_process_info.cc', - 'child_process_info.h', - 'child_thread.cc', - 'child_thread.h', - 'chrome_constants.cc', - 'chrome_constants.h', - 'chrome_counters.cc', - 'chrome_counters.h', - 'chrome_paths.cc', - 'chrome_paths.h', - 'chrome_paths_internal.h', - 'chrome_paths_linux.cc', - 'chrome_paths_mac.cc', - 'chrome_paths_win.cc', - 'chrome_plugin_api.h', - 'chrome_plugin_lib.cc', - 'chrome_plugin_lib.h', - 'chrome_plugin_util.cc', - 'chrome_plugin_util.h', - 'chrome_process_filter.cc', - 'chrome_process_filter.h', - 'chrome_switches.cc', - 'chrome_switches.h', - 'classfactory.cc', - 'classfactory.h', - 'clipboard_service.h', - 'common_glue.cc', - 'common_resources.h', - 'debug_flags.cc', - 'debug_flags.h', - 'drag_drop_types.cc', - 'drag_drop_types.h', - 'env_vars.cc', - 'env_vars.h', - 'filter_policy.h', - 'gears_api.h', - 'json_value_serializer.cc', - 'json_value_serializer.h', - 'jstemplate_builder.cc', - 'jstemplate_builder.h', - 'l10n_util.cc', - 'l10n_util.h', - 'l10n_util_posix.cc', - 'libxml_utils.cc', - 'libxml_utils.h', - 'logging_chrome.cc', - 'logging_chrome.h', - 'main_function_params.h', - 'message_router.cc', - 'message_router.h', - 'mru_cache.h', - 'native_web_keyboard_event.h', - 'native_web_keyboard_event_linux.cc', - 'navigation_types.h', - 'notification_details.h', - 'notification_registrar.cc', - 'notification_registrar.h', - 'notification_service.cc', - 'notification_service.h', - 'notification_source.h', - 'notification_types.h', - 'os_exchange_data.cc', - 'os_exchange_data.h', - 'owned_widget_gtk.cc', - 'owned_widget_gtk.h', - 'page_transition_types.h', - 'page_zoom.h', - 'platform_util.h', - 'platform_util_linux.cc', - 'platform_util_mac.mm', - 'platform_util_win.cc', - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled.h', - 'pref_member.cc', - 'pref_member.h', - 'pref_names.cc', - 'pref_names.h', - 'pref_service.cc', - 'pref_service.h', - 'process_watcher.cc', - 'process_watcher.h', - 'property_bag.cc', - 'property_bag.h', - 'ref_counted_util.h', - 'resource_bundle.cc', - 'resource_bundle.h', - 'resource_bundle_linux.cc', - 'resource_bundle_win.cc', - 'resource_dispatcher.cc', - 'resource_dispatcher.h', - 'sandbox_init_wrapper.cc', - 'sandbox_init_wrapper.h', - 'scoped_vector.h', - 'security_filter_peer.cc', - 'security_filter_peer.h', - 'slide_animation.cc', - 'slide_animation.h', - 'sqlite_compiled_statement.cc', - 'sqlite_compiled_statement.h', - 'sqlite_utils.cc', - 'sqlite_utils.h', - 'stl_util-inl.h', - 'task_queue.cc', - 'task_queue.h', - 'throb_animation.cc', - 'throb_animation.h', - 'thumbnail_score.cc', - 'thumbnail_score.h', - 'time_format.cc', - 'time_format.h', - 'unzip.cc', - 'unzip.h', - 'url_constants.cc', - 'url_constants.h', - 'visitedlink_common.cc', - 'visitedlink_common.h', - 'win_safe_util.cc', - 'win_safe_util.h', - 'win_util.cc', - 'win_util.h', - 'worker_thread_ticker.cc', - 'worker_thread_ticker.h', -]) - -if not env.Bit('windows'): - # TODO(port): This is temporary so we can link. - input_files.Append( - 'temp_scaffolding_stubs.cc', - 'file_descriptor_set_posix.cc', - ) - - # TODO(port): Port these. - input_files.Remove( - 'chrome_process_filter.cc', - 'drag_drop_types.cc', - 'gfx/emf.cc', - 'gfx/icon_util.cc', - 'os_exchange_data.cc', - 'process_watcher.cc', - ) - -if not env.Bit('windows'): - # Windows specific files - input_files.Remove( - 'chrome_paths_win.cc', - 'classfactory.cc', - 'gfx/chrome_canvas_win.cc', - 'gfx/chrome_font_win.cc', - 'gfx/path_win.cc', - 'ipc_channel_win.cc', - 'platform_util_win.cc', - 'resource_bundle_win.cc', - 'win_safe_util.cc', - 'win_util.cc', - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - ) - -if not env.Bit('linux'): - # Linux specific files - input_files.Remove( - 'chrome_paths_linux.cc', - 'gfx/chrome_canvas_skia.cc', - 'gfx/chrome_font_gtk.cc', - 'gfx/chrome_font_skia.cc', - 'gfx/path_gtk.cc', - 'owned_widget_gtk.cc', - 'owned_widget_gtk.h', - 'platform_util_linux.cc', - 'resource_bundle_linux.cc', - ) - -if not env.Bit('mac'): - # Mac specific files - input_files.Remove( - 'chrome_paths_mac.cc', - 'platform_util_mac.mm', - ) - -if not env.Bit('posix'): - input_files.Remove( - 'ipc_channel_posix.cc', - 'l10n_util_posix.cc', - ) - -if env.Bit('windows'): - input_files.Append( - 'transport_dib_win.cc' - ) - -if env.Bit('linux'): - input_files.Append( - '$CHROME_DIR/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', - 'transport_dib_linux.cc', - 'x11_util.cc' - ) - -if env.Bit('mac'): - input_files.Append( - 'transport_dib_mac.cc' - ) - -if not env.Bit('mac'): - # TODO(port): This should be enabled for all platforms. - env.ChromeLibrary('common', input_files) - -p = env.ChromeMSVSProject('common.vcproj', - dest='$CHROME_SRC_DIR/chrome/common/common.vcproj', - guid='{899F1280-3441-4D1F-BA04-CCD6208D9146}', - keyword='Win32Proj', - dependencies = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/common/ipc_tests.scons b/chrome/common/ipc_tests.scons deleted file mode 100644 index aaa926284..0000000 --- a/chrome/common/ipc_tests.scons +++ /dev/null @@ -1,187 +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. - -Import('env', 'env') - -env = env.Clone() - -env.SConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', # needed for logging - '$CHROME_SRC_DIR/build/using_googleurl.scons', # needed for logging - '$BREAKPAD_DIR/using_breakpad.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$NET_DIR/using_net.scons', # needed for logging - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -# needed for logging -env.Append( - LIBS = [ - 'glue', - 'WTF', - 'WebKit', - - 'bzip2', - 'X11', - 'Xrender', - 'Xext', - - 'media', - 'sdch', - 'views', - - 'hunspell', - 'printing', - 'modp_b64', - 'debugger', - ], -) - -if env.Bit('posix'): - env.SConscript([ - '$LIBEVENT_DIR/using_libevent.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', # needed for shared link deps - '$LIBXSLT_DIR/using_libxslt.scons', # needed for shared link deps - ], {'env':env}) - # needed for shared link deps - env.Append( - LIBS = [ - 'JavaScriptCore_pcre', - 'V8Bindings', - 'WebCore', - 'browser', - 'port', - 'renderer', - 'sqlite', - ] - ) - -# TODO(sgk): convert into a using_*.scons pattern when we update WebKit. -env.Append( - CPPPATH = [ - '$WEBKIT_DIR/build/localized_strings', - ], -) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app/resources', - '$CHROME_DIR/app', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'common', - ] -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -if env.Bit('windows'): - env.Append( - LINKFLAGS = [ - '/INCREMENTAL', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - ], - LIBS = [ - 'rpcrt4', - 'shlwapi', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - 'ipc_fuzzing_tests.cc', - 'ipc_send_fds_test.cc', - 'ipc_tests.cc', - 'ipc_tests.h', - '$BASE_DIR/perftimer$OBJSUFFIX', -]) - -ipc_tests = env.ChromeTestProgram('ipc_tests', input_files) -i = env.Install('$TARGET_ROOT', ipc_tests) -Alias('chrome', i) - -p = env.ChromeMSVSProject('ipc_tests.vcproj', - dest='$CHROME_SRC_DIR/chrome/common/ipc_tests.vcproj', - guid='{B92AE829-E1CD-4781-824A-DCB1603A1672}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies=[ - 'shlwapi.lib', - 'rpcrt4.lib', - 'winmm.lib' - ], - 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', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) diff --git a/chrome/installer/mini_installer/mini_installer.scons b/chrome/installer/mini_installer/mini_installer.scons deleted file mode 100644 index c4c4ae8..0000000 --- a/chrome/installer/mini_installer/mini_installer.scons +++ /dev/null @@ -1,232 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$GTEST_DIR/../using_gtest.scons', -]) - - -# TODO(port): Don't be too fooled by the presence of all the -# if env.Bit('windows') tests in this file into thinking -# this is necessarily portable. They're just there to wall off the -# obviously windows-specific things - -if env.Bit('windows'): - env_res = env.Clone() - - env_res.Append( - CPPPATH = [ - "$DESTINATION_ROOT", - ".", - "$CHROME_SRC_DIR", - ], - RCFLAGS = [ - ["/l", "0x409"], - ], - ) - - resources = env_res.RES('mini_installer.rc') - - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'chrome', - ], -) - -if env.Bit('windows'): - env.FilterOut( - LIBS = ['DelayImp.lib'], - CCFLAGS = ['/RTC1'], - ) - - env.Prepend( - CCFLAGS = [ - '/TP', - '/GS-', # because we link with /NODEFAULTLIB - ], - LINKFLAGS = [ - '/INCREMENTAL', - '/NODEFAULTLIB', - '/DEBUG', - '/SUBSYSTEM:WINDOWS', - '/OPT:NOWIN98', - '/ENTRY:"MainEntryPoint"', - '/MACHINE:X86', - '/FIXED:No', - - '/SAFESEH:NO', - '/NXCOMPAT', - '/DYNAMICBASE:NO', - - '/PDB:${TARGETS[1]}', - #'/MAP:${TARGETS[2]}', - ], - LIBS = [ - 'shlwapi', - ], - ) - -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('resources', [ - 'mini_installer.ico', - 'mini_installer.rc', - 'mini_installer_exe_version.rc.version', - 'mini_installer_resource.h', - ]), - 'chrome.release', - 'mini_installer.cc', - 'mini_installer.h', - 'pe_resource.cc', - 'pe_resource.h', -]) - -if env.Bit('windows'): - additional_dependencies = [ - "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", - "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", - ] - -# TODO(port): -if env.Bit('windows'): - env.ChromeProgram('mini_installer', - input_files + additional_dependencies + resources) - - -env.AppendENVPath('PATH', r'C:\WINDOWS\system32') - -# TODO(port): -if env.Bit('windows'): - packed = env.Command('$DESTINATION_ROOT/packed_files.txt', - [('$CHROME_DIR/tools/' - + 'build/win/create_installer_archive.py'), - '$CHROME_DIR/installer/mini_installer/chrome.release'], - ('$PYTHON ${SOURCES[0]}' - ' --output_dir=${TARGET.dir}' - ' --input_file=${SOURCES[1]}')) - env.Depends(packed, '$DESTINATION_ROOT/setup.exe') - - # mini_installer.rc depends on the generated packed_files.txt - # TODO(sgk): implicit dependency should be picked up automatically - env.Depends(resources, packed) - - -# TODO(port): -if env.Bit('windows'): - exe_version_rc = env.ChromeVersionRC('mini_installer_exe_version.rc', - 'mini_installer_exe_version.rc.version', - PWD=Dir('.')) - - # TODO(sgk): implicit dependency should be picked up automatically - env_res.Depends(resources, exe_version_rc) - -p = env.ChromeMSVSProject('mini_installer.vcproj', - dest=('$CHROME_SRC_DIR/chrome/installer/' - + 'mini_installer/mini_installer.vcproj'), - guid='{24A5AC7C-280B-4899-9153-6BA570A081E7}', - keyword='Win32Proj', - dependencies = [ - '$CHROME_DIR/app/locales/et.vcproj', - '$CHROME_DIR/app/locales/pt-PT.vcproj', - '$CHROME_DIR/app/locales/fr.vcproj', - '$CHROME_DIR/app/locales/uk.vcproj', - '$CHROME_DIR/installer/setup/setup.vcproj', - '$CHROME_DIR/app/locales/th.vcproj', - '$CHROME_DIR/app/locales/hi.vcproj', - '$CHROME_DIR/app/locales/gu.vcproj', - '$CHROME_DIR/app/locales/it.vcproj', - '$CHROME_DIR/app/locales/pt-BR.vcproj', - '$CHROME_DIR/app/locales/sr.vcproj', - '$CHROME_DIR/app/locales/ko.vcproj', - '$CHROME_DIR/app/locales/en-GB.vcproj', - '$CHROME_DIR/app/locales/fil.vcproj', - '$CHROME_DIR/app/locales/ar.vcproj', - '$CHROME_DIR/app/locales/kn.vcproj', - '$CHROME_DIR/app/locales/bn.vcproj', - '$CHROME_DIR/app/locales/es.vcproj', - '$CHROME_DIR/app/locales/bg.vcproj', - '$CHROME_DIR/app/locales/nl.vcproj', - '$CHROME_DIR/app/locales/fi.vcproj', - '$CHROME_DIR/app/locales/tr.vcproj', - '$CHROME_DIR/app/locales/ta.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$CHROME_DIR/app/locales/ru.vcproj', - '$CHROME_DIR/app/locales/cs.vcproj', - '$CHROME_DIR/app/locales/lt.vcproj', - '$CHROME_DIR/app/locales/sk.vcproj', - ('$CHROME_DIR/tools/crash_service/' + - 'crash_service.vcproj'), - '$CHROME_DIR/app/locales/te.vcproj', - '$CHROME_DIR/app/locales/pl.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - '$CHROME_DIR/app/locales/he.vcproj', - '$CHROME_DIR/app/locales/mr.vcproj', - '$CHROME_DIR/app/locales/da.vcproj', - '$CHROME_DIR/app/locales/lv.vcproj', - '$CHROME_DIR/app/locales/hu.vcproj', - '$CHROME_DIR/app/locales/sv.vcproj', - '$CHROME_DIR/app/locales/ja.vcproj', - '$CHROME_DIR/app/locales/nb.vcproj', - '$CHROME_DIR/app/locales/de.vcproj', - '$RLZ_DIR/rlz.vcproj', - '$CHROME_DIR/app/chrome_dll.vcproj', - '$CHROME_DIR/app/locales/zh-CN.vcproj', - '$CHROME_DIR/app/locales/sl.vcproj', - '$CHROME_DIR/app/locales/ro.vcproj', - '$CHROME_DIR/app/locales/ml.vcproj', - '$CHROME_DIR/app/locales/en-US.vcproj', - '$CHROME_DIR/app/locales/hr.vcproj', - '$CHROME_DIR/app/locales/el.vcproj', - '$CHROME_DIR/app/locales/vi.vcproj', - '$CHROME_DIR/app/locales/or.vcproj', - '$BSDIFF_DIR/bsdiff.vcproj', - '$CHROME_DIR/app/locales/id.vcproj', - '$CHROME_DIR/app/locales/zh-TW.vcproj', - '$CHROME_DIR/app/locales/ca.vcproj', - '$CHROME_DIR/app/locales/es-419.vcproj', - '$CHROME_DIR/app/theme/theme_dll.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - MSVSTool('create installer archive', - LastChromeInstaller='$(LAST_CHROME_INSTALLER)', - LastChromeVersion='$(LAST_CHROME_VERSION)', - SkipRebuildArchive='$(SKIP_REBUILD_CHROME_ARCHIVE)' - ), - 'Version', - 'VCCLCompilerTool', - 'VCResourceCompilerTool', - 'VCLinkerTool', - 'VCManifestTool', - ], - ConfigurationType='1') - -p.AddToolFile('$CHROME_DIR/tools/build/win/release.rules') -p.AddToolFile('$CHROME_DIR/tools/build/win/version.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './mini_installer_debug.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './mini_installer_release.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) diff --git a/chrome/installer/setup/setup.scons b/chrome/installer/setup/setup.scons deleted file mode 100644 index 260d0e6..0000000 --- a/chrome/installer/setup/setup.scons +++ /dev/null @@ -1,147 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BSPATCH_DIR/using_bspatch.scons', - '$ICU38_DIR/using_icu38.scons', - '$LZMA_SDK_DIR/using_lzma_sdk.scons', -]) - -if env.Bit('windows'): - env_res = env.Clone() - - env_res.Append( - CPPPATH = [ - ".", - "$CHROME_SRC_DIR", - "$CHROME_DIR/installer/util", - ], - RCFLAGS = [ - ["/l", "0x409"], - ], - ) - - resources = env_res.RES('setup.rc') - - # TODO(sgk): implicit dependency should be picked up automatically - env_res.Depends(resources, - '$CHROME_DIR/installer/util/installer_util_strings.rc') - - -env.Prepend( - CPPPATH = [ - '../util', - '.', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'common', - 'util', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/OPT:NOWIN98', - '/SUBSYSTEM:WINDOWS', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/PDB:${TARGETS[1]}', - ], - LIBS = [ - 'msi', - ], - ) - -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('resources', [ - 'setup.ico', - 'setup.rc', - 'setup_exe_version.rc.version', - 'setup_resource.h', - ]), - 'install.cc', - 'main.cc', - 'setup.cc', - 'setup.h', - 'setup_constants.cc', - 'setup_constants.h', - 'uninstall.cc', - 'uninstall.h', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeProgram('setup', resources + input_files[1:]) - -p = env.ChromeMSVSProject('setup.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'installer/setup/setup.vcproj'), - guid='{21C76E6E-8B38-44D6-8148-B589C13B9554}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$LZMA_SDK_DIR/7z_C.vcproj', - '$BSPATCH_DIR/bspatch.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'Version', - 'VCCLCompilerTool', - 'VCResourceCompilerTool', - 'VCLinkerTool', - 'VCManifestTool', - ], - ConfigurationType='1') - -p.AddToolFile('$CHROME_DIR/tools/build/win/version.rules') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './setup_debug.vsprops', - '$(SolutionDir)installer/util/using_util.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './setup_release.vsprops', - '$(SolutionDir)installer/util/using_util.vsprops', - ]) - -# TODO(port): -if env.Bit('windows'): - exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc', - 'setup_exe_version.rc.version', - PWD = env.Dir('.')) - - # TODO(sgk): implicit dependency should be picked up automatically - env_res.Depends(resources, exe_version_rc) diff --git a/chrome/installer/util/installer_unittests.scons b/chrome/installer/util/installer_unittests.scons deleted file mode 100644 index f5e4b1f..0000000 --- a/chrome/installer/util/installer_unittests.scons +++ /dev/null @@ -1,136 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'common', - 'util', - ], -) - -if env.Bit('windows'): - env.FilterOut( - LIBS = ['DelayImp.lib'], - ) - - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'rpcrt4', - 'shlwapi', - ], - ) - -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', [ - 'run_all_unittests.cc', - ]), - MSVSFilter('tests', [ - 'copy_tree_work_item_unittest.cc', - 'create_dir_work_item_unittest.cc', - 'create_reg_key_work_item_unittest.cc', - 'delete_reg_value_work_item_unittest.cc', - 'delete_tree_work_item_unittest.cc', - 'helper_unittest.cc', - 'google_chrome_distribution_unittest.cc', - 'set_reg_value_work_item_unittest.cc', - '../setup/setup_constants$OBJSUFFIX', - 'work_item_list_unittest.cc', - ]), -]) - - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('installer_unittests', input_files) - -p = env.ChromeMSVSProject('installer_unittests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'installer/util/installer_unittests.vcproj'), - guid='{903F8C1E-537A-4C9E-97BE-075147CBE769}', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=( - '$(SolutionDir)installer/' - + 'mini_installer/' - + 'mini_installer.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)/tools/build/win/unit_test.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)/tools/build/win/unit_test.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) diff --git a/chrome/installer/util/util.scons b/chrome/installer/util/util.scons deleted file mode 100644 index 69e39d1..0000000 --- a/chrome/installer/util/util.scons +++ /dev/null @@ -1,191 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BREAKPAD_DIR/using_breakpad.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LZMA_SDK_DIR/using_lzma_sdk.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - '.', - ], -) - -input_files = ChromeFileList([ - 'browser_distribution.cc', - 'browser_distribution.h', - 'copy_tree_work_item.cc', - 'copy_tree_work_item.h', - 'create_dir_work_item.cc', - 'create_dir_work_item.h', - 'create_reg_key_work_item.cc', - 'create_reg_key_work_item.h', - 'delete_reg_value_work_item.cc', - 'delete_reg_value_work_item.h', - 'delete_tree_work_item.cc', - 'delete_tree_work_item.h', - 'google_chrome_distribution.cc', - 'google_chrome_distribution.h', - 'google_update_constants.cc', - 'google_update_constants.h', - 'google_update_settings.cc', - 'google_update_settings.h', - 'helper.cc', - 'helper.h', - 'html_dialog.h', - 'html_dialog_impl.cc', - 'install_util.cc', - 'install_util.h', - 'l10n_string_util.cc', - 'l10n_string_util.h', - 'logging_installer.cc', - 'logging_installer.h', - 'lzma_util.cc', - 'lzma_util.h', - 'master_preferences.cc', - 'master_preferences.h', - 'set_reg_value_work_item.cc', - 'set_reg_value_work_item.h', - 'shell_util.cc', - 'shell_util.h', - 'util_constants.cc', - 'util_constants.h', - 'version.cc', - 'version.h', - 'work_item.cc', - 'work_item.h', - 'work_item_list.cc', - 'work_item_list.h', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeLibrary('util', input_files) - -p = env.ChromeMSVSProject('util.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'installer/util/util.vcproj'), - guid='{EFBB1436-A63F-4CD8-9E99-B89226E782EC}', - dependencies = [ - ('$CHROME_DIR/installer/util/prebuild/' + - 'util_prebuild.vcproj'), - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)common/common.vsprops', - '$(SolutionDir)installer/util/using_util.vsprops', - '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)common/common.vsprops', - '$(SolutionDir)installer/util/using_util.vsprops', - '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', - ]) - - -############################################################################## - -input_files = ChromeFileList([ - 'prebuild/create_string_rc.bat', - 'prebuild/create_string_rc.py', -]) - -# TODO(port): -if env.Bit('windows'): - # create_string_rc.py imports FP.py from the tools/grit/grit/extern - # directory, so add that to PYTHONPATH for this command execution. - env_x = env.Clone() - env_x.AppendENVPath('PYTHONPATH', - [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath]) - env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', - '$CHROME_DIR/installer/util/installer_util_strings.h'], - ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', - '$CHROME_DIR/app/generated_resources.grd'] + - env.Glob('$CHROME_DIR/app/resources/*.xtb'), - "$PYTHON ${SOURCES[0]} ${TARGET.dir}") - -p = env.ChromeMSVSProject('prebuild/util_prebuild.vcproj', - dest=('$CHROME_SRC_DIR/chrome/installer/' - + 'util/prebuild/util_prebuild.vcproj'), - guid='{0026A376-C4F1-4575-A1BA-578C69F07013}', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - MSVSTool('VCCustomBuildTool', - CommandLine=('create_string_rc.bat ' - + '$(IntDir)'), - AdditionalDependencies=( - 'create_string_rc.py;' - + '$(SolutionDir)/app/' - + 'generated_resources.grd'), - Outputs=('$(IntDir)/' - + 'installer_util_strings.rc;' - + '$(IntDir)/' - + 'installer_util_strings.h')), - 'VCMIDLTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='10') - - -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/chrome/plugin/plugin.scons b/chrome/plugin/plugin.scons deleted file mode 100644 index 5621eeb..0000000 --- a/chrome/plugin/plugin.scons +++ /dev/null @@ -1,128 +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. - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$NPAPI_DIR/using_npapi.scons', - '$SKIA_DIR/using_skia.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -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('NPObject', [ - 'npobject_proxy.cc', - 'npobject_proxy.h', - 'npobject_stub.cc', - 'npobject_stub.h', - 'npobject_util.cc', - 'npobject_util.h', - ]), - 'chrome_plugin_host.cc', - 'chrome_plugin_host.h', - 'plugin_channel.cc', - 'plugin_channel.h', - 'plugin_channel_base.cc', - 'plugin_channel_base.h', - 'plugin_main.cc', - 'plugin_thread.cc', - 'plugin_thread.h', - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled.h', - 'webplugin_delegate_stub.cc', - 'webplugin_delegate_stub.h', - 'webplugin_proxy.cc', - 'webplugin_proxy.h', -]) - -if not env.Bit('windows'): - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - ) - -if env.Bit('posix'): - # TODO(port) - input_files.Remove( - 'chrome_plugin_host.cc', - 'npobject_proxy.cc', - 'npobject_stub.cc', - 'plugin_channel.cc', - 'plugin_channel_base.cc', - 'plugin_main.cc', - 'plugin_thread.cc', - 'webplugin_delegate_stub.cc', - 'webplugin_proxy.cc', - ) - -env.ChromeLibrary('plugin', input_files) - -p = env.ChromeMSVSProject('plugin.vcproj', - dest='$CHROME_SRC_DIR/chrome/plugin/plugin.vcproj', - guid='{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '../tools/build/win/precompiled.vsprops', - '$(SolutionDir)../third_party/npapi/using_npapi.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../third_party/npapi/using_npapi.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons deleted file mode 100644 index a620ad6..0000000 --- a/chrome/renderer/renderer.scons +++ /dev/null @@ -1,206 +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. - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$GRIT_DIR/build/using_generated_resources.scons', - '$ICU38_DIR/using_icu38.scons', - '$MEDIA_DIR/using_media.scons', - '$NPAPI_DIR/using_npapi.scons', - '$PRINTING_DIR/using_printing.scons', - '$SKIA_DIR/using_skia.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -env.Append( - LIBS = [ - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -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('automation', [ - 'automation/dom_automation_controller.cc', - 'automation/dom_automation_controller.h', - ]), - MSVSFilter('media', [ - 'media/audio_renderer_impl.cc', - 'media/audio_renderer_impl.h', - 'media/data_source_impl.cc', - 'media/data_source_impl.h', - 'media/video_renderer_impl.cc', - 'media/video_renderer_impl.h', - ]), - MSVSFilter('net', [ - 'net/render_dns_master.cc', - 'net/render_dns_master.h', - 'net/render_dns_queue.cc', - 'net/render_dns_queue.h', - ]), - MSVSFilter('extensions', [ - 'extensions/extension_process_bindings.cc', - 'extensions/extension_process_bindings.h', - 'extensions/renderer_extension_bindings.cc', - 'extensions/renderer_extension_bindings.h', - ]), - 'about_handler.cc', - 'about_handler.h', - 'debug_message_handler.cc', - 'debug_message_handler.h', - 'devtools_agent.cc', - 'devtools_agent.h', - 'devtools_client.cc', - 'devtools_client.h', - 'devtools_messages.h', - 'devtools_messages_internal.h', - 'dom_ui_bindings.cc', - 'dom_ui_bindings.h', - 'external_host_bindings.cc', - 'external_host_bindings.h', - 'external_js_object.cc', - 'external_js_object.h', - 'localized_error.cc', - 'localized_error.h', - 'plugin_channel_host.cc', - 'plugin_channel_host.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'render_process.cc', - 'render_process.h', - 'render_thread.cc', - 'render_thread.h', - 'render_view.cc', - 'render_view.h', - 'render_widget.cc', - 'render_widget.h', - 'renderer_glue.cc', - 'renderer_histogram_snapshots.cc', - 'renderer_histogram_snapshots.h', - 'renderer_webkitclient_impl.cc', - 'renderer_webkitclient_impl.h', - 'renderer_main.cc', - 'renderer_resources.h', - 'user_script_slave.cc', - 'user_script_slave.h', - 'visitedlink_slave.cc', - 'visitedlink_slave.h', - 'webmediaplayer_delegate_impl.cc', - 'webmediaplayer_delegate_impl.h', - 'webplugin_delegate_proxy.cc', - 'webplugin_delegate_proxy.h', - 'webworker_proxy.cc', - 'webworker_proxy.h', -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -if env.Bit('linux'): - # Linux-specific. - input_files.Append( - 'renderer_main_platform_delegate_linux.cc', - 'renderer_logging_linux.cc', - ) - - # TODO(port): Port these to Linux - input_files.Remove( - 'plugin_channel_host.cc', - 'webplugin_delegate_proxy.cc', - ) - -# TODO(port): Port these to Mac -if env.Bit('mac'): - input_files.Remove( - 'debug_message_handler.cc', - 'external_js_object.cc', - 'net/render_dns_master.cc', - 'plugin_channel_host.cc', - 'render_view.cc', - 'render_widget.cc', - 'renderer_glue.cc', - 'webplugin_delegate_proxy.cc', - ) - - -# TODO(port): Enable for Mac. -if not env.Bit('mac'): - env.ChromeLibrary('renderer', input_files) - -# TODO######################################################################## - -p = env.ChromeMSVSProject('renderer.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'renderer/renderer.vcproj'), - guid='{9301A569-5D2B-4D11-9332-B1E30AEACB8D}', - keyword='Win32Proj', - dependencies = [ - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './renderer.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled_wtl.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './renderer.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/activex_test_control/activex_test_control.scons b/chrome/test/activex_test_control/activex_test_control.scons deleted file mode 100644 index 15ce4ef..0000000 --- a/chrome/test/activex_test_control/activex_test_control.scons +++ /dev/null @@ -1,110 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '.', - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], - LIBS = [ - 'comsuppw.lib', - ], - ) - -# TODO(port): -if env.Bit('windows'): - env.TypeLibrary('activex_test_control.idl') - -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('resource', [ - 'activex_test_control.rc', - 'activex_test_control.rgs', - 'chrome_test_control.bmp', - 'chrome_test_control.rgs', - ]), - 'activex_test_control.cc', - 'activex_test_control.def', - 'activex_test_control.idl', - 'chrome_test_control.cc', - 'chrome_test_control.h', - 'chrome_test_control_cp.h', - 'resource.h', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeSharedLibrary('activex_test_control', input_files) - -p = env.ChromeMSVSProject('activex_test_control.vcproj', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'activex_test_control/' - + 'activex_test_control.vcproj'), - keyword='AtlProj', - guid='{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='2') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './activex_test_control.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './activex_test_control.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.scons b/chrome/test/automated_ui_tests/automated_ui_tests.scons deleted file mode 100644 index e0de9ac..0000000 --- a/chrome/test/automated_ui_tests/automated_ui_tests.scons +++ /dev/null @@ -1,186 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - LINKFLAGS = [ - '/INCREMENTAL', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/MANIFEST', - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - ], - ) - -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('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('MemoryUsage', [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/perf/mem_usage.h', - ]), - MSVSFilter('AutomatedUITest', [ - 'automated_ui_tests.cc', - 'automated_ui_tests.h', - ]), -]) - -if not env.Bit('windows'): - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('automated_ui_tests', input_files) - -p = env.ChromeMSVSProject('automated_ui_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'automated_ui_tests/' - + 'automated_ui_tests.vcproj'), - root_namespace='page_cycler_tests', - guid='{D2250C20-3A94-4FB9-AF73-11BC5B73884B}', - dependencies = [ - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$LIBXML_DIR/build/libxml_config.vcproj', - '$NET_DIR/build/net.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$LIBXML_DIR/build/libxml.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - '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', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/automation/automation.scons b/chrome/test/automation/automation.scons deleted file mode 100644 index f4856c8..0000000 --- a/chrome/test/automation/automation.scons +++ /dev/null @@ -1,90 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons', - '$SKIA_DIR/using_skia.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -input_files = ChromeFileList([ - 'autocomplete_edit_proxy.cc', - 'autocomplete_edit_proxy.h', - 'automation_constants.h', - 'automation_handle_tracker.cc', - 'automation_handle_tracker.h', - 'automation_messages.h', - 'automation_messages_internal.h', - 'automation_proxy.cc', - 'automation_proxy.h', - 'browser_proxy.cc', - 'browser_proxy.h', - 'constrained_window_proxy.cc', - 'constrained_window_proxy.h', - 'tab_proxy.cc', - 'tab_proxy.h', - 'window_proxy.cc', - 'window_proxy.h', -]) - -if not env.Bit('windows'): - # TODO(port): port. - input_files.Remove( - 'autocomplete_edit_proxy.cc', - 'constrained_window_proxy.cc', - 'window_proxy.cc', - ) - -env.ChromeLibrary('automation', input_files) - -p = env.ChromeMSVSProject('automation.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/automation/automation.vcproj'), - guid='{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './automation.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './automation.vsprops', - ]) diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.scons b/chrome/test/chrome_plugin/test_chrome_plugin.scons deleted file mode 100644 index 699bcc0..0000000 --- a/chrome/test/chrome_plugin/test_chrome_plugin.scons +++ /dev/null @@ -1,129 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$ICU38_DIR/using_icu38.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], - LIBS = [ - 'winmm.lib', - ], - ) - -input_files = ChromeFileList([ - 'test_chrome_plugin.cc', - 'test_chrome_plugin.def', - 'test_chrome_plugin.h', -]) - -if not env.Bit('windows'): - input_files.Remove( - 'test_chrome_plugin.def', - ) - -env.ChromeSharedLibrary('test_chrome_plugin', input_files) - -p = env.ChromeMSVSProject('test_chrome_plugin.vcproj', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'chrome_plugin/test_chrome_plugin.vcproj'), - root_namespace='startup_tests', - guid='{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - ConfigurationType='2') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './test_chrome_plugin.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='0'), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './test_chrome_plugin.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons deleted file mode 100644 index dfe56a9..0000000 --- a/chrome/test/interactive_ui/interactive_ui_tests.scons +++ /dev/null @@ -1,277 +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. - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BASE_DIR/using_base.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.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', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$NPAPI_DIR/using_npapi.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_DIR/app', - # For generated_resources.h - '$CHROME_DIR/app/resources', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - 'debugger', - 'default_plugin', - 'glue', - #'jscre', - 'JavaScriptCore_pcre', - 'plugin', - 'port', - 'renderer', - 'sqlite', - 'test_chrome_plugin', - 'util', - 'views', - 'v8_snapshot', - 'V8Bindings', - 'WebCore', - 'WTF', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'activex_shim', - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', - ], - ) - -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('Common', [ - '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX', - '$CHROME_DIR/test/ui/npapi_test_helper.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_profile$OBJSUFFIX', - '$CHROME_DIR/test/testing_profile.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - 'view_event_test_base.cc', - 'view_event_test_base.h', - ]), - MSVSFilter('TestBookmarkBarView', [ - '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc', - ]), - MSVSFilter('TestFindInPage', [ - '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', - ]), - MSVSFilter('TestFocus', [ - '$CHROME_DIR/browser/browser_focus_uitest.cc', - '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc', - ]), - MSVSFilter('TestTabDragging', [ - '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc', - ]), - MSVSFilter('TestNPAPI', [ - 'npapi_interactive_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('interactive_ui_tests', input_files) - -p = env.ChromeMSVSProject('interactive_ui.vcproj', - name='interactive_ui_tests', - root_namespace='manual_ui', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'interactive_ui/interactive_ui.vcproj'), - guid='{018D4F38-6272-448F-A864-976DA09F05D0}', - dependencies = [ - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$CHROME_DIR/plugin/plugin.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj', - ('$WEBKIT_DIR/build/JavaScriptCore/' + - 'JavaScriptCore_pcre.vcproj'), - '$WEBKIT_DIR/build/port/port.vcproj', - '$CHROME_DIR/browser/debugger/debugger.vcproj', - ('$WEBKIT_DIR/default_plugin/' - + 'default_plugin.vcproj'), - '$CHROME_DIR/browser/browser.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - '$CHROME_DIR/views/views.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - ('$CHROME_DIR/test/chrome_plugin/' + - 'test_chrome_plugin.vcproj'), - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$CHROME_DIR/renderer/renderer.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - ('$CHROME_DIR/browser/resources/' + - 'browser_resources.vcproj'), - '$RLZ_DIR/rlz.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$CHROME_DIR/app/locales/en-US.vcproj', - '$SKIA_DIR/skia.vcproj', - ('$CHROME_DIR/third_party/' - + 'hunspell/hunspell.vcproj'), - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - '$CHROME_DIR/app/theme/theme_dll.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '../../../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - '../../third_party/hunspell/using_hunspell.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - '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', - '../../tools/build/win/unit_test.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '../../../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - '../../third_party/hunspell/using_hunspell.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/memory_test/memory_test.scons b/chrome/test/memory_test/memory_test.scons deleted file mode 100644 index fb3a316..0000000 --- a/chrome/test/memory_test/memory_test.scons +++ /dev/null @@ -1,166 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -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('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('MemoryUsage', [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/perf/mem_usage.h', - ]), - MSVSFilter('TestMemory', [ - 'memory_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('memory_test', input_files) - -p = env.ChromeMSVSProject('memory_test.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/memory_test/memory_test.vcproj'), - guid='{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}', - dependencies = [ - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/mini_installer_test/mini_installer_test.scons b/chrome/test/mini_installer_test/mini_installer_test.scons deleted file mode 100644 index 6d8b12d..0000000 --- a/chrome/test/mini_installer_test/mini_installer_test.scons +++ /dev/null @@ -1,155 +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. - -Import('env') - - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'util', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'rpcrt4', - 'shlwapi', - ], - ) - -input_files = ChromeFileList([ - 'chrome_mini_installer.cc', - 'chrome_mini_installer.h', - 'mini_installer_test_constants.cc', - 'mini_installer_test_constants.h', - '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX', - 'test.cc', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('mini_installer_test', input_files) - -p = env.ChromeMSVSProject('mini_installer_test.vcproj', - dest=('$CHROME_SRC_DIR/chrome/test/' - + 'mini_installer_test/' - + 'mini_installer_test.vcproj'), - guid='{4B6E199A-034A-49BD-AB93-458DD37E45B1}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)/tools/build/win/unit_test.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - IgnoreDefaultLibraryNames=''), - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)installer/' - + 'mini_installer/' - + 'mini_installer.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)/tools/build/win/unit_test.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ], - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - MSVSTool('VCManifestTool', - AdditionalManifestFiles=('$(SolutionDir)installer/' - + 'mini_installer/' - + 'mini_installer.exe.manifest')), - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ]) diff --git a/chrome/test/page_cycler/page_cycler_tests.scons b/chrome/test/page_cycler/page_cycler_tests.scons deleted file mode 100644 index d43ed36..0000000 --- a/chrome/test/page_cycler/page_cycler_tests.scons +++ /dev/null @@ -1,208 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'common', - 'glue', - 'WTF', - # needed for shared link deps - 'sqlite', - 'xslt', - - 'WebKit', - 'WebCore', - 'V8Bindings', - 'v8_snapshot', - 'libxml', - 'port', - 'renderer', - 'JavaScriptCore_pcre', - - 'jpeg', - - 'bzip2', - 'X11', - 'Xrender', - 'Xext', - - 'media', - 'sdch', - 'views', - - 'hunspell', - 'printing', - 'modp_b64', - 'debugger', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', - ], - ) - -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('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('MemoryUsage', [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/perf/mem_usage.h', - ]), - MSVSFilter('TestPageCycler', [ - 'page_cycler_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - - # TODO(port): Remove files from this list as they get ported. - input_files.Remove( - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - ) - -env.ChromeTestProgram('page_cycler_tests', input_files) - -p = env.ChromeMSVSProject('page_cycler_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/page_cycler/page_cycler_tests.vcproj'), - guid='{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}', - dependencies = [ - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons deleted file mode 100644 index 031f386..0000000 --- a/chrome/test/perf/perftests.scons +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright (c) 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 perf_tests{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$NET_DIR/using_net.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', - - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MEDIA_DIR/using_media.scons', - '$PRINTING_DIR/using_printing.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', - - # TODO(port): we should have a using_browser.scons that pulls in hunspell - # for itself. - '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'PERF_TEST', - ], - LIBS = [ - 'views', - - 'browser', - 'common', - 'sqlite', - - 'JavaScriptCore_pcre', - 'V8Bindings', - 'WTF', - 'WebCore', - 'WebKit', - 'debugger', - 'glue', - 'port', - 'renderer', - - 'X11', - 'Xrender', - 'Xext', - ], -) - -if env.Bit('posix'): - env.SConscript([ - '$LIBEVENT_DIR/using_libevent.scons', - ], {'env':env}) - -if env.Bit('windows'): - env.Prepend( - LIBS = [ - 'rpcrt4', - 'shlwapi', - 'winmm', - ] - ) - -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('TestVisitedLink', [ - '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX', - '$CHROME_DIR/browser/visitedlink_perftest.cc', - ]), - MSVSFilter('Common', [ - 'perftests.cc', - '$BASE_DIR/perftimer$OBJSUFFIX', - ]), - MSVSFilter('TestURLParser', [ - 'url_parse_perftest.cc', - ]), - MSVSFilter('TestJSONSerializer', [ - '$CHROME_DIR/common/json_value_serializer_perftest.cc', - ]), - MSVSFilter('TestSafeBrowsing', [ - '$CHROME_DIR/browser/safe_browsing/database_perftest.cc', - ]), -]) - -if env.Bit('linux'): - # TODO(port): Port these files. - input_files.Remove( - 'url_parse_perftest.cc', - '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX', - '$CHROME_DIR/browser/visitedlink_perftest.cc', - ) - -if env.Bit('mac'): - # TODO(port): Port these files. - input_files.Remove( - 'url_parse_perftest.cc', - '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX', - '$CHROME_DIR/browser/visitedlink_perftest.cc', - ) - -if not env.Bit('mac'): - env.ChromeTestProgram('perf_tests', input_files) - -p = env.ChromeMSVSProject('perftests.vcproj', - name='perf_tests', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/perf/perftests.vcproj'), - guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$CHROME_DIR/plugin/plugin.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj', - ('$WEBKIT_DIR/build/' - + 'JavaScriptCore/JavaScriptCore_pcre.vcproj'), - '$WEBKIT_DIR/build/port/port.vcproj', - '$CHROME_DIR/browser/debugger/debugger.vcproj', - ('$WEBKIT_DIR/default_plugin/' - + 'default_plugin.vcproj'), - '$CHROME_DIR/browser/browser.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - '$CHROME_DIR/views/views.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$CHROME_DIR/renderer/renderer.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$SKIA_DIR/skia.vcproj', - ('$CHROME_DIR/third_party/' - + 'hunspell/hunspell.vcproj'), - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - PreprocessorDefinitions=[ - 'PERF_TEST', - '_CRT_RAND_S', - ]), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies=[ - 'shlwapi.lib', - 'rpcrt4.lib', - 'winmm.lib', - ], - 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', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '$(SolutionDir)../testing/using_gtest.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - '$(SolutionDir)../testing/using_gtest.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - ]) diff --git a/chrome/test/plugin/plugin_tests.scons b/chrome/test/plugin/plugin_tests.scons deleted file mode 100644 index 06dfb33..0000000 --- a/chrome/test/plugin/plugin_tests.scons +++ /dev/null @@ -1,176 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - 'security_tests', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'rpcrt4', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - 'plugin_test.cpp', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('plugin_tests', input_files) - -p = env.ChromeMSVSProject('plugin_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/plugin/plugin_tests.vcproj'), - guid='{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}', - dependencies = [ - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - ('$CHROME_DIR/test/activex_test_control/' + - 'activex_test_control.vcproj'), - '$CHROME_DIR/browser/browser.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - ('$CHROME_DIR/test/security_tests/' + - 'security_tests.vcproj'), - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - ('$(SolutionDir)../' - + 'third_party/libxslt/build/using_libxslt.vsprops'), - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ('$(SolutionDir)../' - + 'third_party/libxml/build/using_libxml.vsprops'), - ('$(SolutionDir)../' - + 'third_party/libxslt/build/using_libxslt.vsprops'), - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/reliability/reliability_tests.scons b/chrome/test/reliability/reliability_tests.scons deleted file mode 100644 index 38767a8..0000000 --- a/chrome/test/reliability/reliability_tests.scons +++ /dev/null @@ -1,180 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'RELIABILITY_TEST', # seems to be unused - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', - ], - ) - -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('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'reliability_test_suite.h', - 'run_all_unittests.cc', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('MemoryUsage', [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/perf/mem_usage.h', - ]), - MSVSFilter('TestPageLoader', [ - 'page_load_test.cc', - 'page_load_test.h', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('reliability_tests', input_files) - -p = env.ChromeMSVSProject('reliability_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/reliability/reliability_tests.vcproj'), - guid='{8A3E1774-1DE9-445C-982D-3EE37C8A752A}', - dependencies = [ - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '../../tools/build/win/reliability_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '../../tools/build/win/reliability_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/security_tests/security_tests.scons b/chrome/test/security_tests/security_tests.scons deleted file mode 100644 index cd825ce..0000000 --- a/chrome/test/security_tests/security_tests.scons +++ /dev/null @@ -1,94 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], - LIBS = [ - 'DelayImp.lib', - ], - ) - -input_files = ChromeFileList([ - '$SANDBOX_DIR/tests/validation_tests/commands$OBJSUFFIX', - '$SANDBOX_DIR/tests/validation_tests/commands.h', - '$CHROME_DIR/test/injection_test_dll.h', - 'ipc_security_tests.cc', - 'ipc_security_tests.h', - 'security_tests.cc', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeSharedLibrary('security_tests', input_files) - -p = env.ChromeMSVSProject('security_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/security_tests/security_tests.vcproj'), - guid='{E750512D-FC7C-4C98-BF04-0A0DAF882055}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='2') - - -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/chrome/test/selenium/selenium_tests.scons b/chrome/test/selenium/selenium_tests.scons deleted file mode 100644 index f0c066a..0000000 --- a/chrome/test/selenium/selenium_tests.scons +++ /dev/null @@ -1,172 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'winmm', - 'rpcrt4', - 'oleacc', - 'comsupp', - ], - ) - -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('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('TestSelenium', [ - 'selenium_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('selenium_tests', input_files) - -p = env.ChromeMSVSProject('selenium_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/selenium/selenium_tests.vcproj'), - guid='{E3749617-BA3D-4230-B54C-B758E56D9FA5}', - dependencies = [ - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/startup/startup_tests.scons b/chrome/test/startup/startup_tests.scons deleted file mode 100644 index fcc4040..0000000 --- a/chrome/test/startup/startup_tests.scons +++ /dev/null @@ -1,205 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'common', - 'glue', - 'WTF', - # needed for shared link deps - 'sqlite', - 'xslt', - - 'WebKit', - 'WebCore', - 'V8Bindings', - 'v8_snapshot', - 'libxml', - 'port', - 'renderer', - 'JavaScriptCore_pcre', - - 'jpeg', - - 'bzip2', - 'X11', - 'Xrender', - 'Xext', - - 'media', - 'sdch', - 'views', - - 'hunspell', - 'printing', - 'modp_b64', - 'debugger', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'browser_views', - 'comsupp', - 'oleacc', - 'rpcrt4', - 'winmm', - ], - ) - -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('Common', [ - '$CHROME_DIR/tools/build/win/precompiled.cc', - '$CHROME_DIR/tools/build/win/precompiled.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('TestStartup', [ - 'feature_startup_test.cc', - 'startup_test.cc', - ]), -]) - -if not env.Bit('windows'): - # TODO(port): port. - input_files.Remove( - 'feature_startup_test.cc', - ) - - # Windows-specific files - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled.cc', - ) - -# Please note that currently you have to manually ensure that Hammer/chrome -# is up to date when you build startup_tests. -# TODO(sgk): Proper dependency tracking for startup_tests. -startup_tests = env.ChromeTestProgram('startup_tests', input_files) - -p = env.ChromeMSVSProject('startup_tests.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/startup/startup_tests.vcproj'), - guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}', - dependencies = [ - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/tab_switching/tab_switching_test.scons b/chrome/test/tab_switching/tab_switching_test.scons deleted file mode 100644 index e5c1efd..0000000 --- a/chrome/test/tab_switching/tab_switching_test.scons +++ /dev/null @@ -1,172 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'UI_TEST', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'browser', - 'browser_views', - 'common', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', - ], - ) - -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('Common', [ - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test.h', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - ]), - MSVSFilter('TabSwitchingTest', [ - 'tab_switching_test.cc', - ]), -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('tab_switching_test', input_files) - -p = env.ChromeMSVSProject('tab_switching.vcproj', - name='tab_switching_test', - dest=('$CHROME_SRC_DIR/chrome/' - + 'test/tab_switching/tab_switching.vcproj'), - guid='{A34770EA-A574-43E8-9327-F79C04770E98}', - dependencies = [ - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$NET_DIR/build/net.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/test/ui/ui_tests.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons deleted file mode 100644 index 28c50ee..0000000 --- a/chrome/test/ui/ui_tests.scons +++ /dev/null @@ -1,431 +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. - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.scons', - '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - #'$NPAPI_DIR/using_npapi.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app/resources', - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'UI_TEST', - ], - LIBS = [ - 'automation', - 'browser', - 'common', - 'glue', - 'port', - 'sqlite', - 'WTF', - 'views', - - 'WebKit', - 'WebCore', - 'V8Bindings', - 'v8_snapshot', - 'libxml', - 'port', - 'renderer', - 'JavaScriptCore_pcre', - - 'jpeg', - - 'bzip2', - 'X11', - 'Xrender', - 'Xext', - - 'media', - 'sdch', - 'views', - - 'hunspell', - 'printing', - 'modp_b64', - 'debugger', - - ] -) - -if env.Bit('windows'): - # TODO(port): split these into upper env.Prepend (for portable libs) and - # lower env.Prepend (for win-specific libs). - env.Prepend( - LIBS = [ - 'browser_views', - 'npapi_layout_test_plugin', - 'npapi_test_plugin', - 'security_tests', - ], - ) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - LINKFLAGS = [ - '/INCREMENTAL', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/MANIFEST', - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - ], - LIBS = [ - 'comsupp', - 'oleacc', - 'rpcrt4', - 'winmm', - ], - ) - -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('Common', [ - 'npapi_test_helper.cc', - 'npapi_test_helper.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'run_all_unittests.cc', - 'javascript_test_util.cc', - 'javascript_test_util.h', - '$CHROME_DIR/test/testing_browser_process.h', - 'ui_test.cc', - 'ui_test.h', - 'ui_test_suite.cc', - 'ui_test_suite.h', - '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', - '$NET_DIR/url_request/url_request_test_job.h', - ]), - MSVSFilter('TestChromeMain', [ - '$CHROME_DIR/app/chrome_main_uitest.cc', - ]), - MSVSFilter('TestErrorPage', [ - '$CHROME_DIR/browser/errorpage_uitest.cc', - ]), - MSVSFilter('TestBrowser', [ - '$CHROME_DIR/browser/browser_uitest.cc', - MSVSFilter('TestImages', [ - '$CHROME_DIR/browser/images_uitest.cc', - ]), - ]), - MSVSFilter('TestChromeLogging', [ - '$CHROME_DIR/common/logging_chrome_uitest.cc', - ]), - MSVSFilter('TestDownload', [ - '$CHROME_DIR/browser/download/download_uitest.cc', - ]), - MSVSFilter('TestIFrame', [ - '$CHROME_DIR/browser/iframe_uitest.cc', - ]), - MSVSFilter('TestCache', [ - '$CHROME_DIR/common/net/cache_uitest.cc', - ]), - MSVSFilter('TestSanity', [ - '$CHROME_DIR/browser/sanity_uitest.cc', - ]), - MSVSFilter('TestAutomationProxy', [ - '$CHROME_DIR/test/automation/automation_proxy_uitest.cc', - ]), - MSVSFilter('TestNPAPI', [ - 'layout_plugin_uitest.cc', - 'npapi_uitest.cc', - ]), - MSVSFilter('TestSessionHistory', [ - '$CHROME_DIR/browser/session_history_uitest.cc', - ]), - MSVSFilter('TestSessionRestore', [ - '$CHROME_DIR/browser/sessions/session_restore_uitest.cc', - ]), - MSVSFilter('TestTabRestore', [ - '$CHROME_DIR/browser/tab_restore_uitest.cc', - ]), - MSVSFilter('TestUnload', [ - '$CHROME_DIR/browser/unload_uitest.cc', - ]), - MSVSFilter('TestAuthentication', [ - '$CHROME_DIR/browser/login_prompt_uitest.cc', - ]), - MSVSFilter('TestPreferences', [ - '$CHROME_DIR/common/pref_service_uitest.cc', - ]), - MSVSFilter('TestViewSource', [ - '$CHROME_DIR/browser/tab_contents/view_source_uitest.cc', - ]), - MSVSFilter('TestRedirects', [ - '$CHROME_DIR/browser/history/redirect_uitest.cc', - ]), - MSVSFilter('TestResourceDispatcherHost', [ - '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_uitest.cc', - ]), - MSVSFilter('TestFindInPage', [ - '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', - ]), - MSVSFilter('TestPageLoader', [ - '$CHROME_DIR/test/perf/mem_usage.cc', - '$CHROME_DIR/test/perf/mem_usage.h', - '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX', - '$CHROME_DIR/test/reliability/page_load_test.h', - ]), - MSVSFilter('TestSandbox', [ - 'sandbox_uitests.cc', - ]), - MSVSFilter('TestInspector', [ - 'inspector_controller_uitest.cc', - ]), - MSVSFilter('TestLocalizedBuilds', [ - '$CHROME_DIR/browser/locale_tests_uitest.cc', - ]), - MSVSFilter('TestMetricsService', [ - '$CHROME_DIR/browser/metrics/metrics_service_uitest.cc', - ]), - MSVSFilter('TestInterstitialPage', [ - '$CHROME_DIR/browser/interstitial_page_uitest.cc', - ]), - MSVSFilter('TestSSL', [ - '$CHROME_DIR/browser/ssl/ssl_uitest.cc', - ]), - MSVSFilter('TestAccessibility', [ - '$CHROME_DIR/test/accessibility/accessibility_tests.cc', - MSVSFilter('Accessibility Client', [ - '$CHROME_DIR/test/accessibility/accessibility_util.cc', - '$CHROME_DIR/test/accessibility/accessibility_util.h', - '$CHROME_DIR/test/accessibility/browser_impl.cc', - '$CHROME_DIR/test/accessibility/browser_impl.h', - '$CHROME_DIR/test/accessibility/constants.h', - '$CHROME_DIR/test/accessibility/keyboard_util.cc', - '$CHROME_DIR/test/accessibility/keyboard_util.h', - '$CHROME_DIR/test/accessibility/registry_util.cc', - '$CHROME_DIR/test/accessibility/registry_util.h', - '$CHROME_DIR/test/accessibility/tab_impl.cc', - '$CHROME_DIR/test/accessibility/tab_impl.h', - ]), - ]), - MSVSFilter('TestCrashRecovery', [ - '$CHROME_DIR/browser/crash_recovery_uitest.cc', - ]), - MSVSFilter('TestPrinting', [ - '$CHROME_DIR/browser/printing/printing_layout_uitest.cc', - '$CHROME_DIR/browser/printing/printing_test.h', - ]), - MSVSFilter('TestSavePage', [ - '$CHROME_DIR/browser/download/save_page_uitest.cc', - ]), - MSVSFilter('TestOmnibox', [ - 'omnibox_uitest.cc', - ]), - MSVSFilter('TestHistory', [ - 'history_uitest.cc', - ]), - MSVSFilter('TestDOMChecker', [ - 'dom_checker_uitest.cc', - ]), - MSVSFilter('TestSunSpider', [ - 'sunspider_uitest.cc', - ]), - MSVSFilter('TestV8Benchmark', [ - 'v8_benchmark_uitest.cc', - ]), -]) - -if not env.Bit('windows'): - # TODO(port): mark which of these work and which don't. - input_files.Remove( - 'layout_plugin_uitest.cc', - 'npapi_test_helper.cc', - 'npapi_uitest.cc', - 'omnibox_uitest.cc', - 'dom_checker_uitest.cc', - 'sunspider_uitest.cc', - 'v8_benchmark_uitest.cc', - - 'sandbox_uitests.cc', - - '$CHROME_DIR/app/chrome_main_uitest.cc', - '$CHROME_DIR/browser/browser_uitest.cc', - '$CHROME_DIR/browser/crash_recovery_uitest.cc', - '$CHROME_DIR/browser/download/download_uitest.cc', - '$CHROME_DIR/browser/download/save_page_uitest.cc', - '$CHROME_DIR/browser/errorpage_uitest.cc', - '$CHROME_DIR/browser/iframe_uitest.cc', - '$CHROME_DIR/browser/history/redirect_uitest.cc', - '$CHROME_DIR/browser/interstitial_page_uitest.cc', - '$CHROME_DIR/browser/login_prompt_uitest.cc', - '$CHROME_DIR/browser/metrics/metrics_service_uitest.cc', - '$CHROME_DIR/browser/printing/printing_layout_uitest.cc', - '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_uitest.cc', - '$CHROME_DIR/browser/session_history_uitest.cc', - '$CHROME_DIR/browser/sessions/session_restore_uitest.cc', - '$CHROME_DIR/browser/ssl/ssl_uitest.cc', - '$CHROME_DIR/browser/tab_contents/view_source_uitest.cc', - '$CHROME_DIR/browser/tab_restore_uitest.cc', - '$CHROME_DIR/browser/unload_uitest.cc', - '$CHROME_DIR/common/logging_chrome_uitest.cc', - '$CHROME_DIR/common/net/cache_uitest.cc', - '$CHROME_DIR/common/pref_service_uitest.cc', - '$CHROME_DIR/test/accessibility/accessibility_tests.cc', - '$CHROME_DIR/test/accessibility/accessibility_util.cc', - '$CHROME_DIR/test/accessibility/browser_impl.cc', - '$CHROME_DIR/test/accessibility/keyboard_util.cc', - '$CHROME_DIR/test/accessibility/registry_util.cc', - '$CHROME_DIR/test/accessibility/tab_impl.cc', - '$CHROME_DIR/test/automation/automation_proxy_uitest.cc', - '$CHROME_DIR/test/perf/mem_usage.cc', - '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX', - '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', - ) - -if not env.Bit('windows'): - # Windows-specific tests. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', - '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', - ) - -env.ChromeTestProgram('ui_tests', input_files) - -p = env.ChromeMSVSProject('ui_tests.vcproj', - dest='$CHROME_SRC_DIR/chrome/test/ui/ui_tests.vcproj', - guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}', - dependencies = [ - ('$WEBKIT_DIR/glue/plugins/test/' + - 'npapi_test_plugin.vcproj'), - '$CHROME_DIR/test/automation/automation.vcproj', - '$BASE_DIR/build/base.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$CHROME_DIR/app/locales/he.vcproj', - '$CHROME_DIR/app/locales/da.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' - + 'npapi_layout_test_plugin.vcproj'), - '$TESTING_DIR/gtest.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$CHROME_DIR/app/locales/en-US.vcproj', - '$SKIA_DIR/skia.vcproj', - ('$CHROME_DIR/test/security_tests/' - + 'security_tests.vcproj'), - '$CHROME_DIR/app/locales/zh-TW.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$LIBXML_DIR/build/libxml.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - AdditionalIncludeDirectories=[ - '"$(OutDir)/obj/generated_resources"', - ]), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - ('$(SolutionDir)../third_party/' - + 'libxml/build/using_libxml.vsprops'), - ('$(SolutionDir)../third_party/' - + 'libxslt/build/using_libxslt.vsprops'), - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '../../tools/build/win/test_memory_usage.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)/tools/build/win/js_engine.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ('$(SolutionDir)../third_party/' - + 'libxml/build/using_libxml.vsprops'), - ('$(SolutionDir)../third_party/' - + 'libxslt/build/using_libxslt.vsprops'), - '../../tools/build/win/unit_test.vsprops', - '../../tools/build/win/ui_test.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)/tools/build/win/js_engine.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons deleted file mode 100644 index edc4ed7c..0000000 --- a/chrome/test/unit/unit_tests.scons +++ /dev/null @@ -1,553 +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. - -Import('env') -Import('bdict_reader_o', 'bdict_writer_o') - -env = env.Clone() - -env.SConscript([ - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BASE_DIR/using_base.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', - '$CHROME_DIR/third_party/wtl/using_wtl.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', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$MEDIA_DIR/using_media.scons', - '$NET_DIR/using_net.scons', - '$NPAPI_DIR/using_npapi.scons', - '$PRINTING_DIR/using_printing.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_DIR/app/resources', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'views', - - 'browser', - 'common', - 'debugger', - 'plugin', - 'renderer', - 'sqlite', - 'util', - 'v8_snapshot', - - 'WTF', - 'V8Bindings', - 'default_plugin', - 'glue', - 'JavaScriptCore_pcre', - 'port', - 'WebCore', - 'WebKit', - - 'X11', - 'Xrender', - 'Xext', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -if env.Bit('windows'): - # TODO(port): Port or mark as Windows-specific. - env.Prepend( - LIBS = [ - # TODO(port): to be ported to Mac and Linux, or else - # moved to the Windows-specific list below. - 'browser_views', - 'jscre', - 'test_chrome_plugin', - 'views', - - # Windows-specific libraries. - 'activex_shim', - - 'winmm', - 'rpcrt4', - 'oleacc', - 'comsupp', - ], - LINKFLAGS = [ - '/INCREMENTAL', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/MANIFEST', - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - ], - ) - -input_files = ChromeFileList([ - MSVSFilter('browser', [ - '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc', - '$CHROME_DIR/browser/back_forward_menu_model_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc', - '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_html_writer_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc', - '$CHROME_DIR/browser/browser_commands_unittest.cc', - '$CHROME_DIR/browser/chrome_thread_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc', - '$CHROME_DIR/browser/command_updater_unittest.cc', - '$CHROME_DIR/browser/debugger/devtools_manager_unittest.cc', - '$CHROME_DIR/browser/net/dns_host_info_unittest.cc', - '$CHROME_DIR/browser/net/dns_master_unittest.cc', - '$CHROME_DIR/browser/download/download_manager_unittest.cc', - '$CHROME_DIR/browser/download/download_request_manager_unittest.cc', - '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc', - '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc', - '$CHROME_DIR/browser/extensions/extension_unittest.cc', - '$CHROME_DIR/browser/extensions/extension_ui_unittest.cc', - '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc', - '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc', - '$CHROME_DIR/browser/google_url_tracker_unittest.cc', - '$CHROME_DIR/browser/history/history_backend_unittest.cc', - '$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc', - '$CHROME_DIR/browser/history/history_querying_unittest.cc', - '$CHROME_DIR/browser/history/history_types_unittest.cc', - '$CHROME_DIR/browser/history/history_unittest.cc', - '$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc', - '$CHROME_DIR/browser/importer/importer_unittest.cc', - '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc', - '$CHROME_DIR/browser/autocomplete/keyword_provider_unittest.cc', - '$CHROME_DIR/browser/login_prompt_unittest.cc', - '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc', - '$CHROME_DIR/browser/metrics/metrics_response_unittest.cc', - '$CHROME_DIR/browser/navigation_controller_unittest.cc', - '$CHROME_DIR/browser/printing/page_number_unittest.cc', - '$CHROME_DIR/browser/printing/page_overlays_unittest.cc', - '$CHROME_DIR/browser/printing/page_range_unittest.cc', - '$CHROME_DIR/browser/printing/page_setup_unittest.cc', - '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc', - '$CHROME_DIR/browser/printing/print_job_unittest.cc', - '$CHROME_DIR/browser/printing/printing_test.h', - '$CHROME_DIR/browser/profile_manager_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc', - '$CHROME_DIR/browser/history/query_parser_unittest.cc', - '$CHROME_DIR/browser/renderer_host/renderer_security_policy_unittest.cc', - '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc', - '$CHROME_DIR/browser/renderer_host/test_render_view_host.cc', - '$CHROME_DIR/browser/renderer_host/web_cache_manager_unittest.cc', - '$CHROME_DIR/browser/rlz/rlz_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc', - '$CHROME_DIR/browser/download/save_package_unittest.cc', - '$CHROME_DIR/browser/sessions/session_backend_unittest.cc', - '$CHROME_DIR/browser/sessions/session_service_test_helper.cc', - '$CHROME_DIR/browser/sessions/session_service_test_helper.h', - '$CHROME_DIR/browser/sessions/session_service_unittest.cc', - '$CHROME_DIR/browser/site_instance_unittest.cc', - '$CHROME_DIR/browser/history/snippet_unittest.cc', - '$CHROME_DIR/browser/spellcheck_unittest.cc', - '$CHROME_DIR/browser/history/starred_url_database_unittest.cc', - '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc', - '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc', - '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc', - '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc', - '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc', - '$CHROME_DIR/browser/search_engines/template_url_unittest.cc', - '$CHROME_DIR/browser/history/text_database_manager_unittest.cc', - '$CHROME_DIR/browser/history/text_database_unittest.cc', - '$CHROME_DIR/browser/history/thumbnail_database_unittest.cc', - '$CHROME_DIR/browser/history/url_database_unittest.cc', - '$CHROME_DIR/browser/net/resolve_proxy_msg_helper_unittest.cc', - '$CHROME_DIR/browser/net/url_fetcher_unittest.cc', - '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc', - '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc', - '$CHROME_DIR/browser/history/visit_database_unittest.cc', - '$CHROME_DIR/browser/history/visit_tracker_unittest.cc', - '$CHROME_DIR/browser/visitedlink_unittest.cc', - '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc', - '$CHROME_DIR/browser/webdata/web_database_unittest.cc', - '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc', - '$CHROME_DIR/browser/window_sizer_unittest.cc', - '$CHROME_DIR/browser/renderer_host/render_widget_host_unittest.cc', - - # test_infrastructure - '$CHROME_DIR/browser/renderer_host/mock_render_process_host.cc', - '$CHROME_DIR/browser/renderer_host/mock_render_process_host.h', - '$CHROME_DIR/browser/tab_contents/test_web_contents.cc', - '$CHROME_DIR/browser/tab_contents/test_web_contents.h', - '$CHROME_DIR/test/browser_with_test_window_test.cc', - '$CHROME_DIR/test/browser_with_test_window_test.h', - '$CHROME_DIR/test/test_browser_window.h', - '$CHROME_DIR/test/test_tab_contents.cc', - '$CHROME_DIR/test/test_tab_contents.h', - ]), - MSVSFilter('common', [ - '$CHROME_DIR/common/animation_unittest.cc', - '$CHROME_DIR/common/bzip2_unittest.cc', - '$CHROME_DIR/common/chrome_plugin_unittest.cc', - '$CHROME_DIR/common/extensions/url_pattern_unittest.cc', - '$CHROME_DIR/common/extensions/user_script_unittest.cc', - '$CHROME_DIR/common/gfx/emf_unittest.cc', - '$CHROME_DIR/common/gfx/icon_util_unittest.cc', - '$CHROME_DIR/common/ipc_message_unittest.cc', - '$CHROME_DIR/common/ipc_sync_channel_unittest.cc', - '$CHROME_DIR/common/ipc_sync_channel_unittest.h', - '$CHROME_DIR/common/ipc_sync_message_unittest.cc', - '$CHROME_DIR/common/ipc_sync_message_unittest.h', - '$CHROME_DIR/common/json_value_serializer_unittest.cc', - '$CHROME_DIR/common/l10n_util_unittest.cc', - '$CHROME_DIR/common/mru_cache_unittest.cc', - '$CHROME_DIR/common/notification_service_unittest.cc', - '$CHROME_DIR/common/os_exchange_data_unittest.cc', - '$CHROME_DIR/common/pref_member_unittest.cc', - '$CHROME_DIR/common/pref_service_unittest.cc', - '$CHROME_DIR/common/property_bag_unittest.cc', - '$CHROME_DIR/common/resource_dispatcher_unittest.cc', - '$CHROME_DIR/common/gfx/text_elider_unittest.cc', - '$CHROME_DIR/common/time_format_unittest.cc', - '$CHROME_DIR/common/unzip_unittest.cc', - '$CHROME_DIR/common/win_util_unittest.cc', - '$CHROME_DIR/common/worker_thread_ticker_unittest.cc', - ]), - MSVSFilter('googleurl', [ - '$CHROME_DIR/../googleurl/src/gurl_unittest$OBJSUFFIX', - '$CHROME_DIR/../googleurl/src/url_canon_unittest$OBJSUFFIX', - '$CHROME_DIR/../googleurl/src/url_parse_unittest$OBJSUFFIX', - '$CHROME_DIR/../googleurl/src/url_util_unittest$OBJSUFFIX', - ]), - MSVSFilter('hunspell', [ - '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX', - '$CHROME_DIR/tools/convert_dict/aff_reader.h', - '$CHROME_DIR/third_party/hunspell/google/bdict.h', - bdict_reader_o, - '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h', - bdict_writer_o, - '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h', - '$CHROME_DIR/tools/convert_dict/dic_reader$OBJSUFFIX', - '$CHROME_DIR/tools/convert_dict/dic_reader.h', - '$CHROME_DIR/tools/convert_dict/hunspell_reader$OBJSUFFIX', - '$CHROME_DIR/tools/convert_dict/hunspell_reader.h', - '$CHROME_DIR/third_party/hunspell/google/hunspell_tests.cc', - ]), - MSVSFilter('renderer', [ - '$CHROME_DIR/renderer/extensions/greasemonkey_api_unittest.cc', - '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc', - '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc', - '$CHROME_DIR/renderer/render_view_unittest.cc', - '$CHROME_DIR/renderer/render_widget_unittest.cc', - '$CHROME_DIR/renderer/render_process_unittest.cc', - '$CHROME_DIR/renderer/render_thread_unittest.cc', - '$CHROME_DIR/renderer/renderer_main_unittest.cc', - - # test_infrastructure - '$CHROME_DIR/renderer/mock_render_process.h', - '$CHROME_DIR/renderer/mock_render_thread.cc', - '$CHROME_DIR/renderer/mock_render_thread.h', - '$CHROME_DIR/test/v8_unit_test.h', - '$CHROME_DIR/test/v8_unit_test.cc', - ]), - MSVSFilter('resources', [ - '$CHROME_DIR/browser/browser_resources.h', - '$CHROME_DIR/browser/browser_resources.rc', - '$CHROME_DIR/app/chrome_dll.rc', - '$CHROME_DIR/app/chrome_dll_resource.h', - '$CHROME_DIR/app/chrome_dll_version.rc.version', - '$CHROME_DIR/common/common_resources.h', - '$CHROME_DIR/common/common_resources.rc', - '$CHROME_DIR/browser/debugger/resources/debugger_resources.h', - '$CHROME_DIR/browser/debugger/resources/debugger_resources.rc', - '$TARGET_ROOT/grit_derived_sources/net_resources.res', - '$CHROME_DIR/renderer/renderer_resources.h', - '$CHROME_DIR/renderer/renderer_resources.rc', - '$CHROME_DIR/test/data/resource.h', - '$CHROME_DIR/test/data/resource.rc', - '$TARGET_ROOT/grit_derived_sources/webkit_resources.res', - ]), - MSVSFilter('test_infrastructure', [ - 'chrome_test_suite.h', - '$CHROME_DIR/common/ipc_test_sink.cc', - '$CHROME_DIR/common/ipc_test_sink.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'run_all_unittests.cc', - '$CHROME_DIR/test/test_notification_tracker.cc', - '$CHROME_DIR/test/test_notification_tracker.h', - '$CHROME_DIR/test/testing_browser_process.h', - '$CHROME_DIR/test/testing_profile.cc', - '$CHROME_DIR/test/testing_profile.h', - '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', - '$NET_DIR/url_request/url_request_test_job.h', - ]), -]) - -if env.Bit('mac'): - # TODO(port): Port to Mac. - input_files.Remove( - 'run_all_unittests.cc', - - '$CHROME_DIR/browser/chrome_thread_unittest.cc', - '$CHROME_DIR/browser/extensions/extension_unittest.cc', - '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc', - '$CHROME_DIR/browser/history/history_types_unittest.cc', - '$CHROME_DIR/browser/history/snippet_unittest.cc', - '$CHROME_DIR/browser/history/text_database_unittest.cc', - '$CHROME_DIR/browser/history/visit_tracker_unittest.cc', - '$CHROME_DIR/browser/metrics/metrics_response_unittest.cc', - '$CHROME_DIR/browser/net/dns_host_info_unittest.cc', - '$CHROME_DIR/browser/net/dns_master_unittest.cc', - '$CHROME_DIR/browser/net/url_fetcher_unittest.cc', - '$CHROME_DIR/browser/printing/page_range_unittest.cc', - '$CHROME_DIR/browser/printing/page_setup_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc', - '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc', - '$CHROME_DIR/browser/spellcheck_unittest.cc', - '$CHROME_DIR/common/animation_unittest.cc', - '$CHROME_DIR/common/bzip2_unittest.cc', - '$CHROME_DIR/common/gfx/chrome_font_unittest.cc', - '$CHROME_DIR/common/ipc_message_unittest.cc', - '$CHROME_DIR/common/jpeg_codec_unittest.cc', - '$CHROME_DIR/common/json_value_serializer_unittest.cc', - '$CHROME_DIR/common/mru_cache_unittest.cc', - '$CHROME_DIR/common/notification_service_unittest.cc', - '$CHROME_DIR/common/pref_member_unittest.cc', - '$CHROME_DIR/common/worker_thread_ticker_unittest.cc', - '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc', - '$CHROME_DIR/test/test_notification_tracker.cc', - - '$NET_DIR/base/ssl_test_util$OBJSUFFIX', - ) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/browser/browser_resources.h', - '$CHROME_DIR/browser/browser_resources.rc', - '$CHROME_DIR/app/chrome_dll.rc', - '$CHROME_DIR/app/chrome_dll_resource.h', - '$CHROME_DIR/app/chrome_dll_version.rc.version', - '$CHROME_DIR/common/common_resources.h', - '$CHROME_DIR/common/common_resources.rc', - '$CHROME_DIR/browser/debugger/resources/debugger_resources.h', - '$CHROME_DIR/browser/debugger/resources/debugger_resources.rc', - '$TARGET_ROOT/grit_derived_sources/net_resources.res', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - '$CHROME_DIR/renderer/renderer_resources.h', - '$CHROME_DIR/renderer/renderer_resources.rc', - '$CHROME_DIR/test/data/resource.h', - '$CHROME_DIR/test/data/resource.rc', - '$TARGET_ROOT/grit_derived_sources/webkit_resources.res', - ) - -if env.Bit('posix'): - # POSIX only unittests - input_files.Append( - '$CHROME_DIR/common/file_descriptor_set_unittest.cc' - ) - -if not env.Bit('windows'): - # TODO(port): Port these. - input_files.Remove( - '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc', - '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc', - '$CHROME_DIR/browser/browser_commands_unittest.cc', - # This test is mostly about renaming downloads to safe file names. As such - # we don't need/want to port it to linux. We might want to write our own - # tests for the download manager on linux, though. - '$CHROME_DIR/browser/download/download_manager_unittest.cc', - '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc', - '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc', - '$CHROME_DIR/browser/importer/importer_unittest.cc', - '$CHROME_DIR/browser/login_prompt_unittest.cc', - '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc', - '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc', - '$CHROME_DIR/browser/printing/page_number_unittest.cc', - '$CHROME_DIR/browser/printing/page_overlays_unittest.cc', - '$CHROME_DIR/browser/printing/print_job_unittest.cc', - '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc', - '$CHROME_DIR/browser/rlz/rlz_unittest.cc', - '$CHROME_DIR/browser/sessions/session_service_unittest.cc', - '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc', - '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc', - '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc', - '$CHROME_DIR/browser/webdata/web_database_unittest.cc', - '$CHROME_DIR/browser/window_sizer_unittest.cc', - '$CHROME_DIR/common/chrome_plugin_unittest.cc', - '$CHROME_DIR/common/gfx/emf_unittest.cc', - '$CHROME_DIR/common/gfx/icon_util_unittest.cc', - '$CHROME_DIR/common/os_exchange_data_unittest.cc', - '$CHROME_DIR/common/win_util_unittest.cc', - '$CHROME_DIR/test/browser_with_test_window_test.cc', - - # Commented out for now because googleurl_tests doesn't build with - # gtest; see ../build/SConscript.googleurl. - #'$GOOGLEURL_DIR/googleurl_tests.lib', - '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', - - '$CHROME_DIR/browser/browser_resources.res', - '$CHROME_DIR/test/data/resource.res', - ) - -if not env.Bit('mac'): - # TODO(port): This should work on all platforms. - - unit_tests = env.ChromeTestProgram('unit_tests', input_files) - - i = env.Install('$TARGET_ROOT', unit_tests) - Alias('chrome', i) - -p = env.ChromeMSVSProject('unittests.vcproj', - dest='$CHROME_SRC_DIR/chrome/test/unit/unittests.vcproj', - name='unit_tests', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$CHROME_DIR/plugin/plugin.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj', - ('$WEBKIT_DIR/build/JavaScriptCore/' + - 'JavaScriptCore_pcre.vcproj'), - '$WEBKIT_DIR/build/port/port.vcproj', - '$CHROME_DIR/browser/debugger/debugger.vcproj', - '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', - '$CHROME_DIR/browser/browser.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - '$CHROME_DIR/views/views.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$CHROME_DIR/app/chrome_exe.vcproj', - '$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$CHROME_DIR/renderer/renderer.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - '$CHROME_DIR/browser/resources/browser_resources.vcproj', - '$RLZ_DIR/rlz.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$CHROME_DIR/app/locales/en-US.vcproj', - '$SKIA_DIR/skia.vcproj', - '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', - '$CHROME_DIR/app/generated_resources.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - '$CHROME_DIR/app/theme/theme_dll.vcproj', - ], - guid='{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - MSVSTool('VCResourceCompilerTool', - AdditionalIncludeDirectories=[ - '$(SolutionDir)..', - '"$(IntDir)"', - '"$(IntDir)"', - '"$(SolutionDir)"', - '"$(IntDir)/../"', - ]), - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies='winmm.lib'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../../tools/build/win/precompiled_wtl.vsprops', - '../../tools/build/win/unit_test.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../third_party/libxml/build/using_libxml.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - '../../third_party/hunspell/using_hunspell.vsprops', - '../../../third_party/npapi/using_npapi.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../tools/build/win/unit_test.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../skia/using_skia.vsprops', - '$(SolutionDir)../third_party/libxml/build/using_libxml.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - '../../third_party/hunspell/using_hunspell.vsprops', - '../../../third_party/npapi/using_npapi.vsprops', - ]) - -p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript deleted file mode 100644 index c9c92c0..0000000 --- a/chrome/third_party/hunspell/SConscript +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Copyright 2008 Google Inc. All Rights Reserved. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$ICU38_DIR/public/common', - '$CHROME_SRC_DIR', - ], -) - -env.Append( - CPPDEFINES = [ - 'OPENOFFICEORG', - 'CHROME_SPELL', - 'HUNSPELL_CHROME_CLIENT', - ], -) - -if env.Bit('windows'): - env.Append( - CPPDEFINES = [ - 'W32', - ], - CCFLAGS = [ - '/TP', - - '/wd4800', - ], - ) - -if env.Bit('linux'): - env.Append( - CCFLAGS = [ - '-Wno-parentheses', - '-Wno-unused-value', - '-Wno-unused-variable', - '-Wno-write-strings', - ], - ) - -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('parsers', [ - 'src/parsers/textparser.cxx', - 'src/parsers/textparser.hxx', - ]), - MSVSFilter('hunspell', [ - 'src/hunspell/affentry.cxx', - 'src/hunspell/affentry.hxx', - 'src/hunspell/affixmgr.cxx', - 'src/hunspell/affixmgr.hxx', - 'src/hunspell/atypes.hxx', - 'src/hunspell/baseaffix.hxx', - 'src/hunspell/csutil.cxx', - 'src/hunspell/csutil.hxx', - 'src/hunspell/dictmgr.cxx', - 'src/hunspell/dictmgr.hxx', - 'src/hunspell/hashmgr.cxx', - 'src/hunspell/hashmgr.hxx', - 'src/hunspell/htypes.hxx', - 'src/hunspell/hunspell.cxx', - 'src/hunspell/hunspell.h', - 'src/hunspell/hunspell.hxx', - 'src/hunspell/langnum.hxx', - 'src/hunspell/suggestmgr.cxx', - 'src/hunspell/suggestmgr.hxx', - 'src/hunspell/utf_info.hxx', - ]), - MSVSFilter('google', [ - 'google/bdict.h', - 'google/bdict_affentry.h', - 'google/bdict_reader.h', - 'google/bdict_writer.h', - ]), -]) - -if env.Bit('linux'): - bdict_reader_o = env.ChromeObject('google/bdict_reader.cc') - input_files.Append(bdict_reader_o) - bdict_writer_o = env.ChromeObject('google/bdict_writer.cc') - input_files.Append(bdict_writer_o) - Export('bdict_reader_o', 'bdict_writer_o') -else: - input_files.Append( - MSVSFilter('google', [ - 'google/bdict_reader.cc', - 'google/bdict_writer.cc', - ]), - ) - -env.ChromeLibrary('hunspell', input_files) - - -p = env.ChromeMSVSProject('hunspell.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'third_party/hunspell/hunspell.vcproj'), - guid='{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '../../../build/debug.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - './hunspell.vsprops', - './using_hunspell.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '../../../build/release.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - './hunspell.vsprops', - './using_hunspell.vsprops', - ]) diff --git a/chrome/third_party/hunspell/using_hunspell.scons b/chrome/third_party/hunspell/using_hunspell.scons deleted file mode 100644 index 51d430d..0000000 --- a/chrome/third_party/hunspell/using_hunspell.scons +++ /dev/null @@ -1,22 +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 hunspell. -""" - -Import("env") - -env.Append( - CPPDEFINES = [ - 'USE_HUNSPELL', - 'HUNSPELL_CHROME_CLIENT', - ], - CPPPATH = [ - '$CHROME_DIR/third_party/hunspell/src/hunspell', - ], - LIBS = [ - 'hunspell', - ], -) diff --git a/chrome/third_party/wtl/using_wtl.scons b/chrome/third_party/wtl/using_wtl.scons deleted file mode 100644 index 21e528a..0000000 --- a/chrome/third_party/wtl/using_wtl.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 wtl. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$CHROME_DIR/third_party/wtl/include', - ], -) diff --git a/chrome/tools/convert_dict/convert_dict.scons b/chrome/tools/convert_dict/convert_dict.scons deleted file mode 100644 index 1d7da3a..0000000 --- a/chrome/tools/convert_dict/convert_dict.scons +++ /dev/null @@ -1,93 +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. - -Import('env') -Import('bdict_reader_o', 'bdict_writer_o') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', -# '$BASE_DIR/gfx/using_base_gfx.scons', -# '$BREAKPAD_DIR/using_breakpad.scons', - '$ICU38_DIR/using_icu38.scons', -# '$SKIA_DIR/using_skia.scons', -# '$ZLIB_DIR/using_zlib.scons', -]) - -if env.Bit('windows'): - env.Prepend( - LIBS = [ - #'breakpad_handler', - #'breakpad_sender', - #'common', - ], - ) - -input_files = ChromeFileList([ - 'aff_reader.cc', - 'aff_reader.h', - '$CHROME_DIR/third_party/hunspell/google/bdict.h', - bdict_reader_o, - '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h', - bdict_writer_o, - '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h', - 'convert_dict.cc', - 'dic_reader.cc', - 'dic_reader.h', - 'hunspell_reader.cc', - 'hunspell_reader.h', -]) - -env.ChromeProgram('convert_dict', input_files) - -p = env.ChromeMSVSProject('convert_dict.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/convert_dict/convert_dict.vcproj'), - guid='{42ECD5EC-722F-41DE-B6B8-83764C8016DF}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - CharacterSet='2', - InheritedPropertySheets=[ - '../../../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - CharacterSet='2', - InheritedPropertySheets=[ - '../../../build/release.vsprops', - ]) diff --git a/chrome/tools/crash_service/crash_service.scons b/chrome/tools/crash_service/crash_service.scons deleted file mode 100644 index da8eddf..0000000 --- a/chrome/tools/crash_service/crash_service.scons +++ /dev/null @@ -1,110 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$BREAKPAD_DIR/using_breakpad.scons', - '$ICU38_DIR/using_icu38.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'breakpad_handler', - 'breakpad_sender', - 'common', - ], - LINKFLAGS = [ - '/INCREMENTAL', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -input_files = ChromeFileList([ - 'crash_service.cc', - 'crash_service.h', - 'main.cc', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeProgram('crash_service', input_files) - -p = env.ChromeMSVSProject('crash_service.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/crash_service/crash_service.vcproj'), - guid='{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BREAKPAD_DIR/breakpad_sender.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$BREAKPAD_DIR/breakpad_handler.vcproj', - '$SKIA_DIR/skia.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - '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)../breakpad/using_breakpad.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../breakpad/using_breakpad.vsprops', - ]) diff --git a/chrome/tools/perf/flush_cache/flush_cache.scons b/chrome/tools/perf/flush_cache/flush_cache.scons deleted file mode 100644 index ee36224..0000000 --- a/chrome/tools/perf/flush_cache/flush_cache.scons +++ /dev/null @@ -1,90 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$ICU38_DIR/using_icu38.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -input_files = ChromeFileList([ - 'flush_cache.cc', -]) - -env.ChromeTestProgram('flush_cache', input_files) - -p = env.ChromeMSVSProject('flush_cache.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/perf/flush_cache/flush_cache.vcproj'), - guid='{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - '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', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) diff --git a/chrome/tools/profiles/generate_profile.scons b/chrome/tools/profiles/generate_profile.scons deleted file mode 100644 index cead552..0000000 --- a/chrome/tools/profiles/generate_profile.scons +++ /dev/null @@ -1,166 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/gfx/using_base_gfx.scons', - '$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', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', - '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPDEFINES = [ - 'PERF_TEST', - ], - LIBS = [ - 'activex_shim', - 'browser', - 'browser_views', - 'common', - 'debugger', - 'default_plugin', - 'glue', - 'hunspell', - 'JavaScriptCore_pcre', - 'plugin', - 'port', - 'renderer', - 'sqlite', - 'util', - 'v8_snapshot', - 'V8Bindings', - 'views', - 'WebCore', - 'WTF', - ], -) - -if env.Bit('windows'): - env.Prepend( - LIBS = [ - 'rpcrt4', - 'shlwapi', - 'winmm', - ], - ) - -input_files = ChromeFileList([ - 'generate_profile.cc', - 'thumbnail-inl.h', -]) - -# TODO(port): -if env.Bit('windows'): - env.ChromeTestProgram('generate_profile', input_files) - -p = env.ChromeMSVSProject('generate_profile.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/profiles/generate_profile.vcproj'), - guid='{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$CHROME_DIR/plugin/plugin.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj', - ('$WEBKIT_DIR/build/JavaScriptCore/' + - 'JavaScriptCore_pcre.vcproj'), - '$WEBKIT_DIR/build/port/port.vcproj', - '$CHROME_DIR/browser/debugger/debugger.vcproj', - ('$WEBKIT_DIR/default_plugin/' - + 'default_plugin.vcproj'), - '$CHROME_DIR/browser/browser.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - '$CHROME_DIR/views/views.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$CHROME_DIR/common/common.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$CHROME_DIR/renderer/renderer.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$SKIA_DIR/skia.vcproj', - ('$CHROME_DIR/third_party/' - + 'hunspell/hunspell.vcproj'), - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$CHROME_DIR/installer/util/util.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$CHROME_DIR/browser/views/browser_views.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - AdditionalIncludeDirectories='../../..', - PreprocessorDefinitions='PERF_TEST'), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - AdditionalDependencies=[ - 'shlwapi.lib', - 'rpcrt4.lib', - 'winmm.lib' - ], - 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', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '../../../skia/using_skia.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops', - '../../../skia/using_skia.vsprops', - ]) diff --git a/chrome/tools/test/image_diff/image_diff.scons b/chrome/tools/test/image_diff/image_diff.scons deleted file mode 100644 index 3c9b664..0000000 --- a/chrome/tools/test/image_diff/image_diff.scons +++ /dev/null @@ -1,90 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$BASE_DIR/gfx/using_base_gfx.scons', - '$ICU38_DIR/using_icu38.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/SUBSYSTEM:CONSOLE', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -input_files = ChromeFileList([ - 'image_diff.cc', -]) - -env.ChromeTestProgram('image_diff', input_files) - -p = env.ChromeMSVSProject('image_diff.vcproj', - dest=('$CHROME_SRC_DIR/chrome/' - + 'tools/test/image_diff/image_diff.vcproj'), - guid='{50B079C7-CD01-42D3-B8C4-9F8D9322E822}', - keyword='Win32Proj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - MSVSTool('VCLinkerTool', - SubSystem='1'), - 'VCCLCompilerTool', - ], - ConfigurationType='1') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - ]) diff --git a/chrome/views/SConscript b/chrome/views/SConscript deleted file mode 100644 index db986d6..0000000 --- a/chrome/views/SConscript +++ /dev/null @@ -1,315 +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. - -Import('env') - -env = env.Clone() - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - '$CHROME_SRC_DIR', - ], - CCFLAGS = [ - '/TP', - #'/Wp64', - ], - ) - -env.Append( - CPPPATH = [ - '$TARGET_ROOT/grit_derived_sources', - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/include/platform', - 'third_party/wtl/include', - ], -) - -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('Accessibility', [ - 'accessibility/accessible_wrapper.cc', - 'accessibility/accessible_wrapper.h', - 'accessibility/view_accessibility.cc', - 'accessibility/view_accessibility.h', - ]), - 'accelerator.cc', - 'accelerator.h', - 'background.cc', - 'background.h', - 'controls/button/button.cc', - 'controls/button/button.h', - 'controls/scrollbar/bitmap_scroll_bar.cc', - 'controls/scrollbar/bitmap_scroll_bar.h', - 'border.cc', - 'border.h', - 'controls/button/custom_button.cc', - 'controls/button/custom_button.h', - 'controls/button/image_button.cc', - 'controls/button/image_button.h', - 'controls/button/button_dropdown.cc', - 'controls/button/button_dropdown.h', - 'controls/button/checkbox.cc', - 'controls/button/checkbox.h', - 'controls/menu/chrome_menu.cc', - 'controls/menu/chrome_menu.h', - 'controls/combo_box.cc', - 'controls/combo_box.h', - 'controls/menu/controller.h', - 'event.cc', - 'event.h', - 'focus/external_focus_tracker.cc', - 'focus/external_focus_tracker.h', - 'focus/focus_manager.cc', - 'focus/focus_manager.h', - 'focus/view_storage.cc', - 'focus/view_storage.h', - 'fill_layout.cc', - 'fill_layout.h', - 'grid_layout.cc', - 'grid_layout.h', - 'controls/table/group_table_view.cc', - 'controls/table/group_table_view.h', - 'controls/hwnd_view.cc', - 'controls/hwnd_view.h', - 'controls/image_view.cc', - 'controls/image_view.h', - 'controls/label.cc', - 'controls/label.h', - 'layout_manager.cc', - 'layout_manager.h', - 'controls/link.cc', - 'controls/link.h', - 'controls/menu/menu.cc', - 'controls/menu/menu.h', - 'controls/button/menu_button.cc', - 'controls/button/menu_button.h', - 'controls/message_box_view.cc', - 'controls/message_box_view.h', - 'controls/button/native_button.cc', - 'controls/button/native_button.h', - 'controls/native_control.cc', - 'controls/native_control.h', - 'controls/scrollbar/native_scroll_bar.cc', - 'controls/scrollbar/native_scroll_bar.h', - 'painter.cc', - 'painter.h', - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - 'controls/button/radio_button.cc', - 'controls/button/radio_button.h', - 'repeat_controller.cc', - 'repeat_controller.h', - 'resize_corner.cc', - 'resize_corner.h', - 'controls/scrollbar/scroll_bar.cc', - 'controls/scrollbar/scroll_bar.h', - 'controls/scroll_view.cc', - 'controls/scroll_view.h', - 'controls/separator.cc', - 'controls/separator.h', - 'controls/single_split_view.cc', - 'controls/single_split_view.h', - 'controls/tabbed_pane.cc', - 'controls/tabbed_pane.h', - 'controls/table/table_view.cc', - 'controls/table/table_view.h', - 'controls/button/text_button.cc', - 'controls/button/text_button.h', - 'controls/text_field.cc', - 'controls/text_field.h', - 'controls/throbber.cc', - 'controls/throbber.h', - 'controls/tree/tree_model.h', - 'controls/tree/tree_node_iterator.h', - 'controls/tree/tree_node_model.h', - 'controls/tree/tree_view.cc', - 'controls/tree/tree_view.h', - 'view.cc', - 'view.h', - 'view_constants.cc', - 'view_constants.h', - 'controls/menu/view_menu_delegate.h', - 'widget/accelerator_handler.cc', - 'widget/accelerator_handler.h', - 'widget/aero_tooltip_manager.cc', - 'widget/aero_tooltip_manager.h', - 'widget/hwnd_notification_source.h', - 'widget/root_view.cc', - 'widget/root_view.h', - 'widget/root_view_drop_target.cc', - 'widget/root_view_drop_target.h', - 'widget/tooltip_manager.cc', - 'widget/tooltip_manager.h', - 'widget/widget.h', - 'widget/widget_win.cc', - 'widget/widget_win.h', - 'window/app_modal_dialog_delegate.h', - 'window/client_view.cc', - 'window/client_view.h', - 'window/custom_frame_view.cc', - 'window/custom_frame_view.h', - 'window/dialog_client_view.cc', - 'window/dialog_client_view.h', - 'window/dialog_delegate.cc', - 'window/dialog_delegate.h', - 'window/native_frame_view.cc', - 'window/native_frame_view.h', - 'window/non_client_view.cc', - 'window/non_client_view.h', - 'window/window.h', - 'window/window_delegate.cc', - 'window/window_delegate.h', - 'window/window_resources.h', -]) - -if not env.Bit('windows'): - # Windows-specific. - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled_wtl.h', - ) - -if env.Bit('windows'): - input_files += [ - "view_win.cc", - "widget/root_view_win.cc" - ] - -if env.Bit('linux'): - input_files += [ - 'event_gtk.cc', - 'view_gtk.cc', - 'widget/root_view_gtk.cc', - 'widget/widget_gtk.cc' - ] - # TODO(port?): Incomplete and undecided Views stuff. These compile but aren't - # currently needed, and they break the shared build due to missing symbols - # (from files that aren't yet ported). - # - # TOD(erg): Commenting this section out because we're trying to get views to - # compile under Linux again. -# input_files.Remove( -# 'background.cc', -# 'border.cc', -# 'focus/external_focus_tracker.cc', -# 'focus/view_storage.cc', -# 'grid_layout.cc', -# 'controls/image_view.cc', -# 'controls/label.cc', -# 'layout_manager.cc', -# 'painter.cc', -# 'repeat_controller.cc', -# 'controls/scrollbar/scroll_bar.cc', -# 'controls/scroll_view.cc', -# 'controls/throbber.cc', -# 'view.cc', -# 'widget/root_view.cc', -# ) - - # TODO(port): Port to Linux. - input_files.Remove( - 'accelerator.cc', - 'accessibility/accessible_wrapper.cc', - 'accessibility/view_accessibility.cc', - 'controls/scrollbar/bitmap_scroll_bar.cc', - 'controls/button/image_button.cc', - 'controls/button/button_dropdown.cc', - 'controls/button/checkbox.cc', - 'controls/menu/chrome_menu.cc', - 'controls/combo_box.cc', - 'focus/focus_manager.cc', - 'controls/table/group_table_view.cc', - 'controls/hwnd_view.cc', - 'controls/link.cc', - 'controls/menu/menu.cc', - 'controls/button/menu_button.cc', - 'controls/message_box_view.cc', - 'controls/button/native_button.cc', - 'controls/native_control.cc', - 'controls/scrollbar/native_scroll_bar.cc', - 'controls/button/radio_button.cc', - 'resize_corner.cc', - 'controls/separator.cc', - 'controls/single_split_view.cc', - 'controls/tabbed_pane.cc', - 'controls/table/table_view.cc', - 'controls/text_field.cc', - 'controls/tree/tree_view.cc', - 'widget/accelerator_handler.cc', - 'widget/aero_tooltip_manager.cc', - 'widget/root_view_drop_target.cc', - 'widget/tooltip_manager.cc', - 'widget/widget_win.cc', - 'window/client_view.cc', - 'window/custom_frame_view.cc', - 'window/dialog_delegate.cc', - 'window/dialog_client_view.cc', - 'window/native_frame_view.cc', - 'window/non_client_view.cc', - 'window/window_delegate.cc', - 'window/window_win.cc', - ) - -env.ChromeLibrary('views', input_files) - -p = env.ChromeMSVSProject('views.vcproj', - dest='$CHROME_SRC_DIR/chrome/views/views.vcproj', - guid='{6F9258E5-294F-47B2-919D-17FFE7A8B751}', - keyword='Win32Proj', - dependencies = [ - '$CHROME_DIR/app/generated_resources.vcproj', - ], - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - root_namespace = 'Views', - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - './views.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled_wtl.vsprops', - '../../third_party/icu38/build/using_icu.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - './views.vsprops', - '$(SolutionDir)../build/release.vsprops', - '../../third_party/icu38/build/using_icu.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled_wtl.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/chrome/worker/worker.scons b/chrome/worker/worker.scons deleted file mode 100644 index fe4aaa2..0000000 --- a/chrome/worker/worker.scons +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright (c) 2009 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. - -Import('env') - -env = env.Clone() - -env.SConscript([ -# '$NPAPI_DIR/using_npapi.scons', -# '$SKIA_DIR/using_skia.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - CPPPATH = [ - '$CHROME_DIR/tools/build/win', - ], - ) - -input_files = ChromeFileList([ - 'webworkerclient_proxy.cc', - 'webworkerclient_proxy.h', - 'worker_main.cc', - 'worker_thread.cc', - 'worker_thread.h', - 'worker_webkitclient_impl.cc', - 'worker_webkitclient_impl.h', - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - '$CHROME_DIR/tools/build/win/precompiled.h', -]) - -if not env.Bit('windows'): - input_files.Remove( - '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', - ) - -if env.Bit('posix'): - # TODO(port) - input_files.Remove( - 'webworker.cc', - 'worker_main.cc', - 'worker_thread.cc', - 'worker_webkitclient_impl.cc', - ) - -env.ChromeLibrary('worker', input_files) - -p = env.ChromeMSVSProject('worker.vcproj', - dest='$CHROME_SRC_DIR/chrome/worker/worker.vcproj', - guid='{C78D02D0-A366-4ec6-A248-AA8E64C4BA18}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - local_directory_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '../tools/build/win/precompiled.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) - -p.AddFileConfig('../tools/build/win/precompiled.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', - UsePrecompiledHeader='1'), - ]) diff --git a/google_update/SConscript b/google_update/SConscript deleted file mode 100644 index 183e872..0000000 --- a/google_update/SConscript +++ /dev/null @@ -1,42 +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. - -Import('env') - -input_files = ChromeFileList([ - 'google_update_idl.idl', -]) - -# TODO(port): -if env.Bit('windows'): - # TODO(sgk): get from the input_files list. - env.TypeLibrary('google_update_idl') - -p = env.ChromeMSVSProject('ondemand_updates.vcproj', - dest=('$CHROME_SRC_DIR/google_update/' + - 'ondemand_updates.vcproj'), - guid='{4052059A-D72B-4183-B5C2-9D1B099E9E35}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCMIDLTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='10') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - ]) diff --git a/google_update/using_google_update.scons b/google_update/using_google_update.scons deleted file mode 100644 index c3d95cc..0000000 --- a/google_update/using_google_update.scons +++ /dev/null @@ -1,20 +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 Google Update. -""" - -Import("env") - -# Google Update only works on Windows. -if env.Bit('windows'): - env.Append( - CPPPATH = [ - '$GOOGLE_UPDATE_DIR', - ], - LIBS = [ - 'google_update', - ], - ) diff --git a/media/SConstruct b/media/SConstruct deleted file mode 100644 index 5c859c2..0000000 --- a/media/SConstruct +++ /dev/null @@ -1,7 +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 = 'media' -SConscript('../build/SConscript.main', - exports=['build_component']) diff --git a/media/media.scons b/media/media.scons deleted file mode 100644 index aeeac77..0000000 --- a/media/media.scons +++ /dev/null @@ -1,23 +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 media components. -""" - -Import('env') - -# Arrange for Hammer to add all programs to the 'media' Alias. -env.Append( - COMPONENT_PROGRAM_GROUPS = ['media'], - COMPONENT_TEST_PROGRAM_GROUPS = ['media'], -) - -sconscript_files = [ - 'media_lib.scons', - 'media_player.scons', - 'media_unittests.scons', -] - -SConscript(sconscript_files, exports=['env']) diff --git a/media/media_lib.scons b/media/media_lib.scons deleted file mode 100644 index 3a13b43..0000000 --- a/media/media_lib.scons +++ /dev/null @@ -1,127 +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 media.lib / libmedia.a. -""" - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$ICU38_DIR/using_icu38.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -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('base', [ - 'base/buffers.h', - 'base/data_buffer.cc', - 'base/data_buffer.h', - 'base/factory.h', - 'base/filter_host.h', - 'base/filter_host_impl.cc', - 'base/filter_host_impl.h', - 'base/filters.h', - 'base/media_format.cc', - 'base/media_format.h', - 'base/pipeline.h', - 'base/pipeline_impl.cc', - 'base/pipeline_impl.h', - 'base/synchronizer.cc', - 'base/synchronizer.h', - 'base/video_frame_impl.cc', - 'base/video_frame_impl.h', - 'base/yuv_convert.cc', - 'base/yuv_convert.h', - ]), - MSVSFilter('filters', [ - 'filters/audio_renderer_base.cc', - 'filters/audio_renderer_base.h', - 'filters/audio_renderer_impl.cc', - 'filters/audio_renderer_impl.h', - 'filters/decoder_base.h', - 'filters/file_data_source.cc', - 'filters/file_data_source.h', - 'filters/null_audio_renderer.cc', - 'filters/null_audio_renderer.h', - 'filters/video_renderer_base.cc', - 'filters/video_renderer_base.h', - ]), - MSVSFilter('audio', [ - 'audio/win/audio_manager_win.h', - 'audio/audio_output.h', - 'audio/win/audio_output_win.cc', - 'audio/simple_sources.h', - 'audio/win/simple_sources_win.cc', - 'audio/win/waveout_output_win.cc', - 'audio/win/waveout_output_win.h', - ]), -]) - -if env.Bit('linux'): - input_files.Extend([ - 'audio/linux/audio_manager_linux.cc', - ]) - -if env.Bit('mac'): - input_files.Extend([ - 'audio/mac/audio_manager_mac.cc', - ]) - -if not env.Bit('windows'): - # Windows-specific files. - input_files.Remove( - 'audio/win/audio_output_win.cc', - 'audio/win/simple_sources_win.cc', - 'audio/win/waveout_output_win.cc', - ) - -env.ChromeLibrary('media', input_files) - -p = env.ChromeMSVSProject('build/media.vcproj', - dest='$CHROME_SRC_DIR/media/build/media.vcproj', - guid='{6AE76406-B03B-11DD-94B1-80B556D89593}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - ]) diff --git a/media/media_player.scons b/media/media_player.scons deleted file mode 100644 index 87513c6..0000000 --- a/media/media_player.scons +++ /dev/null @@ -1,62 +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 media_player. -""" - -Import('env') - -env = env.Clone() - -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('player', [ - 'player/player.cc', - ]), -]) - -p = env.ChromeMSVSProject('build/media_player.vcproj', - dest=('$CHROME_SRC_DIR/media/' + - 'build/media_player.vcproj'), - guid='{D4EB0EDC-DC4D-11DD-AE66-DC4F55D89593}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLinkerTool', - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - ]) diff --git a/media/media_unittests.scons b/media/media_unittests.scons deleted file mode 100644 index 3a01710..0000000 --- a/media/media_unittests.scons +++ /dev/null @@ -1,125 +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 media_unittests{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$MEDIA_DIR/using_media.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/TP', - '/WX', - ], - CPPDEFINES = [ - '_WIN32_WINNT=0x0600', - 'WINVER=0x0600', - '_HAS_EXCEPTIONS=0', - ], - LINKFLAGS = [ - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -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/run_all_unittests.cc', - ]), - MSVSFilter('tests', [ - MSVSFilter('base', [ - 'base/data_buffer_unittest.cc', - 'base/pipeline_impl_unittest.cc', - 'base/video_frame_impl_unittest.cc', - 'base/yuv_convert_unittest.cc', - ]), - MSVSFilter('filters', [ - 'filters/file_data_source_unittest.cc', - 'filters/test_video_decoder.h', - 'filters/test_video_renderer.h', - 'filters/video_renderer_unittest.cc', - 'filters/video_decoder_unittest.cc', - ]), - MSVSFilter('audio', [ - 'audio/win/audio_output_win_unittest.cc', - ]), - ]), -]) - -if not env.Bit('windows'): - input_files.Remove( - 'audio/win/audio_output_win_unittest.cc', - ) - -env.ChromeTestProgram('media_unittests', input_files) - -p = env.ChromeMSVSProject('build/media_unittests.vcproj', - dest=('$CHROME_SRC_DIR/media/' + - 'build/media_unittests.vcproj'), - guid='{C8C6183C-B03C-11DD-B471-DFD256D89593}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - 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', - ], - ConfigurationType='1') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - ]) diff --git a/media/using_media.scons b/media/using_media.scons deleted file mode 100644 index 545325a2..0000000 --- a/media/using_media.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 media library. -""" - -Import("env") - -env.Append( - LIBS = [ - 'media', - ], -) 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', - ], -) diff --git a/printing/SConstruct b/printing/SConstruct deleted file mode 100644 index feee7f2..0000000 --- a/printing/SConstruct +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2009 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 = 'printing' -SConscript('../build/SConscript.main', - exports=['build_component']) diff --git a/printing/printing.scons b/printing/printing.scons deleted file mode 100644 index c86c31a..0000000 --- a/printing/printing.scons +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2009 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 printing components. -""" - -Import('env') - -# Arrange for Hammer to add all programs to the 'printing' Alias. -env.Append( - COMPONENT_PROGRAM_GROUPS = ['printing'], - COMPONENT_TEST_PROGRAM_GROUPS = ['printing'], -) - -sconscript_files = [ - 'printing_lib.scons', - 'printing_unittests.scons', -] - -SConscript(sconscript_files, exports=['env']) diff --git a/printing/printing_lib.scons b/printing/printing_lib.scons deleted file mode 100644 index 29986af..0000000 --- a/printing/printing_lib.scons +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (c) 2009 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 printing.lib / libprinting.a. -""" - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -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. - 'units.cc', - 'units.h', -]) - -env.ChromeLibrary('printing', input_files) - -p = env.ChromeMSVSProject('build/printing.vcproj', - dest='$CHROME_SRC_DIR/printing/printing.vcproj', - guid='{9E5416B9-B91B-4029-93F4-102C1AD5CAF4}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './printing.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './printing.vsprops', - ]) diff --git a/printing/printing_unittests.scons b/printing/printing_unittests.scons deleted file mode 100644 index 097a38d..0000000 --- a/printing/printing_unittests.scons +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright (c) 2009 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 printing_unittests{,.exe} executable. -""" - -Import('env') - -env = env.Clone() - -env.SConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$ICU38_DIR/using_icu38.scons', - '$PRINTING_DIR/using_printing.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/TP', - '/WX', - ], - CPPDEFINES = [ - '_WIN32_WINNT=0x0600', - 'WINVER=0x0600', - '_HAS_EXCEPTIONS=0', - ], - LINKFLAGS = [ - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -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', [ - 'run_all_unittests.cc', - '../base/test_suite.h', - ]), - MSVSFilter('tests', [ - 'units_unittest.cc', - ]), -]) - -env.ChromeTestProgram('printing_unittests', input_files) - -p = env.ChromeMSVSProject('build/printing_unittests.vcproj', - dest=('$CHROME_SRC_DIR/printing/' + - 'printing_unittests.vcproj'), - guid='{8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - 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', - ], - ConfigurationType='1') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - 'printing.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../testing/using_gtest.vsprops', - 'printing.vsprops', - ]) diff --git a/printing/using_printing.scons b/printing/using_printing.scons deleted file mode 100644 index f90e5bf..0000000 --- a/printing/using_printing.scons +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2009 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 printing library. -""" - -Import("env") - -env.Append( - LIBS = [ - 'printing', - ], -) diff --git a/sandbox/SConstruct b/sandbox/SConstruct deleted file mode 100644 index aff44be..0000000 --- a/sandbox/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 = 'sandbox' -SConscript('../build/SConscript.main', - exports=['build_component']) - diff --git a/sandbox/sandbox.scons b/sandbox/sandbox.scons deleted file mode 100644 index 26920a3..0000000 --- a/sandbox/sandbox.scons +++ /dev/null @@ -1,32 +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 base components (including base_gfx). -""" - -Import('env') - -# Arrange for Hammer to add all programs to the 'sandbox' Alias. -env.Append( - COMPONENT_PROGRAM_GROUPS = ['sandbox'], - COMPONENT_TEST_PROGRAM_GROUPS = ['sandbox'], -) - -sconscript_files = [ - 'src/sandbox_lib.scons', - 'sandbox_sln.scons', - 'tests/common/sandbox_common.scons', - 'tests/integration_tests/sbox_integration_tests.scons', - 'tests/unit_tests/sbox_unittests.scons', - 'tests/validation_tests/sbox_validation_tests.scons', - - # NOTE: We don't build wow_helper. It has generated binaries - # checked in directly. The wow_helper.scons config should be - # close (it replicates most options) but may need work to build - # successfully (plus the 64-bit version of Visual Studio tools). - #'wow_helper/wow_helper.scons', -] - -SConscript(sconscript_files, exports=['env']) diff --git a/sandbox/sandbox_sln.scons b/sandbox/sandbox_sln.scons deleted file mode 100644 index 4ee96a0..0000000 --- a/sandbox/sandbox_sln.scons +++ /dev/null @@ -1,137 +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.ChromeMSVSProject('$SANDBOX_DIR/sandbox_poc/sandbox_poc.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - '$SANDBOX_DIR/sandbox_poc/pocdll/pocdll.vcproj', - ], - guid='{CF757839-F2A1-417C-8F25-DCAE480020F1}') - -env.ChromeMSVSProject('$SANDBOX_DIR/sandbox_poc/pocdll/pocdll.vcproj', - guid='{AE5BFB87-850E-4454-B01D-58E7D8BAC224}') - -env.ChromeMSVSProject('$SANDBOX_DIR/src/sandbox.vcproj', - guid='{881F6A97-D539-4C48-B401-DF04385B2343}') - -env.ChromeMSVSProject(('$SANDBOX_DIR/tests/integration_tests/' + - 'sbox_integration_tests.vcproj'), - dependencies = [ - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - guid='{542D4B3B-98D4-4233-B68D-0103891508C6}') - -env.ChromeMSVSProject('$SANDBOX_DIR/tests/unit_tests/sbox_unittests.vcproj', - dependencies = [ - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - guid='{883553BE-2A9D-418C-A121-61FE1DFBC562}') - -env.ChromeMSVSProject(('$SANDBOX_DIR/tests/validation_tests/' + - 'sbox_validation_tests.vcproj'), - dependencies = [ - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - guid='{B9CC7B0D-145A-49C2-B887-84E43CFA0F27}') - -env.ChromeMSVSProject('$SANDBOX_DIR/tools/finder/finder.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - ], - guid='{ACDC2E06-0366-41A4-A646-C37E130A605D}') - -env.ChromeMSVSProject('$SANDBOX_DIR/tools/launcher/launcher.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - ], - guid='{386FA217-FBC2-4461-882D-CDAD221ED800}') - - -dependencies = env.ChromeMSVSFolder('sandbox_dependencies', - name='dependencies', - entries = [ - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - guid='{BCE54389-D18D-48B9-977E-9D1998200F63}') - -proof_of_concept = env.ChromeMSVSFolder('proof_of_concept', - entries = [ - ('$SANDBOX_DIR/sandbox_poc/pocdll/' + - 'pocdll.vcproj'), - ('$SANDBOX_DIR/sandbox_poc/' + - 'sandbox_poc.vcproj'), - ], - guid='{B607BE7B-3555-422C-A40B-28E73C0B5E24}') - -tests = env.ChromeMSVSFolder('tests', - entries = [ - ('$SANDBOX_DIR/tests/integration_tests/' + - 'sbox_integration_tests.vcproj'), - ('$SANDBOX_DIR/tests/unit_tests/' + - 'sbox_unittests.vcproj'), - ('$SANDBOX_DIR/tests/validation_tests/' + - 'sbox_validation_tests.vcproj'), - ], - guid='{F7A3B82E-B8B4-4FDF-BC8E-FEC9398F57ED}') - -tools = env.ChromeMSVSFolder('sandbox_tools', - name='tools', - entries = [ - '$SANDBOX_DIR/tools/launcher/launcher.vcproj', - '$SANDBOX_DIR/tools/finder/finder.vcproj', - ], - guid='{7F36EE20-5016-4051-B0D7-42824CDA0291}') - - -solution = env.ChromeMSVSSolution('$SANDBOX_DIR/sandbox.sln', - dest='$CHROME_SRC_DIR/sandbox/sandbox.sln', - entries = [ - '$SANDBOX_DIR/src/sandbox.vcproj', - ('$SANDBOX_DIR/tests/unit_tests/' + - 'sbox_unittests.vcproj'), - tests, - ('$SANDBOX_DIR/tests/validation_tests/' + - 'sbox_validation_tests.vcproj'), - dependencies, - '$BASE_DIR/build/debug_message.vcproj', - tools, - proof_of_concept, - '$SANDBOX_DIR/sandbox_poc/sandbox_poc.vcproj', - '$SANDBOX_DIR/sandbox_poc/pocdll/pocdll.vcproj', - '$SANDBOX_DIR/tools/finder/finder.vcproj', - '$SANDBOX_DIR/tools/launcher/launcher.vcproj', - ('$SANDBOX_DIR/tests/integration_tests/' + - 'sbox_integration_tests.vcproj'), - '$BASE_DIR/build/base.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - variants = [ - 'Debug|Win32', - 'Release|Win32', - ], - websiteProperties=False) diff --git a/sandbox/src/sandbox_lib.scons b/sandbox/src/sandbox_lib.scons deleted file mode 100644 index 8667968..0000000 --- a/sandbox/src/sandbox_lib.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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$GTEST_DIR/../using_gtest.scons', -]) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -input_files = [ - 'Wow64.cc', - 'acl.cc', - 'broker_services.cc', - 'crosscall_server.cc', - 'dep.cc', - 'eat_resolver.cc', - 'filesystem_dispatcher.cc', - 'filesystem_interception.cc', - 'filesystem_policy.cc', - 'interception.cc', - 'interception_agent.cc', - 'job.cc', - 'named_pipe_dispatcher.cc', - 'named_pipe_interception.cc', - 'named_pipe_policy.cc', - 'pe_image.cc', - 'policy_broker.cc', - 'policy_engine_opcodes.cc', - 'policy_engine_processor.cc', - 'policy_low_level.cc', - 'policy_target.cc', - 'process_thread_dispatcher.cc', - 'process_thread_interception.cc', - 'process_thread_policy.cc', - 'registry_dispatcher.cc', - 'registry_interception.cc', - 'registry_policy.cc', - 'resolver.cc', - 'restricted_token.cc', - 'restricted_token_utils.cc', - 'sandbox.cc', - 'sandbox_nt_util.cc', - 'sandbox_policy_base.cc', - 'sandbox_utils.cc', - 'service_resolver.cc', - 'shared_handles.cc', - 'sharedmem_ipc_client.cc', - 'sharedmem_ipc_server.cc', - 'sid.cc', - 'sidestep/ia32_modrm_map.cpp', - 'sidestep/ia32_opcode_map.cpp', - 'sidestep/mini_disassembler.cpp', - 'sidestep/preamble_patcher_with_stub.cpp', - 'sidestep_resolver.cc', - 'sync_dispatcher.cc', - 'sync_interception.cc', - 'sync_policy.cc', - 'target_interceptions.cc', - 'target_process.cc', - 'target_services.cc', - 'win2k_threadpool.cc', - 'win_utils.cc', -] - -# TODO(bradnelson): This step generates sandbox.pch.ib_tag -# SCons doesn't know. -env_p = env.Clone() -env_p.Append(CCFLAGS='/Ylsandbox') -pch, obj = env_p.PCH(['sandbox.pch', 'stdafx.obj'], 'stdafx.cc') -env['PCH'] = pch -env['PCHSTOP'] = 'stdafx.h' -env.Append(CCPCHFLAGS = ['/FIstdafx.h']) - -env.ChromeLibrary('sandbox', input_files + [obj]) diff --git a/sandbox/tests/common/sandbox_common.scons b/sandbox/tests/common/sandbox_common.scons deleted file mode 100644 index 6b50ba4..0000000 --- a/sandbox/tests/common/sandbox_common.scons +++ /dev/null @@ -1,16 +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. - -Import('env') - -env = env.Clone() - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -env.StaticObject('controller.cc') diff --git a/sandbox/tests/integration_tests/sbox_integration_tests.scons b/sandbox/tests/integration_tests/sbox_integration_tests.scons deleted file mode 100644 index 71e927d..0000000 --- a/sandbox/tests/integration_tests/sbox_integration_tests.scons +++ /dev/null @@ -1,51 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$SANDBOX_DIR/using_sandbox.scons', -]) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -# TODO(bradnelson): This step generates integration_tests.pch.ib_tag -# SCons doesn't know. -env_p = env.Clone() -pch, obj = env_p.PCH(['integration_tests.pch', 'integration_tests.obj'], - 'integration_tests.cc') -env['PCH'] = pch -env['PCHSTOP'] = 'stdafx.h' -env.Append(CCPCHFLAGS = ['/FIstdafx.h']) - - -input_files = [ - obj, - 'integration_tests_test.cc', - -# '$SANDBOX_DIR/src/dep_test.cc', - '$SANDBOX_DIR/src/file_policy_test.cc', - '$SANDBOX_DIR/src/integrity_level_test.cc', - '$SANDBOX_DIR/src/ipc_ping_test.cc', - '$SANDBOX_DIR/src/named_pipe_policy_test.cc', - '$SANDBOX_DIR/src/policy_target_test.cc', - '$SANDBOX_DIR/src/process_policy_test.cc', - '$SANDBOX_DIR/src/registry_policy_test.cc', - '$SANDBOX_DIR/src/sync_policy_test.cc', - '$SANDBOX_DIR/src/unload_dll_test.cc', - - '../common/controller$OBJSUFFIX', -] - -env.ChromeTestProgram('sbox_integration_tests', input_files, - COMPONENT_PLATFORM_SETUP=None) diff --git a/sandbox/tests/unit_tests/sbox_unittests.scons b/sandbox/tests/unit_tests/sbox_unittests.scons deleted file mode 100644 index 660a13a..0000000 --- a/sandbox/tests/unit_tests/sbox_unittests.scons +++ /dev/null @@ -1,50 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$SANDBOX_DIR/using_sandbox.scons', -]) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -# TODO(bradnelson): This step generates unittests_tests.pch.ib_tag -# SCons doesn't know. -env_p = env.Clone() -pch, obj = env_p.PCH(['unit_tests.pch', 'unit_tests.obj'], - 'unit_tests.cc') -env['PCH'] = pch -env['PCHSTOP'] = 'stdafx.h' -env.Append(CCPCHFLAGS = ['/FIstdafx.h']) - -input_files = [ - obj, - - '$SANDBOX_DIR/src/interception_unittest.cc', - '$SANDBOX_DIR/src/ipc_unittest.cc', - '$SANDBOX_DIR/src/job_unittest.cc', - '$SANDBOX_DIR/src/pe_image_unittest.cc', - '$SANDBOX_DIR/src/policy_engine_unittest.cc', - '$SANDBOX_DIR/src/policy_low_level_unittest.cc', - '$SANDBOX_DIR/src/policy_opcodes_unittest.cc', - '$SANDBOX_DIR/src/restricted_token_unittest.cc', - '$SANDBOX_DIR/src/service_resolver_unittest.cc', - '$SANDBOX_DIR/src/sid_unittest.cc', - '$SANDBOX_DIR/src/threadpool_unittest.cc', - - '../common/controller$OBJSUFFIX', -] - -env.ChromeTestProgram('sbox_unittests', input_files, - COMPONENT_PLATFORM_SETUP=None) diff --git a/sandbox/tests/validation_tests/sbox_validation_tests.scons b/sandbox/tests/validation_tests/sbox_validation_tests.scons deleted file mode 100644 index e23a3c7..0000000 --- a/sandbox/tests/validation_tests/sbox_validation_tests.scons +++ /dev/null @@ -1,49 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$SANDBOX_DIR/using_sandbox.scons', -]) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -env.Prepend( - LIBS = [ - 'shlwapi', - ], -) - - -# TODO(bradnelson): This step generates unittests_tests.pch.ib_tag -# SCons doesn't know. -env_p = env.Clone() -pch, obj = env_p.PCH(['unit_tests.pch', 'unit_tests.obj'], - 'unit_tests.cc') -env['PCH'] = pch -env['PCHSTOP'] = 'stdafx.h' -env.Append(CCPCHFLAGS = ['/FIstdafx.h']) - - -input_files = [ - obj, - - 'suite.cc', - 'commands.cc', - - '../common/controller$OBJSUFFIX', -] - -env.ChromeTestProgram('sbox_validation_tests', input_files, - COMPONENT_PLATFORM_SETUP=None) diff --git a/sandbox/using_sandbox.scons b/sandbox/using_sandbox.scons deleted file mode 100644 index 41b93a8..0000000 --- a/sandbox/using_sandbox.scons +++ /dev/null @@ -1,18 +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 gtest library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$SANDBOX_DIR/src', - ], - LIBS = [ - 'sandbox', - ], -) diff --git a/sandbox/wow_helper/wow_helper.scons b/sandbox/wow_helper/wow_helper.scons deleted file mode 100644 index 2430aeb..0000000 --- a/sandbox/wow_helper/wow_helper.scons +++ /dev/null @@ -1,87 +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. - -Import('env') - -env = env.Clone() - -if env.Bit('windows'): - - # NOTE: env.Replace() instead of inhering the normal *.scons settings! - env.Replace( - CPPDEFINES = [ - ('_WIN32_WINNT', '0x0501'), - ('WINVER', '0x0501'), - 'WIN32', - '_UNICODE', - 'UNICODE', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CCFLAGS = [ - '/nologo', - - '/EHsc', - - '/GS-', # VCCLCompilerTool.BufferSecurityCheck="false" - '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false" - '/W3', # treat warnings as errors - '/Wp64', # VCCLCompilerTool.Detect64BitPortabilityProblems="false" - - # In the old Visual Studio build, we used /Zi (edit and continue), - # VCCLComilerTool.DebugInformationFormat="3". - # - # /Zi ends up with multiple compiler invocations trying to updat - # the same vc80.pdb file at the same time, with race conditions - # and permission problems. We're using /Z7 because it makes things - # work even in parallel builds, without special config to avoid - # multiple simultaneous updates the vc80.pdb file. All the - # debugging information and capability still end up in the - # executables. - '/Z7', # VCCLCompilerTool.DebugInformationFormat="1" - - ], - LINKFLAGS = [ - '/nologo', - '/INCREMENTAL:NO', - '/DEBUG', - '/MACHINE:X64', - '/SUBSYSTEM:WINDOWS', - ], - ) - if env['TARGET_DEBUG']: - env.Append( - CPPDEFINES = [ - '_DEBUG', - ], - CCFLAGS = [ - '/Od', - '/MTd', - ], - ) - else: - env.Append( - CPPDEFINES = [ - 'NDEBUG', - ], - CCFLAGS = [ - '/O2', - '/GL', - '/FD', - '/MT', # VCCLLinkerTool.RuntimeLibrary="0" - ], - LINKFLAGS = [ - '/OPT:REF', # VCCLLinkerTool.OptimizeReferences="2" - '/OPT:ICF', # VCCLLinkerTool.EnableCOMDATFolding="2" - ], - ) - -input_files = [ - 'service64_resolver.cc', - 'target_code.cc', - 'wow_helper.cc', -] - -env.ChromeProgram('wow_helper', input_files) diff --git a/sdch/SConscript b/sdch/SConscript deleted file mode 100644 index 38455e0..0000000 --- a/sdch/SConscript +++ /dev/null @@ -1,204 +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. - -import re - -Import('env') - -env = env.Clone(OPEN_VCDIFF_DIR='open-vcdiff') - -cpppath = [ - '$OPEN_VCDIFF_DIR/src', -] - -if env.Bit('windows'): - cpppath.append('$OPEN_VCDIFF_DIR/vsprojects') - -if env.Bit('linux'): - cpppath.append('linux') - -env.Prepend(CPPPATH = cpppath) - -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('Header Files', [ - 'open-vcdiff/src/blockhash.h', - 'open-vcdiff/src/checksum.h', - 'open-vcdiff/src/codetable.h', - 'open-vcdiff/src/compile_assert.h', - 'open-vcdiff/vsprojects/config.h', - 'open-vcdiff/src/decodetable.h', - 'open-vcdiff/src/encodetable.h', - 'open-vcdiff/src/headerparser.h', - 'open-vcdiff/src/instruction_map.h', - 'open-vcdiff/src/logging.h', - 'open-vcdiff/src/google/output_string.h', - 'open-vcdiff/src/rolling_hash.h', - 'open-vcdiff/vsprojects/stdint.h', - 'open-vcdiff/src/testing.h', - 'open-vcdiff/src/varint_bigendian.h', - 'open-vcdiff/src/google/vcdecoder.h', - 'open-vcdiff/src/vcdiff_defs.h', - 'open-vcdiff/src/vcdiffengine.h', - 'open-vcdiff/src/zconf.h', - 'open-vcdiff/src/zlib.h', - ]), - MSVSFilter('Source Files', [ - 'open-vcdiff/src/addrcache.cc', - 'open-vcdiff/src/adler32.c', - 'open-vcdiff/src/blockhash.cc', - 'open-vcdiff/src/codetable.cc', - 'open-vcdiff/src/decodetable.cc', - 'open-vcdiff/src/encodetable.cc', - 'open-vcdiff/src/headerparser.cc', - 'open-vcdiff/src/instruction_map.cc', - 'open-vcdiff/src/logging.cc', - 'open-vcdiff/src/varint_bigendian.cc', - 'open-vcdiff/src/vcdecoder.cc', - 'open-vcdiff/src/vcdiffengine.cc', - ]), -]) - -env.ChromeLibrary('sdch', input_files) - -if env.Bit('posix'): - - # Generate a target config.h file from a source config.h.in file. - # - # The list of defines has been taken empirically from Autoconf - # (./configure) runs on Mac OS X and Ubuntu Hardy. - - defines = [ - 'HAVE_DLFCN_H', - 'HAVE_FNMATCH_H', - 'HAVE_GETOPT_H', - 'HAVE_GETTIMEOFDAY', - 'HAVE_INTTYPES_H', - 'HAVE_MEMORY_H', - 'HAVE_MPROTECT', - 'HAVE_PTHREAD', - 'HAVE_STDINT_H', - 'HAVE_STDLIB_H', - 'HAVE_STRINGS_H', - 'HAVE_STRING_H', - 'HAVE_STRTOLL', - 'HAVE_STRTOQ', - 'HAVE_SYS_MMAN_H', - 'HAVE_SYS_STAT_H', - 'HAVE_SYS_TIME_H', - 'HAVE_SYS_TYPES_H', - 'HAVE_UINT16_T', - 'HAVE_UNISTD_H', - 'HAVE_U_INT16_T', - 'HAVE___ATTRIBUTE__', - ('PACKAGE', '"open-vcdiff"'), - ('PACKAGE_BUGREPORT', '"opensource@google.com"'), - ('PACKAGE_NAME', '"open-vcdiff"'), - ('PACKAGE_STRING', '"open-vcdiff 0.1"'), - ('PACKAGE_TARNAME', '"open-vcdiff"'), - ('PACKAGE_VERSION', '"0.1"'), - ('VERSION', '"0.1"'), - 'STDC_HEADERS', - ] - - if env.Bit('linux'): - defines.extend([ - 'HAVE_MALLOC_H', - 'HAVE_MEMALIGN', - 'HAVE_POSIX_MEMALIGN', - ]) - - if env.Bit('mac'): - defines.extend([ - 'HAVE_WORKING_KQUEUE', - ]) - - def AutoConfig(target, source, env): - """ - Action to generate a config.h file from an Autotools config.h.in file, - given the list of definitions in the DEFINES construction variable. - - Each entry in DEFINES is either a string, in which case it - will be enabled with a value of 1, or a tuple, in which case - the first element is the #define name and the second its value. - - Any leftover #undef lines get commented out. - """ - contents = open(str(source[0]), 'r').read() - - for d in env['DEFINES']: - if isinstance(d, tuple): - define, value = d - else: - define = d - value = 1 - undef = '^#undef %s$' % re.escape(define) - definition = '#define %s %s' % (define, value) - contents = re.sub(undef, definition, contents) - - undef_re = re.compile(r'^(#undef .*)$', re.M) - contents = undef_re.sub(r'/* \1 */', contents) - - header = '/* src/config.h. Generated by SCons. */\n' - open(str(target[0]), 'w').write(header + contents) - - # varlist['DEFINES'] below makes the target config.h file depend - # on the list of definitions in the passed-in $DEFINES variable. - # - # Comment this out so we use the checked-in config.h in the - # linux subdirectory, but leave it here in case we need - # to ressurect this. - #env.Command('$OPEN_VCDIFF_DIR/src/config.h', - # '$OPEN_VCDIFF_DIR/src/config.h.in', - # Action(AutoConfig, varlist=['DEFINES']), - # DEFINES=defines) - - -p = env.ChromeMSVSProject('sdch.vcproj', - dest='$CHROME_SRC_DIR/sdch/sdch.vcproj', - guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - MSVSTool('VCCLCompilerTool', - AdditionalIncludeDirectories=[ - './open-vcdiff/vsprojects', - '', - ], - DefaultCharIsUnsigned="true"), - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../sdch/using_sdch.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../sdch/using_sdch.vsprops', - ]) diff --git a/sdch/using_sdch.scons b/sdch/using_sdch.scons deleted file mode 100644 index f99c503..0000000 --- a/sdch/using_sdch.scons +++ /dev/null @@ -1,18 +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 sdch library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$SDCH_DIR/open-vcdiff/src', - ], - LIBS = [ - 'sdch', - ], -) diff --git a/skia/SConscript b/skia/SConscript deleted file mode 100644 index 4b78b4c..0000000 --- a/skia/SConscript +++ /dev/null @@ -1,519 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - 'include', - 'include/corecg', - 'corecg', - 'sgl', - 'picture', - '$CHROME_SRC_DIR', - ], -) - -env.Append( - CPPDEFINES = [ - 'SK_BUILD_NO_IMAGE_ENCODE', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - - '/wd4244', - '/wd4267', - '/wd4345', - '/wd4390', - '/wd4554', - '/wd4800', - ], - ) -elif env.Bit('posix'): - env.Append(CCFLAGS = ['-Wno-unused']) - -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('Header files', [ - 'include/Sk1DPathEffect.h', - 'include/Sk2DPathEffect.h', - 'include/corecg/Sk64.h', - 'include/SkAnimator.h', - 'include/SkAnimatorView.h', - 'include/SkApplication.h', - 'include/SkAvoidXfermode.h', - 'include/SkBGViewArtist.h', - 'include/SkBitmap.h', - 'include/SkBlurDrawLooper.h', - 'include/SkBlurMaskFilter.h', - 'include/SkBML_WXMLParser.h', - 'include/SkBML_XMLParser.h', - 'include/SkBorderView.h', - 'include/SkBounder.h', - 'include/corecg/SkBuffer.h', - 'include/SkCamera.h', - 'include/SkCanvas.h', - 'include/corecg/SkChunkAlloc.h', - 'include/SkColor.h', - 'include/SkColorFilter.h', - 'include/SkColorMatrix.h', - 'include/SkColorPriv.h', - 'include/SkColorShader.h', - 'include/SkCornerPathEffect.h', - 'include/SkCullPoints.h', - 'include/SkDashPathEffect.h', - 'include/SkDeque.h', - 'include/SkDescriptor.h', - 'include/SkDevice.h', - 'include/SkDiscretePathEffect.h', - 'include/SkDither.h', - 'include/SkDOM.h', - 'include/SkDraw.h', - 'include/SkDrawExtraPathEffect.h', - 'include/SkDrawFilter.h', - 'include/SkDrawLooper.h', - 'include/SkEmbossMaskFilter.h', - 'include/corecg/SkEndian.h', - 'include/SkEvent.h', - 'include/SkEventSink.h', - 'include/corecg/SkFDot6.h', - 'include/corecg/SkFixed.h', - 'include/SkFlattenable.h', - 'include/SkFlipPixelRef.h', - 'include/corecg/SkFloatBits.h', - 'include/corecg/SkFloatingPoint.h', - 'include/SkFontCodec.h', - 'include/SkFontHost.h', - 'include/SkGlobals.h', - 'include/SkGradientShader.h', - 'include/SkGraphics.h', - 'include/SkImageDecoder.h', - 'include/SkImageRef.h', - 'include/SkImageView.h', - 'include/corecg/SkInterpolator.h', - 'include/SkJS.h', - 'include/SkKernel33MaskFilter.h', - 'include/SkKey.h', - 'include/SkLayerDrawLooper.h', - 'include/SkLayerRasterizer.h', - 'include/SkMallocPixelRef.h', - 'include/SkMask.h', - 'include/SkMaskFilter.h', - 'include/corecg/SkMath.h', - 'include/corecg/SkMatrix.h', - 'include/SkMetaData.h', - 'include/SkMMapStream.h', - 'include/SkMovie.h', - 'include/SkNinePatch.h', - 'include/SkOSFile.h', - 'include/SkOSMenu.h', - 'include/SkOSSound.h', - 'include/SkOSWindow_Mac.h', - 'include/SkOSWindow_Unix.h', - 'include/SkOSWindow_Win.h', - 'include/SkOSWindow_wxwidgets.h', - 'include/SkPackBits.h', - 'include/corecg/SkPageFlipper.h', - 'include/SkPaint.h', - 'include/SkPaintFlagsDrawFilter.h', - 'include/SkParse.h', - 'include/SkParsePaint.h', - 'include/SkPath.h', - 'include/SkPathEffect.h', - 'include/SkPathMeasure.h', - 'include/corecg/SkPerspIter.h', - 'include/SkPicture.h', - 'include/SkPixelRef.h', - 'include/SkPixelXorXfermode.h', - 'include/corecg/SkPoint.h', - 'include/SkPorterDuff.h', - 'include/corecg/SkPostConfig.h', - 'include/corecg/SkPreConfig.h', - 'include/SkProgressBarView.h', - 'include/SkPtrRecorder.h', - 'include/corecg/SkRandom.h', - 'include/SkRasterizer.h', - 'include/SkReader32.h', - 'include/corecg/SkRect.h', - 'include/SkRefCnt.h', - 'include/corecg/SkRegion.h', - 'include/corecg/SkScalar.h', - 'include/corecg/SkScalarCompare.h', - 'include/SkScalerContext.h', - 'include/SkScrollBarView.h', - 'include/SkShader.h', - 'include/SkShaderExtras.h', - 'include/SkStackViewLayout.h', - 'include/SkStream.h', - 'include/SkStream_Win.h', - 'include/SkString.h', - 'include/SkStroke.h', - 'include/SkSVGAttribute.h', - 'include/SkSVGBase.h', - 'include/SkSVGPaintState.h', - 'include/SkSVGParser.h', - 'include/SkSVGTypes.h', - 'include/SkSystemEventTypes.h', - 'include/SkTDArray.h', - 'include/SkTDict.h', - 'include/SkTDStack.h', - 'include/corecg/SkTemplates.h', - 'include/SkTextBox.h', - 'include/corecg/SkThread.h', - 'include/corecg/SkThread_platform.h', - 'include/SkTime.h', - 'include/SkTransparentShader.h', - 'include/corecg/SkTSearch.h', - 'include/SkTypeface.h', - 'include/corecg/SkTypes.h', - 'include/SkUnitMapper.h', - 'include/SkUnitMappers.h', - 'include/SkUnPreMultiply.h', - 'include/corecg/SkUserConfig.h', - 'include/SkUtils.h', - 'include/SkView.h', - 'include/SkViewInflate.h', - 'include/SkWidget.h', - 'include/SkWidgetViews.h', - 'include/SkWindow.h', - 'include/SkWriter32.h', - 'include/SkXfermode.h', - 'include/SkXMLParser.h', - 'include/SkXMLWriter.h', - ]), - - MSVSFilter('corecg', [ - 'corecg/Sk64.cpp', - 'corecg/SkBuffer.cpp', - 'corecg/SkChunkAlloc.cpp', - 'corecg/SkCordic.cpp', - 'corecg/SkCordic.h', - 'corecg/SkDebug.cpp', - 'corecg/SkDebug_stdio.cpp', - 'corecg/SkFloat.cpp', - 'corecg/SkFloat.h', - 'corecg/SkFloatBits.cpp', - 'corecg/SkInterpolator.cpp', - 'corecg/SkMath.cpp', - 'corecg/SkMatrix.cpp', - 'corecg/SkMemory_stdlib.cpp', - 'corecg/SkPageFlipper.cpp', - 'corecg/SkPoint.cpp', - 'corecg/SkRect.cpp', - 'corecg/SkRegion.cpp', - 'corecg/SkRegionPriv.h', - 'corecg/SkSinTable.h', - 'corecg/SkTSort.h', - ]), - - MSVSFilter('sgl', [ - 'sgl/SkAlphaRuns.cpp', - 'sgl/SkAntiRun.h', - 'sgl/SkAutoKern.h', - 'sgl/SkBitmap.cpp', - 'sgl/SkBitmapProcShader.cpp', - 'sgl/SkBitmapProcShader.h', - 'sgl/SkBitmapProcState.cpp', - 'sgl/SkBitmapProcState.h', - 'sgl/SkBitmapProcState_matrix.h', - 'sgl/SkBitmapProcState_matrixProcs.cpp', - 'sgl/SkBitmapSampler.cpp', - 'sgl/SkBitmapSampler.h', - 'sgl/SkBitmapSamplerTemplate.h', - 'sgl/SkBitmapShader.cpp', - 'sgl/SkBitmapShader.h', - 'sgl/SkBitmapShader16BilerpTemplate.h', - 'sgl/SkBitmapShaderTemplate.h', - 'sgl/SkBlitBWMaskTemplate.h', - 'sgl/SkBlitRow.h', - 'sgl/SkBlitRow_D16.cpp', - 'sgl/SkBlitRow_D4444.cpp', - 'sgl/SkBlitter.cpp', - 'sgl/SkBlitter.h', - 'sgl/SkBlitter_4444.cpp', - 'sgl/SkBlitter_A1.cpp', - 'sgl/SkBlitter_A8.cpp', - 'sgl/SkBlitter_ARGB32.cpp', - 'sgl/SkBlitter_RGB16.cpp', - 'sgl/SkBlitter_Sprite.cpp', - 'sgl/SkCanvas.cpp', - 'sgl/SkColor.cpp', - 'sgl/SkColorFilter.cpp', - 'sgl/SkColorTable.cpp', - 'sgl/SkCoreBlitters.h', - 'sgl/SkDeque.cpp', - 'sgl/SkDevice.cpp', - 'sgl/SkDither.cpp', - 'sgl/SkDraw.cpp', - 'sgl/SkDraw.h', - 'sgl/SkEdge.cpp', - 'sgl/SkEdge.h', - 'sgl/SkFilterProc.cpp', - 'sgl/SkFilterProc.h', - 'sgl/SkFlattenable.cpp', - 'sgl/SkFP.h', - 'sgl/SkGeometry.cpp', - 'sgl/SkGeometry.h', - 'sgl/SkGlobals.cpp', - 'sgl/SkGlyphCache.cpp', - 'sgl/SkGlyphCache.h', - 'sgl/SkGraphics.cpp', - 'sgl/SkMask.cpp', - 'sgl/SkMaskFilter.cpp', - 'sgl/SkPackBits.cpp', - 'sgl/SkPaint.cpp', - 'sgl/SkPath.cpp', - 'sgl/SkPathEffect.cpp', - 'sgl/SkPathMeasure.cpp', - 'sgl/SkPixelRef.cpp', - 'sgl/SkProcSpriteBlitter.cpp', - 'sgl/SkPtrRecorder.cpp', - 'sgl/SkRasterizer.cpp', - 'sgl/SkRefCnt.cpp', - 'sgl/SkRegion_path.cpp', - 'sgl/SkScalerContext.cpp', - 'sgl/SkScan.cpp', - 'sgl/SkScan.h', - 'sgl/SkScan_Antihair.cpp', - 'sgl/SkScan_AntiPath.cpp', - 'sgl/SkScan_Hairline.cpp', - 'sgl/SkScan_Path.cpp', - 'sgl/SkScanPriv.h', - 'sgl/SkShader.cpp', - 'sgl/SkSpriteBlitter.h', - 'sgl/SkSpriteBlitter_ARGB32.cpp', - 'sgl/SkSpriteBlitter_RGB16.cpp', - 'sgl/SkSpriteBlitterTemplate.h', - 'sgl/SkString.cpp', - 'sgl/SkStroke.cpp', - 'sgl/SkStrokerPriv.cpp', - 'sgl/SkStrokerPriv.h', - 'sgl/SkTemplatesPriv.h', - 'sgl/SkTSearch.cpp', - 'sgl/SkTSort.h', - 'sgl/SkTypeface_fake.cpp', - #'sgl/SkUnPreMultiply.cpp', - 'sgl/SkUtils.cpp', - 'sgl/SkWriter32.cpp', - 'sgl/SkXfermode.cpp', - ]), - - MSVSFilter('ports', [ - 'ports/sk_predefined_gamma.h', - 'ports/SkFontHost_none.cpp', - 'ports/SkGlobals_global.cpp', - 'ports/SkImageDecoder_Factory.cpp', - 'ports/SkOSFile_stdio.cpp', - 'ports/SkThread_win.cpp', - ]), - - MSVSFilter('images', [ - 'images/SkImageDecoder.cpp', - 'images/SkImageRef.cpp', - 'images/SkScaledBitmapSampler.h', - 'images/SkStream.cpp', - ]), - - MSVSFilter('effects', [ - 'effects/Sk1DPathEffect.cpp', - 'effects/Sk2DPathEffect.cpp', - 'effects/SkAvoidXfermode.cpp', - 'effects/SkBlurDrawLooper.cpp', - 'effects/SkBlurMask.cpp', - 'effects/SkBlurMaskFilter.cpp', - 'effects/SkCamera.cpp', - 'effects/SkColorFilters.cpp', - 'effects/SkColorMatrix.cpp', - 'effects/SkColorMatrixFilter.cpp', - 'effects/SkCornerPathEffect.cpp', - 'effects/SkCullPoints.cpp', - 'effects/SkDashPathEffect.cpp', - 'effects/SkDiscretePathEffect.cpp', - 'effects/SkEmbossMask.cpp', - 'effects/SkEmbossMaskFilter.cpp', - 'effects/SkGradientShader.cpp', - 'effects/SkKernel33MaskFilter.cpp', - 'effects/SkLayerRasterizer.cpp', - 'effects/SkPaintFlagsDrawFilter.cpp', - 'effects/SkPixelXorXfermode.cpp', - 'effects/SkRadialGradient_Table.h', - 'effects/SkShaderExtras.cpp', - 'effects/SkTransparentShader.cpp', - 'effects/SkUnitMappers.cpp', - ]), - - MSVSFilter('animator', [ - 'animator/SkTime.cpp', - ]), - - MSVSFilter('picture', [ - 'picture/SkPathHeap.cpp', - 'picture/SkPathHeap.h', - 'picture/SkPicture.cpp', - 'picture/SkPictureFlat.cpp', - 'picture/SkPictureFlat.h', - 'picture/SkPicturePlayback.cpp', - 'picture/SkPicturePlayback.h', - 'picture/SkPictureRecord.cpp', - 'picture/SkPictureRecord.h', - ]), - - MSVSFilter('ext', [ - 'ext/bitmap_platform_device.h', - 'ext/bitmap_platform_device_win.cc', - 'ext/bitmap_platform_device_win.h', - 'ext/convolver.cc', - 'ext/convolver.h', - 'ext/google_logging.cc', - 'ext/image_operations.cc', - 'ext/image_operations.h', - 'ext/platform_canvas.h', - 'ext/platform_canvas_win.cc', - 'ext/platform_canvas_win.h', - 'ext/platform_device.h', - 'ext/platform_device_win.cc', - 'ext/platform_device_win.h', - 'ext/skia_utils.cc', - 'ext/skia_utils.h', - 'ext/skia_utils_win.cc', - 'ext/skia_utils_win.h', - 'ext/vector_canvas.cc', - 'ext/vector_canvas.h', - 'ext/vector_device.cc', - 'ext/vector_device.h', - ]), - - 'precompiled.cc', -]) - -if env.Bit('linux'): - input_files.append('ext/bitmap_platform_device_linux.cc') - input_files.append('ext/platform_canvas_linux.cc') - input_files.append('ext/platform_device_linux.cc') - - # On Linux we use Skia to render fonts with FreeType and fontconfig - input_files.Remove('sgl/SkTypeface_fake.cpp') - input_files.Remove('ports/SkFontHost_none.cpp') - input_files.append('sgl/SkTypeface.cpp') - input_files.append('ports/SkFontHost_FreeType.cpp') - input_files.append('ports/SkFontHost_TrueType_Tables.cpp') - input_files.append('ports/SkFontHost_gamma_none.cpp') - input_files.append('ports/SkFontHost_fontconfig.cpp') - input_files.append('images/SkMMapStream.cpp') - - env.Append(CCFLAGS = ['-Wno-unused-function']) - -if not env['COMPONENT_STATIC']: - # SkUnPreMultiply is commented out in the sgl list above, but we need to link - # it into the shared library. - input_files.append('sgl/SkUnPreMultiply.cpp') - -if env.Bit('posix'): - input_files.append('ports/SkThread_pthread.cpp') - input_files.append('ports/SkTime_Unix.cpp') - -if env.Bit('mac'): - input_files.append('ext/bitmap_platform_device_mac.cc') - input_files.append('ext/platform_canvas_mac.cc') - input_files.append('ext/platform_device_mac.cc') - -if not env.Bit('windows'): - input_files.Remove( - 'ext/bitmap_platform_device_win.cc', - 'ext/bitmap_platform_device_win.h', - 'ext/platform_canvas_win.cc', - 'ext/platform_canvas_win.h', - 'ext/platform_device_win.cc', - 'ext/platform_device_win.h', - 'ext/skia_utils_win.cc', - 'ext/skia_utils_win.h', - 'ext/vector_canvas.cc', - 'ext/vector_canvas.h', - 'ext/vector_device.cc', - 'ext/vector_device.h', - - 'ports/SkThread_win.cpp', - ) - -if env.Bit('windows'): - env_p = env.Clone( - PCHSTOP = 'SkTypes.h', - PDB = 'vc80.pdb', - ) - - # TODO(rspangler): This step forces -Zi, but doesn't actually use it. Need to - # fix so it doesn't override our -Z7. -Zi also causes vc80.pdb to be created - # in the skia directory. - # TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created. - # It's a 0-length file so likely harmless. Is this a side effect of having - # IncrediBuild installed on the build machine? - pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc') - env_p['PCH'] = pch - input_files.Replace('precompiled.cc', obj) - -env.ChromeLibrary('skia', input_files) - -p = env.ChromeMSVSProject('skia.vcproj', - dest='$CHROME_SRC_DIR/skia/skia.vcproj', - guid='{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}', - keyword='Win32Proj', - files=input_files, - relative_path_prefix=r'./', - 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', - './skia.vsprops', - './precompiled.vsprops', - ]) - -p.AddConfig('Release|Win32', - ConfigurationType = '4', - InheritedPropertySheets = [ - '$(SolutionDir)../build/release.vsprops', - './skia.vsprops', - ]) - -p.AddFileConfig( - 'precompiled.cc', - 'Debug|Win32', - tools=[ - MSVSTool('VCCLCompilerTool', UsePrecompiledHeader='1'), - ]) - -p.AddFileConfig( - 'precompiled.cc', - 'Release|Win32', - ExcludedFromBuild='true', - tools=[ - MSVSTool('VCCLCompilerTool'), - ]) diff --git a/skia/using_skia.scons b/skia/using_skia.scons deleted file mode 100644 index b1adf1c..0000000 --- a/skia/using_skia.scons +++ /dev/null @@ -1,20 +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 skia library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/include/platform', - ], - LIBS = [ - 'skia', - ], -) diff --git a/testing/SConscript.gtest b/testing/SConscript.gtest deleted file mode 100644 index 83be06f..0000000 --- a/testing/SConscript.gtest +++ /dev/null @@ -1,102 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$GTEST_DIR', - '$GTEST_DIR/include', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - - '/WX', - '/Wp64', - ], - ) - -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('src', [ - 'gtest/src/gtest-death-test.cc', - 'gtest/src/gtest-filepath.cc', - 'gtest/src/gtest-internal-inl.h', - 'gtest/src/gtest-port.cc', - 'gtest/src/gtest-test-part.cc', - 'gtest/src/gtest.cc', - ]), - MSVSFilter('include', [ - 'gtest/include/gtest/gtest-death-test.h', - 'gtest/include/gtest/gtest-message.h', - 'gtest/include/gtest/gtest-param-test.h', - 'gtest/include/gtest/gtest-spi.h', - 'gtest/include/gtest/gtest-test-part.h', - 'gtest/include/gtest/gtest-typed-test.h', - 'gtest/include/gtest/gtest.h', - 'gtest/include/gtest/gtest_pred_impl.h', - 'gtest/include/gtest/gtest_prod.h', - MSVSFilter('internal', [ - 'gtest/include/gtest/internal/gtest-death-test-internal.h', - 'gtest/include/gtest/internal/gtest-filepath.h', - 'gtest/include/gtest/internal/gtest-internal.h', - 'gtest/include/gtest/internal/gtest-linked_ptr.h', - 'gtest/include/gtest/internal/gtest-param-util-generated.h', - 'gtest/include/gtest/internal/gtest-param-util.h', - 'gtest/include/gtest/internal/gtest-port.h', - 'gtest/include/gtest/internal/gtest-string.h', - 'gtest/include/gtest/internal/gtest-type-util.h', - ]), - ]), - 'multiprocess_func_list.cc', - 'multiprocess_func_list.h', - 'platform_test.h', -]) - -env.ChromeLibrary('gtest', input_files) - -p = env.ChromeMSVSProject('gtest.vcproj', - dest='$CHROME_SRC_DIR/testing/gtest.vcproj', - guid='{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}', - keyword='Win32Proj', - files=input_files, - relative_path_prefix=r'./', - tools = [ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType = '4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets = [ - '$(SolutionDir)../build/debug.vsprops', - './using_gtest.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets = [ - '$(SolutionDir)../build/release.vsprops', - './using_gtest.vsprops', - ]) diff --git a/testing/using_gtest.scons b/testing/using_gtest.scons deleted file mode 100644 index a6bc10f..0000000 --- a/testing/using_gtest.scons +++ /dev/null @@ -1,22 +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 gtest library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - ], - CPPDEFINES = [ - 'UNIT_TEST', - ], - LIBS = [ - 'gtest', - ], -) diff --git a/third_party/bzip2/bzip2.scons b/third_party/bzip2/bzip2.scons deleted file mode 100644 index 06da657..0000000 --- a/third_party/bzip2/bzip2.scons +++ /dev/null @@ -1,72 +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 bzip2.lib / libbzip2.a. -""" - -Import('env') - -if env.WantSystemLib('bzip2'): - Return() - -env = env.Clone() - -env.Append( - CPPDEFINES = [ - 'BZ_NO_STDIO', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TC', - '/wd4996', - '/wd4800', - ], - ) - -input_files = ChromeFileList([ - 'blocksort.c', - 'bzlib.c', - 'bzlib.h', - 'bzlib_private.h', - 'compress.c', - 'crctable.c', - 'decompress.c', - 'huffman.c', - 'randtable.c', -]) - -env.ChromeLibrary('bzip2', input_files) - -p = env.ChromeMSVSProject('bzip2.vcproj', - dest='$CHROME_SRC_DIR/third_party/bzip2/bzip2.vcproj', - guid='{2A70CBF0-847E-4E3A-B926-542A656DC7FE}', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - MSVSTool('VCCLCompilerTool', - PreprocessorDefinitions=['BZ_NO_STDIO'], - DisableSpecificWarnings='4996'), - 'VCLibrarianTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - ]) diff --git a/third_party/bzip2/using_bzip2.scons b/third_party/bzip2/using_bzip2.scons deleted file mode 100644 index cbe837c..0000000 --- a/third_party/bzip2/using_bzip2.scons +++ /dev/null @@ -1,14 +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 bzip2 library. -""" - -Import("env") - -if env.WantSystemLib('bzip2'): - env.Append(LIBS = ['bz2']) -else: - env.Append(LIBS = ['bzip2']) diff --git a/third_party/libevent/libevent.scons b/third_party/libevent/libevent.scons deleted file mode 100644 index f8fc4bf..0000000 --- a/third_party/libevent/libevent.scons +++ /dev/null @@ -1,76 +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 event.lib / libevent.a. - -This is currently only suitable for Linux and Mac. -""" - -Import('env') - -env = env.Clone() - -env.Append( - CPPDEFINES = [ - 'HAVE_CONFIG_H', - ], -) - -if env.Bit('mac'): - env.Prepend( - CPPPATH = [ - '$LIBEVENT_DIR/generated/', - ], - ) - env['ENV']['CONFIGURATION_TEMP_DIR'] = env.Dir('$LIBEVENT_DIR').abspath - env.Command('$LIBEVENT_DIR/generated/config.h', - ['libevent.xcodeproj/libevent_prebuild.sh', 'config.h.in'], - 'sh ${SOURCES[0]} ${SOURCES[1]}') - - -if env.Bit('linux'): - env.Prepend( - CPPPATH = [ - '$LIBEVENT_DIR/linux/', - ], - ) - -env.Prepend( - CPPPATH = [ - '$LIBEVENT_DIR', - '$LIBEVENT_DIR/compat/', - ], -) - -input_files = [ - 'buffer.c', - 'evbuffer.c', - 'evdns.c', - 'event.c', - 'event_tagging.c', - 'evrpc.c', - 'evutil.c', - 'http.c', - 'log.c', - 'poll.c', - 'select.c', - 'signal.c', - 'strlcpy.c', -] - -if env.Bit('linux'): - input_files.extend([ - 'epoll.c', - 'epoll_sub.c', - ]) - -if env.Bit('mac'): - input_files.extend([ - 'kqueue.c', - ]) - - -env.ChromeLibrary('event', input_files) diff --git a/third_party/libevent/using_libevent.scons b/third_party/libevent/using_libevent.scons deleted file mode 100644 index 958c653..0000000 --- a/third_party/libevent/using_libevent.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 event library. -""" - -Import("env") - -env.Append( - LIBS = [ - 'event', - ], -) diff --git a/third_party/libjpeg/libjpeg.scons b/third_party/libjpeg/libjpeg.scons deleted file mode 100644 index dd9badf..0000000 --- a/third_party/libjpeg/libjpeg.scons +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct -Import('env') - -env = env.Clone() - -if env.WantSystemLib('libjpeg'): - Return() - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TC', - '/wd4800', - ], - ) -elif env.Bit('linux'): - if '-Wall' in env['CCFLAGS']: - # We're not responsible for bad warning hygiene in this third party code. - env['CCFLAGS'].remove('-Wall') - -input_files = ChromeFileList([ - 'jcapimin.c', - 'jcapistd.c', - 'jccoefct.c', - 'jccolor.c', - 'jcdctmgr.c', - 'jchuff.c', - 'jchuff.h', - 'jcinit.c', - 'jcmainct.c', - 'jcmarker.c', - 'jcmaster.c', - 'jcomapi.c', - 'jconfig.h', - 'jcparam.c', - 'jcphuff.c', - 'jcprepct.c', - 'jcsample.c', - 'jdapimin.c', - 'jdapistd.c', - 'jdatadst.c', - 'jdatasrc.c', - 'jdcoefct.c', - 'jdcolor.c', - 'jdct.h', - 'jddctmgr.c', - 'jdhuff.c', - 'jdhuff.h', - 'jdinput.c', - 'jdmainct.c', - 'jdmarker.c', - 'jdmaster.c', - 'jdmerge.c', - 'jdphuff.c', - 'jdpostct.c', - 'jdsample.c', - 'jerror.c', - 'jerror.h', - 'jfdctflt.c', - 'jfdctfst.c', - 'jfdctint.c', - 'jidctflt.c', - 'jidctfst.c', - 'jidctint.c', - 'jinclude.h', - 'jmemmgr.c', - 'jmemnobs.c', - 'jmemsys.h', - 'jmorecfg.h', - 'jpegint.h', - 'jpeglib.h', - 'jquant1.c', - 'jquant2.c', - 'jutils.c', - 'jversion.h', -]) - -env.ChromeLibrary('libjpeg', input_files) - -p = env.ChromeMSVSProject('libjpeg.vcproj', - dest=('$CHROME_SRC_DIR/third_party/' + - 'libjpeg/libjpeg.vcproj'), - guid='{238CE175-76CE-4A25-A676-69D115885601}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCLibrarianTool', - 'VCCLCompilerTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - ]) diff --git a/third_party/libjpeg/using_libjpeg.scons b/third_party/libjpeg/using_libjpeg.scons deleted file mode 100644 index d7449f5..0000000 --- a/third_party/libjpeg/using_libjpeg.scons +++ /dev/null @@ -1,18 +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 libjpeg library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$LIBJPEG_DIR', - ], - LIBS = [ - 'libjpeg', - ], -) diff --git a/third_party/libpng/libpng.scons b/third_party/libpng/libpng.scons deleted file mode 100644 index 0fe71ba..0000000 --- a/third_party/libpng/libpng.scons +++ /dev/null @@ -1,97 +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 libpng.lib / libpng.a. -""" - -Import('env') - -if env.WantSystemLib('libpng'): - Return() - -env = env.Clone() - -env.ApplySConscript([ - '$ZLIB_DIR/using_zlib.scons', -]) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - '/wd4800', - ], - ) - -env.Append( - CPPDEFINES = [ - 'PNG_USER_CONFIG', - 'CHROME_PNG_WRITE_SUPPORT', - ], -) - -input_files = ChromeFileList([ - 'png.c', - 'png.h', - 'pngconf.h', - 'pngerror.c', - 'pnggccrd.c', - 'pngget.c', - 'pngmem.c', - 'pngpread.c', - 'pngread.c', - 'pngrio.c', - 'pngrtran.c', - 'pngrutil.c', - 'pngset.c', - 'pngtrans.c', - 'pngusr.h', - 'pngvcrd.c', - 'pngwio.c', - 'pngwrite.c', - 'pngwtran.c', - 'pngwutil.c', -]) - -env.ChromeLibrary('libpng', input_files) - -p = env.ChromeMSVSProject('libpng.vcproj', - dest=('$CHROME_SRC_DIR/third_party/' - + 'libpng/libpng.vcproj'), - guid='{C564F145-9172-42C3-BFCB-6014CA97DBCD}', - keyword='Win32Proj', - files=input_files, - relative_path_prefix='./', - tools = [ - 'VCLibrarianTool', - 'VCCLCompilerTool', - ]) - -p.AddConfig('Debug|Win32', - ConfigurationType = '4', - InheritedPropertySheets = [ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - ]) - -p.AddConfig('Release|Win32', - ConfigurationType = '4', - InheritedPropertySheets = [ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../third_party/zlib/using_zlib.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', - ]) diff --git a/third_party/libpng/using_libpng.scons b/third_party/libpng/using_libpng.scons deleted file mode 100644 index 68b9c3f..0000000 --- a/third_party/libpng/using_libpng.scons +++ /dev/null @@ -1,22 +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 libpng library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$LIBPNG_DIR', - ], - CPPDEFINES = [ - 'PNG_USER_CONFIG', - 'CHROME_PNG_WRITE_SUPPORT', - ], - LIBS = [ - 'libpng', - ], -) diff --git a/third_party/libxml/libxml.scons b/third_party/libxml/libxml.scons deleted file mode 100644 index 63329f7..0000000 --- a/third_party/libxml/libxml.scons +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Import('env') - -if env.WantSystemLib('libxml'): - Return() - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/18n', - '$ZLIB_DIR', - 'DerivedSources', - 'DerivedSources/include', - 'include', - ], - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - 'LIBXML_STATIC', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TC', - '/wd4800', - ], - ) -elif env.Bit('linux'): - env.Append( - CPPDEFINES = [ - '_REENTRANT', - ], - ) - if '-Wall' in env['CCFLAGS']: - # We're not responsible for bad warning hygiene in this third party code. - env['CCFLAGS'].remove('-Werror') - - -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('include', [ - 'include/win32config.h', - 'include/wsockcompat.h', - MSVSFilter('libxml', [ - 'include/libxml/c14n.h', - 'include/libxml/catalog.h', - 'include/libxml/chvalid.h', - 'include/libxml/debugXML.h', - 'include/libxml/dict.h', - 'include/libxml/DOCBparser.h', - 'include/libxml/encoding.h', - 'include/libxml/entities.h', - 'include/libxml/globals.h', - 'include/libxml/hash.h', - 'include/libxml/HTMLparser.h', - 'include/libxml/HTMLtree.h', - 'include/libxml/list.h', - 'include/libxml/nanoftp.h', - 'include/libxml/nanohttp.h', - 'include/libxml/parser.h', - 'include/libxml/parserInternals.h', - 'include/libxml/pattern.h', - 'include/libxml/relaxng.h', - 'include/libxml/SAX.h', - 'include/libxml/SAX2.h', - 'include/libxml/schemasInternals.h', - 'include/libxml/schematron.h', - 'include/libxml/threads.h', - 'include/libxml/tree.h', - 'include/libxml/uri.h', - 'include/libxml/valid.h', - 'include/libxml/xinclude.h', - 'include/libxml/xlink.h', - 'include/libxml/xmlautomata.h', - 'include/libxml/xmlerror.h', - 'include/libxml/xmlexports.h', - 'include/libxml/xmlIO.h', - 'include/libxml/xmlmemory.h', - 'include/libxml/xmlmodule.h', - 'include/libxml/xmlreader.h', - 'include/libxml/xmlregexp.h', - 'include/libxml/xmlsave.h', - 'include/libxml/xmlschemas.h', - 'include/libxml/xmlschemastypes.h', - 'include/libxml/xmlstring.h', - 'include/libxml/xmlunicode.h', - 'include/libxml/xmlversion.h', - 'include/libxml/xmlwriter.h', - 'include/libxml/xpath.h', - 'include/libxml/xpathInternals.h', - 'include/libxml/xpointer.h', - ]), - ]), - 'acconfig.h', - 'c14n.c', - 'catalog.c', - 'chvalid.c', - 'config.h', - 'debugXML.c', - 'dict.c', - 'DOCBparser.c', - 'elfgcchack.h', - 'encoding.c', - 'entities.c', - 'error.c', - 'globals.c', - 'hash.c', - 'HTMLparser.c', - 'HTMLtree.c', - 'legacy.c', - 'libxml.h', - 'list.c', - 'nanoftp.c', - 'nanohttp.c', - 'parser.c', - 'parserInternals.c', - 'pattern.c', - 'relaxng.c', - 'SAX.c', - 'SAX2.c', - 'schematron.c', - 'threads.c', - 'tree.c', - 'uri.c', - 'valid.c', - 'xinclude.c', - 'xlink.c', - 'xmlIO.c', - 'xmlmemory.c', - 'xmlmodule.c', - 'xmlreader.c', - 'xmlregexp.c', - 'xmlsave.c', - 'xmlschemas.c', - 'xmlschemastypes.c', - 'xmlstring.c', - 'xmlunicode.c', - 'xmlwriter.c', - 'xpath.c', - 'xpointer.c', -]) - -env.ChromeLibrary('libxml', input_files) - -p = env.ChromeMSVSProject('$LIBXML_DIR/build/libxml.vcproj', - dest=('$CHROME_SRC_DIR/third_party/libxml/' + - '/build/libxml.vcproj'), - guid='{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './libxml.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './libxml.vsprops', - ]) - -if env.Bit('windows'): - config_files = [ - 'config.h', - 'include/libxml/xmlversion.h', - ] - for cf in config_files: - result = env.Command('DerivedSources/' + cf, 'win32/' + cf, - Copy('$TARGET', '$SOURCE')) -elif env.Bit('linux'): - config_files = [ - 'config.h', - 'include/libxml/xmlversion.h', - 'xml2-config', - ] - for cf in config_files: - result = env.Command('DerivedSources/' + cf, 'linux/' + cf, - Copy('$TARGET', '$SOURCE')) diff --git a/third_party/libxml/using_libxml.scons b/third_party/libxml/using_libxml.scons deleted file mode 100644 index 709520f..0000000 --- a/third_party/libxml/using_libxml.scons +++ /dev/null @@ -1,24 +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 libxml library. -""" - -Import("env") - -if env.WantSystemLib('libxml'): - env.Append(LIBS = ['xml2']) -else: - env.Append(LIBS = ['libxml']) - -env.Append( - CPPPATH = [ - '$LIBXML_DIR/include', - '$LIBXML_DIR/DerivedSources/include', - ], - CPPDEFINES = [ - 'LIBXML_STATIC', - ], -) diff --git a/third_party/libxslt/libxslt.scons b/third_party/libxslt/libxslt.scons deleted file mode 100644 index 0a9337b..0000000 --- a/third_party/libxslt/libxslt.scons +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Import('env') - -env = env.Clone() - -if env.WantSystemLib('libxslt'): - Return() - -env.Prepend( - CPPPATH = [ - '$LIBXML_DIR/DerivedSources/include', - '$LIBXML_DIR/include', - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/18n', - '$ZLIB_DIR', - 'scons', - '.', - '../', - ], -) - -env.Append( - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - 'LIBXML_STATIC', - 'LIBXSLT_STATIC', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TC', - '/wd4800', - ], - ) - - -input_files = ChromeFileList([ - MSVSFilter('libxslt', [ - 'libxslt/attributes.c', - 'libxslt/attributes.h', - 'libxslt/attrvt.c', - 'libxslt/documents.c', - 'libxslt/documents.h', - 'libxslt/extensions.c', - 'libxslt/extensions.h', - 'libxslt/extra.c', - 'libxslt/extra.h', - 'libxslt/functions.c', - 'libxslt/functions.h', - 'libxslt/imports.c', - 'libxslt/imports.h', - 'libxslt/keys.c', - 'libxslt/keys.h', - 'libxslt/libxslt.h', - 'libxslt/namespaces.c', - 'libxslt/namespaces.h', - 'libxslt/numbers.c', - 'libxslt/numbersInternals.h', - 'libxslt/pattern.c', - 'libxslt/pattern.h', - 'libxslt/preproc.c', - 'libxslt/preproc.h', - 'libxslt/security.c', - 'libxslt/security.h', - 'libxslt/templates.c', - 'libxslt/templates.h', - 'libxslt/transform.c', - 'libxslt/transform.h', - 'libxslt/trio.h', - 'libxslt/triodef.h', - 'libxslt/variables.c', - 'libxslt/variables.h', - 'libxslt/win32config.h', - 'libxslt/xslt.c', - 'libxslt/xslt.h', - 'libxslt/xsltconfig.h', - 'libxslt/xsltexports.h', - 'libxslt/xsltInternals.h', - 'libxslt/xsltutils.c', - 'libxslt/xsltutils.h', - 'libxslt/xsltwin32config.h', - ]), -]) - -env.ChromeLibrary('libxslt', input_files) - -p = env.ChromeMSVSProject('build/libxslt.vcproj', - dest=('$CHROME_SRC_DIR/third_party/libxslt' + - '/build/libxslt.vcproj'), - guid='{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}', - dependencies = [ - '$LIBXML_DIR/build/libxml.vcproj', - ], - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCLibrarianTool', - 'VCCLCompilerTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/debug.vsprops', - './libxslt.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/release.vsprops', - './libxslt.vsprops', - ]) - -if env.Bit('windows'): - config_files = [ - # The configure.js script must be first in this list; the - # env.Command() call below executes the first list element. - - 'win32/configure.js', - 'win32/Makefile.msvc', - - 'config.h.in', - 'configure.in', - 'libexslt.pc.in', - 'libxslt.pc.in', - 'libxslt.spec.in', - 'xslt-config.in', - 'xsltConf.sh.in', - - 'libexslt/exsltconfig.h.in', - - 'libxslt/xsltconfig.h.in', - 'libxslt/xsltwin32config.h.in', - 'libxslt/win32config.h', - ] - - copied_sources = [] - for cf in config_files: - result = env.Command('scons/' + cf, cf, Copy('$TARGET', '$SOURCE')) - copied_sources.extend(result) - - env.Command(['scons/config.h'], - copied_sources, - 'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS', - CONFIG_OPTIONS='compiler=msvc') -elif env.Bit('linux'): - config_files = [ - 'config.h', - 'xslt-config', - 'libexslt/exsltconfig.h', - 'libxslt/xsltconfig.h', - 'libxslt/xsltwin32config.h', - ] - for cf in config_files: - result = env.Command('scons/' + cf, 'linux/' + cf, - Copy('$TARGET', '$SOURCE')) diff --git a/third_party/libxslt/using_libxslt.scons b/third_party/libxslt/using_libxslt.scons deleted file mode 100644 index 3e2146a..0000000 --- a/third_party/libxslt/using_libxslt.scons +++ /dev/null @@ -1,18 +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 libxslt library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$LIBXSLT_DIR', - ], - LIBS = [ - 'libxslt', - ], -) diff --git a/third_party/modp_b64/modp_b64.scons b/third_party/modp_b64/modp_b64.scons deleted file mode 100644 index 15919c7..0000000 --- a/third_party/modp_b64/modp_b64.scons +++ /dev/null @@ -1,57 +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 modp_b64.lib / libmodp_b64.a. -""" - -Import('env') - -env = env.Clone( - PDB = 'vc80.pdb', -) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -input_files = ChromeFileList([ - 'modp_b64.cc', - 'modp_b64.h', - 'modp_b64_data.h', -]) - -env.ChromeLibrary('modp_b64', input_files) - -p = env.ChromeMSVSProject('modp_b64.vcproj', - dest=('$CHROME_SRC_DIR/third_party/' + - 'modp_b64/modp_b64.vcproj'), - guid='{7100F41F-868D-4E99-80A2-AF8E6574749D}', - keyword='Win32Proj', - # TODO(sgk): when we can intuit the hierarchy - # from the built targets. - #buildtargets=TODO, - files=input_files, - relative_path_prefix='./', - tools=[ - 'VCCLCompilerTool', - 'VCLibrarianTool', - ], - ConfigurationType='4') - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - ]) diff --git a/third_party/modp_b64/using_modp_b64.scons b/third_party/modp_b64/using_modp_b64.scons deleted file mode 100644 index f4637db..0000000 --- a/third_party/modp_b64/using_modp_b64.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 modp_b64 library. -""" - -Import("env") - -env.Append( - LIBS = [ - 'modp_b64', - ], -) diff --git a/third_party/npapi/using_npapi.scons b/third_party/npapi/using_npapi.scons deleted file mode 100644 index 0e7fc73..0000000 --- a/third_party/npapi/using_npapi.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 NPAPI. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$NPAPI_DIR', - ], -) diff --git a/third_party/sqlite/SConscript b/third_party/sqlite/SConscript deleted file mode 100644 index 633c5dd..0000000 --- a/third_party/sqlite/SConscript +++ /dev/null @@ -1,135 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', - '$CHROME_SRC_DIR', - 'preprocessed', - 'src', - ], -) - -env.Append( - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - - 'SQLITE_ENABLE_FTS2', - 'SQLITE_ENABLE_BROKEN_FTS2', - 'SQLITE_ENABLE_ICU', - 'SQLITE_SECURE_DELETE', - 'THREADSAFE', - ['_HAS_EXCEPTIONS', '0'], - ], -) - -input_files = ChromeFileList([ - 'src/alter.c', - 'src/analyze.c', - 'src/attach.c', - 'src/auth.c', - 'src/bitvec.c', - 'src/btmutex.c', - 'src/btree.c', - 'src/btree.h', - 'src/btreeInt.h', - 'src/build.c', - 'src/callback.c', - 'src/complete.c', - 'src/date.c', - 'src/delete.c', - 'src/expr.c', - 'src/fault.c', - 'ext/fts2/fts2.c', - 'ext/fts2/fts2.h', - 'ext/fts2/fts2_hash.c', - 'ext/fts2/fts2_hash.h', - 'ext/fts2/fts2_icu.c', - 'ext/fts2/fts2_porter.c', - 'ext/fts2/fts2_tokenizer.c', - 'ext/fts2/fts2_tokenizer.h', - 'ext/fts2/fts2_tokenizer1.c', - 'src/func.c', - 'src/global.c', - 'src/hash.c', - 'src/hash.h', - 'ext/icu/icu.c', - 'src/insert.c', - 'preprocessed/keywordhash.h', - 'src/legacy.c', - 'src/loadext.c', - 'src/main.c', - 'src/malloc.c', - 'src/mem1.c', - 'src/mem2.c', - 'src/mem3.c', - 'src/mem4.c', - 'src/mem5.c', - 'src/mem6.c', - 'src/mutex.c', - 'src/mutex.h', - 'src/mutex_unix.c', - 'preprocessed/opcodes.c', - 'preprocessed/opcodes.h', - 'src/os.c', - 'src/os.h', - 'src/os_common.h', - 'src/os_unix.c', - 'src/pager.c', - 'src/pager.h', - 'preprocessed/parse.c', - 'preprocessed/parse.h', - 'src/pragma.c', - 'src/prepare.c', - 'src/printf.c', - 'src/random.c', - 'src/select.c', - 'preprocessed/sqlite3.h', - 'src/sqlite3ext.h', - 'src/sqliteInt.h', - 'src/sqliteLimit.h', - 'src/status.c', - 'src/table.c', - 'src/tokenize.c', - 'src/trigger.c', - 'src/update.c', - 'src/utf.c', - 'src/util.c', - 'src/vacuum.c', - 'src/vdbe.c', - 'src/vdbe.h', - 'src/vdbeapi.c', - 'src/vdbeaux.c', - 'src/vdbeblob.c', - 'src/vdbefifo.c', - 'src/vdbeInt.h', - 'src/vdbemem.c', - 'src/vtab.c', - 'src/where.c', -]) - -sqlite_lib = env.ChromeLibrary('sqlite', input_files) - -# Build a stand alone sqlite shell so we can inspect the sqlite files. -env_shell = env.Clone() - -shell_input_files = [ - 'src/shell.c', - 'src/shell_icu_linux.c', -] - -env_shell.Append( - LIBS = [ - 'icu', - 'sqlite', - 'stdc++', - ] -) - -env_shell.ChromeProgram('sqlite_shell', shell_input_files) diff --git a/third_party/zlib/using_zlib.scons b/third_party/zlib/using_zlib.scons deleted file mode 100644 index 60bceb7..0000000 --- a/third_party/zlib/using_zlib.scons +++ /dev/null @@ -1,18 +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 zlib library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$ZLIB_DIR', - ], - LIBS = [ - 'zlib', - ], -) diff --git a/third_party/zlib/zlib.scons b/third_party/zlib/zlib.scons deleted file mode 100644 index 8280864..0000000 --- a/third_party/zlib/zlib.scons +++ /dev/null @@ -1,110 +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 zlib.lib / libzlib.a. -""" - -Import('env') - -if env.WantSystemLib('zlib'): - env.Append(ZLIB_LIB = ['z']) - Return() - -env = env.Clone() - -env.Append( - CPPPATH = ['$ZLIB_DIR'], - ZLIB_LIB = ['zlib'], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TC', - '/wd4800', - ], - ) - -minizip_filter = MSVSFilter('minizip', [ - 'contrib/minizip/ioapi.c', - 'contrib/minizip/ioapi.h', - 'contrib/minizip/iowin32.c', - 'contrib/minizip/iowin32.h', - 'contrib/minizip/unzip.c', - 'contrib/minizip/unzip.h' -]) - -input_files = ChromeFileList([ - minizip_filter, - - 'adler32.c', - 'compress.c', - 'crc32.c', - 'crc32.h', - 'deflate.c', - 'deflate.h', - 'gzio.c', - 'infback.c', - 'inffast.c', - 'inffast.h', - 'inffixed.h', - 'inflate.c', - 'inflate.h', - 'inftrees.c', - 'inftrees.h', - 'mozzconf.h', - 'trees.c', - 'trees.h', - 'uncompr.c', - 'zconf.h', - 'zlib.h', - 'zutil.c', - 'zutil.h', -]) - -if not env.Bit('windows'): - input_files.Remove( - 'contrib/minizip/iowin32.c', - 'contrib/minizip/iowin32.h', - ) - -if env.Bit('posix'): - env.Append( - CCFLAGS = [ - '-Wno-parentheses', - '-Wno-unused-variable', - ], - ) - -env.ChromeLibrary('zlib', input_files) - -p = env.ChromeMSVSProject('zlib.vcproj', - dest='$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj', - guid='{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}', - keyword='Win32Proj', - files=input_files, - relative_path_prefix=r'./', - tools = [ - 'VCLibrarianTool', - 'VCCLCompilerTool', - ]) - -p.AddConfig('Debug|Win32', - ConfigurationType = '4', - InheritedPropertySheets = [ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - './zlib.vsprops' - ]) - -p.AddConfig('Release|Win32', - ConfigurationType = '4', - InheritedPropertySheets = [ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - '$(SolutionDir)../build/external_code.vsprops', - './zlib.vsprops' - ]) diff --git a/tools/grit/build/using_generated_resources.scons b/tools/grit/build/using_generated_resources.scons deleted file mode 100644 index 1a2f673..0000000 --- a/tools/grit/build/using_generated_resources.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 resources generated by GRIT. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$TARGET_ROOT/grit_derived_sources', - ], -) diff --git a/tools/gtk_clipboard_dump/gcd.scons b/tools/gtk_clipboard_dump/gcd.scons deleted file mode 100644 index 57117f9..0000000 --- a/tools/gtk_clipboard_dump/gcd.scons +++ /dev/null @@ -1,19 +0,0 @@ -Import('env') - -if not env.Bit('linux'): - Return() - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -input_files = [ - 'gtk_clipboard_dump.cc', -] - -env.ChromeProgram('gtk_clipboard_dump', input_files) - diff --git a/webkit/SConscript b/webkit/SConscript deleted file mode 100644 index c59c49d..0000000 --- a/webkit/SConscript +++ /dev/null @@ -1,287 +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. - -import os - -Import(['env']) - -env = env.Clone() -env_res = env.Clone() - -# We use the SCons addRepository() call (an internal API that will -# at some point be made public) to "back" the build directory -# hierarchy with the source directory hierarchies in which we want to -# find the source .cpp and .h files. Think of this kind of like -# Make's VPATH, but applied to entire directory hierarchies. The -# upshot is that when searching for any file (source or target), -# SCons will search the subdirectory hierarchies under the following -# paths: -# -# webkit/Hammer/port/ -# webkit/port/ -# third_party/WebKit/WebCore/ -# -# SCons will replicate the compiler and linker -I and -L options so -# that the tools will find the right .h and library files. This comes -# at the cost of tripling the number of -I or -L options on a command -# line, but with the benefit that the build should "just work" -# regardless of which tree the file lives in, and regardless of whether -# or not the file involved is a generated file or checked-in source. -# -# (Note that because the build/SConscript.main file also calls -# addRepository() for the entire $OBJ_ROOT tree, that adds an -# extra -I or -L option for the webkit/port/ subdirectory, after the -# third_party/WebKit/WebCore/ in the above list. We'd like to -# eliminate that in the future, but that will require some -# deeper magic, and maybe a SCons modification.) - -port_dir = env.Dir('$WEBKIT_DIR/port') -port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port')) -port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore')) - -if env.Bit('windows'): - env['WEBKIT_PLATFORM_SUBDIR'] = 'win' -elif env.Bit('mac'): - env['WEBKIT_PLATFORM_SUBDIR'] = 'mac' - env.Append( - CCFLAGS = [ - '-Wno-reorder', - '-Wno-unused', - ], - ) - env.Prepend( - CPPPATH = [env.subst(x) for x in [ - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/cg', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader/archive/cf', - ]] - ) -elif env.Bit('linux'): - env.Append( - CPPDEFINES = [ - # We want webkit to use pthreads rather than gthread. - 'WTF_USE_PTHREADS=1', - ], - ) - -if env.Bit('posix'): - env.Append( - CCFLAGS = [ - '-Wno-parentheses', - ], - ) - -env.Append( - WEBCORE_DIR = '$THIRD_PARTY_WEBKIT_DIR/WebCore', - PENDING_DIR = "$WEBKIT_DIR/pending", - PORT_DIR = "$WEBKIT_DIR/port", - - JAVASCRIPTCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore", - WTF_DIR = "$JAVASCRIPTCORE_DIR/wtf", - KJS_DIR = "$JAVASCRIPTCORE_DIR/kjs", - PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre", - - V8BINDINGS_DIR = "$WEBKIT_DIR/V8Bindings", - DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"), - SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"), - - WEBKIT_DIR_PORT_INC = env.Dir("$CHROME_SRC_DIR/webkit/port"), -) - -env.Prepend( - CPPPATH = [env.subst(x) for x in [ - - # We put our grit generated headers in a common place. This matches - # what we do in Visual Studios. - '$TARGET_ROOT/grit_derived_sources', - '$WEBKIT_DIR/build/JSConfig/WebCore', - - # TODO(sgk): This directory was at this point in the /I list - # in the Visual Studio build of the merged webkit. It breaks - # the Linux build because of the pthread.h file there. - # Leaving it out doesn't obviously break the Windows build, - # but for now I'm leaving it commented out here in case it - # introduced any hidden problems. - #'$WEBKIT_DIR/build/JavaScriptCore', - - '$ZLIB_DIR', - '$LIBPNG_DIR', - '$LIBJPEG_DIR', - '$LIBXSLT_DIR', - '$LIBXML_DIR/include', - '$LIBXML_DIR/DerivedSources/include', - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/ext', - '$SKIA_DIR/platform', - '$NPAPI_DIR', - '$V8_DIR/include', - '$WEBKIT_DIR/V8Bindings/DerivedSources', - '$WEBKIT_DIR/V8Bindings/SharedSources', - - '$WEBKIT_DIR/pending', - '$WEBKIT_DIR_PORT_INC/bindings/v8', - '$WEBKIT_DIR_PORT_INC/bindings/v8/custom', - '$WEBKIT_DIR_PORT_INC/platform', - '$WEBKIT_DIR_PORT_INC/platform/$WEBKIT_PLATFORM_SUBDIR', - - '$JAVASCRIPTCORE_DIR', - '$JAVASCRIPTCORE_DIR/wtf', - '$JAVASCRIPTCORE_DIR/wtf/chromium', - - # Directories in third_party/WebKit/Webcore that we pull headers - # from. We don't have to list directories that are listed in the - # $WEBKIT_DIR_PORT_INC section above because they automatically fall - # back to third_party/WebKit/Webcore. - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/css', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/dom', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/editing', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/history', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/html', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader/appcache', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader/archive', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader/icon', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/page', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/page/animation', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/page/chromium', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/animation', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/chromium', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/chromium', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/skia', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/opentype', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/transforms', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/image-decoders/skia', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/image-encoders/skia', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/network', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/network/chromium', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/sql', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/text', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/plugins', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/rendering', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/rendering/style', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/storage', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/style', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/svg', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/svg/animation', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/svg/graphics', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/workers', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/xml', - - '$CHROME_SRC_DIR', - ]], -) - -env.Append( - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - '_SCL_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_WARNINGS', - ['ENABLE_DASHBOARD_SUPPORT', '0'], - ['ENABLE_JAVASCRIPT_DEBUGGER', '0'], - ['ENABLE_JSC_MULTIPLE_THREADS', '0'], - ['ENABLE_ICONDATABASE', '0'], - ['ENABLE_DATABASE', '1'], - ['ENABLE_XSLT', '1'], - ['ENABLE_XPATH', '1'], - ['ENABLE_SVG', '1'], - ['ENABLE_SVG_ANIMATION', '1'], - ['ENABLE_SVG_AS_IMAGE', '1'], - ['ENABLE_SVG_USE', '1'], - ['ENABLE_SVG_FOREIGN_OBJECT', '1'], - ['ENABLE_SVG_FONTS', '1'], - ['WEBCORE_NAVIGATOR_PLATFORM', '"\\"Win32\\""'], - 'USE_GOOGLE_URL_LIBRARY', - ['BUILDING_CHROMIUM__', '1'], - 'CHROMIUM_BUILD', - '_SECURE_ATL', - - 'LIBXSLT_STATIC', - 'LIBXML_STATIC', - 'PNG_USER_CONFIG', - 'CHROME_PNG_WRITE_SUPPORT', - ['__PRETTY_FUNCTION__', '__FUNCTION__'], - 'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', - - '__STD_C', - ['USE_SYSTEM_MALLOC', '1'], - ], -) - -# This addRepository call causes our webkit/port include paths to include both -# webkit/port and third_party/WebKit/WebCore. -webkit_port_inc = env.Dir("$WEBKIT_DIR_PORT_INC") -webkit_port_inc.addRepository( - env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore')) - -# This list is the SConscripts that work on Windows and Linux. -sconscript_dirs = env.ChromiumLoadComponentSConscripts( - LOAD_NAMES = ['webkit'], - port = 'SConscript.port', - JavaScriptCore_pcre = 'SConscript.javascriptcore_pcre', - WebCore_config_h = 'build/JSConfig/SConscript', - JavaScriptCore = 'build/JavaScriptCore/SConscript', - webkit_resources = 'build/webkit_resources/SConscript', - webkit_strings = 'build/webkit_strings/SConscript', - bindings = 'build/port/SConscript', - V8Bindings = 'build/V8Bindings/SConscript', - WebCore = 'build/WebCore/SConscript', - WebKit = 'build/WebKit/SConscript', - default_plugin = 'default_plugin/SConscript', - glue = 'glue/SConscript', - npapi_test_plugin = 'glue/plugins/test/SConscript', - npapi_layout_test_plugin = 'tools/npapi_layout_test_plugin/SConscript', - test_shell = 'tools/test_shell/SConscript', -) - -if env.Bit('windows'): - # These extra dirs aren't win32-specific, they're just the dirs that - # haven't yet been made portable. - sconscript_dirs.extend(env.ChromiumLoadComponentSConscripts( - LOAD_NAMES = ['webkit'], - activex_shim = 'activex_shim/SConscript', - npaxshim = 'activex_shim_dll/SConscript', - )) - - env.Append( - CPPDEFINES = [ - '_CRT_SECURE_NO_DEPRECATE', - '_CRT_NONSTDC_NO_WARNINGS', - '_CRT_NONSTDC_NO_DEPRECATE', - ['CRASH', '__debugbreak'], - ]) - - env.Prepend( - CPPPATH = [ - # Windows precompiled headers are here - '$WEBKIT_DIR/build', - - '$JAVASCRIPTCORE_DIR/os-win32', - ]) -else: - env.Append( - CXXFLAGS = ['-Wno-multichar'], - ) - -env.SConscript(sconscript_dirs, exports=['env', 'env_res']) - -# Setup alias for all webkit related targets. -# We'd like to do this as follows, but it leads to out-of-memory -# errors when SCons tries to use the entire contents of the -# directory tree as a huge content-signature string. -# Instead we're going to let all the subsidiary SConscript files -# add their own individual targets to the 'webkit' Alias. -#env.Alias('webkit', ['.', '$DESTINATION_ROOT/icudt38.dll']) -if env.Bit('windows'): - env.Alias('webkit', ['$DESTINATION_ROOT/icudt38.dll']) - -version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', - ['$WEBCORE_DIR/Configurations/Version.xcconfig', - '$CHROME_SRC_DIR/webkit/build/webkit_version.py'], - "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") -env.AlwaysBuild(version) diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre deleted file mode 100644 index b0a4aad..0000000 --- a/webkit/SConscript.javascriptcore_pcre +++ /dev/null @@ -1,55 +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. - -Import('env') - -env = env.Clone( - PCRE_DIR = '$WEBKIT_DIR/port/JavaScriptCore/pcre', -) - -env.Prepend( - CPPPATH = [ - '$WEBKIT_DIR/port/JavaScriptCore', - '$WEBKIT_DIR/port/JavaScriptCore/pcre', - '$WEBKIT_DIR/build/JSConfig/WebCore/v8', - ]) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/TP', - '/wd4127', - '/wd4355', - '/wd4510', - '/wd4512', - '/wd4610', - '/wd4706', - '/wd4800', - ], - ) - -# Map Hammer/webkit/port/JavaScriptCore/pcre so it's backed by -# third_party/WebKit/JavaScriptCore/pcre. -# -# TODO(sgk): This can be refactored to work more naturally if we just -# mirror third_party directory structure under webkit/port, instead of -# mapping Javascript => Javascript (here) and Webkit/WebCore => port -# (over in ../build/SConscript.main). - -obj_dir = env.Dir('$PCRE_DIR') -src_dir = env.Dir('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/pcre') -obj_dir.addRepository(src_dir) - -input_files = [ - '$PCRE_DIR/pcre_compile.cpp', - '$PCRE_DIR/pcre_xclass.cpp', - '$PCRE_DIR/pcre_ucp_searchfuncs.cpp', - '$PCRE_DIR/pcre_tables.cpp', - '$PCRE_DIR/pcre_exec.cpp', -] - -env.ChromeLibrary('JavaScriptCore_pcre', input_files) - -env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj', - guid='{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}') diff --git a/webkit/SConscript.port b/webkit/SConscript.port deleted file mode 100644 index 0a2d561..0000000 --- a/webkit/SConscript.port +++ /dev/null @@ -1,57 +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. - -Import('env') - -env = env.Clone() - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/TP', - - '/wd4244', - '/wd4291', - '/wd4345', - '/wd4521', - '/wd4800', - ],) -elif env.Bit('linux'): - env.Append( - # For the image readers and decoders: - CXXFLAGS = ["-Wno-sign-compare"], - LIBS = ['png'], - ) - -input_files = [ -] - -if env.Bit('mac'): - # Mac specific implementations. - input_files.extend([ - '$PORT_DIR/platform/graphics/mac/FontCacheMacPending.cpp', - '$PORT_DIR/rendering/RenderThemeMac.mm', - ]) - -if env.get('KJS'): - # These actually no longer exist, but since JSC build is super-broken, we'll - # leave them here as stark reminders of our past. - input_files.extend([ - '$PORT_DIR/bridge/KJSBridge.cpp', - '$PORT_DIR/bridge/ScriptControllerKJS.cpp', - ]) -else: - input_files.extend([ - '$PORT_DIR/bindings/v8/ScriptController.cpp', - ]) - -env.ChromeLibrary("port", input_files) - -env.ChromeMSVSProject('$WEBKIT_DIR/build/port/port.vcproj', - name = 'Port', - dependencies = [ - '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', - ], - guid='{5597AD47-3494-4750-A235-4F9C2F864700}') diff --git a/webkit/SConstruct b/webkit/SConstruct deleted file mode 100644 index 2fd02a8..0000000 --- a/webkit/SConstruct +++ /dev/null @@ -1,3 +0,0 @@ -build_component = 'webkit' -SConscript('../build/SConscript.main', - exports=['build_component']) diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript deleted file mode 100644 index b136c16..0000000 --- a/webkit/activex_shim/SConscript +++ /dev/null @@ -1,50 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$NPAPI_DIR', - '$CHROME_SRC_DIR', - ], -) - -env.Append( - CPPDEFINES = [ - 'TRACK_INTERFACE', - ], - CCFLAGS = [ - '/TP', - - '/WX', - '/Wp64', - ], - LIBS = [ - 'Urlmon', - ], -) - -input_files = [ - 'activex_plugin.cc', - 'activex_shared.cc', - 'activex_util.cc', - 'dispatch_object.cc', - 'npn_scripting.cc', - 'npp_impl.cc', - 'web_activex_container.cc', - 'web_activex_site.cc', -] - -env.ChromeLibrary('activex_shim', input_files) - -env.ChromeMSVSProject('$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - ], - guid='{F4F4BCAA-EA59-445C-A119-3E6C29647A51}') diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript deleted file mode 100644 index c8bd329..0000000 --- a/webkit/activex_shim_dll/SConscript +++ /dev/null @@ -1,57 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$NPAPI_DIR', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'activex_shim', - 'googleurl', - env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'base', - 'Urlmon', - ], -) - -env.Append( - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], -) - -input_files = [ - 'activex_shim_dll.cc', - 'activex_shim_dll.def', -] - -dll = env.ChromeSharedLibrary('npaxshim', input_files) - -i = env.Install('$TARGET_ROOT', dll) -env.Alias('webkit', i) - -env.ChromeMSVSProject('$WEBKIT_DIR/activex_shim_dll/activex_shim_dll.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - ], - guid='{494E414B-1655-48CE-996D-6413ECFB7829}') diff --git a/webkit/build/JSConfig/SConscript b/webkit/build/JSConfig/SConscript deleted file mode 100644 index 44feb87..0000000 --- a/webkit/build/JSConfig/SConscript +++ /dev/null @@ -1,26 +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. - -Import('env') - -env = env.Clone() - - -def CopyConfigH(target, source, env): - contents = open(str(source[0]), 'r').read() - - if env.get('KJS'): - contents += '#define WTF_USE_JAVASCRIPTCORE 1\n' - else: - contents += '#define WTF_USE_V8_BINDING 1\n' - contents += '#define WTF_USE_NPOBJECT 1\n' - - open(str(target[0]), 'w').write(contents) - -env.Command('WebCore/config.h', - '../../config.h.in', - Action(CopyConfigH)) - -env.ChromeMSVSProject('$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', - guid='{2E2D3301-2EC4-4C0F-B889-87073B30F673}') diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript deleted file mode 100644 index 08c577c..0000000 --- a/webkit/build/JavaScriptCore/SConscript +++ /dev/null @@ -1,179 +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. - -Import('env') - -env = env.Clone() - - -cygwin = env.Dir('$CHROME_SRC_DIR/third_party/cygwin/bin') -cygwin_posix = cygwin.abspath.replace('\\', '/') -env.PrependENVPath('PATH', cygwin_posix) - - -hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $TARGET' - -env.Replace( - CREATE_HASH_TABLE_COM = hash_table_cmd, - CREATE_HASH_TABLE = env.File('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/create_hash_table'), - CREATE_HASH_TABLE_FLAGS = '-i', -) - -# TODO(erg): Temporarily disabling JSC building since it's changed heavily -# during the merge; I am also not sure we want/need to build it when building -# V8... -# -# We still need to build the pieces of pcre so we can't just drop this -# SConscript file though... <http://crbug.com/3043> -# env['BUILDERS']['Lookup_Table_h'] = Builder(action = '$CREATE_HASH_TABLE_COM', -# suffix = '.lut.h', -# src_suffix = '.cpp') -# -# inputs = [ -# 'array_object', -# 'date_object', -# 'math_object', -# 'number_object', -# 'regexp_object', -# 'string_object', -# ] -# -# for i in inputs: -# env.Lookup_Table_h(i, '$KJS_DIR/%s.cpp' % i) -# -# env.Lookup_Table_h('lexer', '$KJS_DIR/keywords.table', -# CREATE_HASH_TABLE_FLAGS='') - -# TODO(bradnelson): sucks, needs relative path -env.Command('$WEBKIT_DIR/port/JavaScriptCore/chartables.c', - '$PCRE_DIR/dftables', - '$PERL $CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/pcre/dftables ' + \ - '${TARGET.posix}') - -# We'd like to do this as follows: -#env.CXXFile('grammar.cpp', '$KJS_DIR/grammar.y') -# but SCons has a HARD-WIRED notion that the source must be a .yy file. -# TODO(bradnelson): not sure why YACCCOM is needed, but fails without -cpp = env.Command(['Grammar.cpp', 'Grammar.h'], - '$JAVASCRIPTCORE_DIR/parser/Grammar.y', - '$YACCCOM', - YACCCOM = '$YACC $YACCFLAGS -o $TARGET $SOURCES', - YACCFLAGS = '-d -p kjsyy') -env.AddPostAction(cpp, Move('${TARGETS[1]}', '${TARGET.dir}/Grammar.hpp')) - -copies = [ - 'API/APICast.h', - 'API/JSBase.h', - 'API/JSValueRef.h', - 'API/JSObjectRef.h', - 'API/JSRetainPtr.h', - 'API/JSContextRef.h', - 'API/JSStringRef.h', - 'API/JSStringRefCF.h', - 'API/JSStringRefBSTR.h', - 'API/JavaScriptCore.h', - # NOTE: these work ok for now with relative paths because they are concated - # with JAVASCRIPT_CORE_DIR down below. - '../WebCore/bridge/npruntime.h', - '../WebCore/bridge/runtime.h', - '../WebCore/bridge/NP_jsobject.h', - '../WebCore/bridge/npruntime_internal.h', - '../WebCore/bridge/npruntime_impl.h', - '../WebCore/bridge/runtime_object.h', - '../WebCore/bridge/runtime_root.h', - 'runtime/Collector.h', - 'wtf/HashCountedSet.h', -] - -JSCORE_OUT = '$WEBKIT_DIR/scons/WebCore/JavaScriptCore' - -for c in copies: - i = env.Install(JSCORE_OUT, '$JAVASCRIPTCORE_DIR/' + c) - env.Alias('webkit', i) - -# Stuff for WTF -env = env.Clone( - CPPPATH = [ - '$JAVASCRIPTCORE_DIR', - '$WTF_DIR', - '$JAVASCRIPTCORE_DIR/API', - '$JAVASCRIPTCORE_DIR/bindings', - '$JAVASCRIPTCORE_DIR/bindings/c', - '$JAVASCRIPTCORE_DIR/bindings/jni', - '$WEBKIT_DIR/pending', - '$JAVASCRIPTCORE_DIR/wtf', - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', - '$WEBKIT_DIR', - '$CHROME_SRC_DIR', - ], -) - -env.Append( - CPPDEFINES = [ - '__STD_C', - 'U_STATIC_IMPLEMENTATION', - ], - CPPPATH = [ - '$WTF_DIR/unicode', - ], -) - -if env.Bit('windows'): - env.Append( - CPPPATH = [ - # Windows workarounds to not having pthread.h and sched.h - '$WEBKIT_DIR/build/JavaScriptCore', - # Windows workarounds to not having stdint.h - '$JAVASCRIPTCORE_DIR/os-win32', - ], - CPPDEFINES = [ - 'CRASH=__debugbreak', - ], - CCFLAGS = [ - '/TP', - - '/Wp64', - - '/wd4127', - '/wd4355', - '/wd4510', - '/wd4512', - '/wd4610', - '/wd4706', - ], - ) - -wtf_inputs = [ - '$WTF_DIR/ByteArray.cpp', - '$WTF_DIR/Assertions.cpp', - '$WTF_DIR/chromium/MainThreadChromium.cpp', - '$WTF_DIR/dtoa.cpp', - '$WTF_DIR/FastMalloc.cpp', - '$WTF_DIR/HashTable.cpp', - '$WTF_DIR/MainThread.cpp', - '$WTF_DIR/RandomNumber.cpp', - '$WTF_DIR/RefCountedLeakCounter.cpp', - '$WTF_DIR/Threading.cpp', - '$WTF_DIR/ThreadingPthreads.cpp', - '$WTF_DIR/TCSystemAlloc.cpp', - '$WTF_DIR/unicode/UTF8.cpp', - '$WTF_DIR/unicode/icu/CollatorICU.cpp', -] - -if env.Bit('windows'): - wtf_inputs.extend([ - '$WTF_DIR/ThreadingWin.cpp', - '$WTF_DIR/ThreadSpecificWin.cpp', - ]) -elif env.Bit('linux'): - # Re-add the include path for glib.h because it got lost when cloning the - # environment. - env.ParseConfig('pkg-config --cflags --libs glib-2.0') - - -env.ChromeLibrary('WTF', wtf_inputs) - -env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - guid='{AA8A5A85-592B-4357-BC60-E0E91E026AF6}') diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript deleted file mode 100644 index 86d3796..0000000 --- a/webkit/build/V8Bindings/SConscript +++ /dev/null @@ -1,433 +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. - -Import('env') - -env = env.Clone() - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/TP', - - '/wd4291', - '/wd4099', - '/wd4996', - '/wd4521', - '/wd4244', - '/wd4800', - ], - ) -else: - # We need to include the parts of icu and libxml that we want here: - env.Append( - CCFLAGS = [ - # TODO(port): fix HTMLNames etc. generator and remove this. - '-fno-strict-aliasing', - ], - CPPPATH = [ - '$ICU38_DIR/public/common', - '$LIBXML_DIR/include', - ] - ) - -inputs = [ - '$DERIVED_DIR/CSSGrammar.cpp', - '$DERIVED_DIR/HTMLElementFactory.cpp', - '$DERIVED_DIR/HTMLNames.cpp', - '$DERIVED_DIR/SVGElementFactory.cpp', - '$DERIVED_DIR/SVGNames.cpp', - '$DERIVED_DIR/UserAgentStyleSheetsData.cpp', - '$DERIVED_DIR/XLinkNames.cpp', - '$DERIVED_DIR/XMLNames.cpp', - '$DERIVED_DIR/XPathGrammar.cpp', - - # TODO(sgk): derive this list (the generated V8*.cpp names - # from the BindingsEmitter handling of the .idl names in - # webkit\build\port\SConscript. - '$DERIVED_DIR/V8Attr.cpp', - '$DERIVED_DIR/V8BarInfo.cpp', - '$DERIVED_DIR/V8CanvasGradient.cpp', - '$DERIVED_DIR/V8CanvasPattern.cpp', - '$DERIVED_DIR/V8CanvasPixelArray.cpp', - '$DERIVED_DIR/V8CanvasRenderingContext2D.cpp', - '$DERIVED_DIR/V8CDATASection.cpp', - '$DERIVED_DIR/V8CharacterData.cpp', - '$DERIVED_DIR/V8Clipboard.cpp', - '$DERIVED_DIR/V8ClientRect.cpp', - '$DERIVED_DIR/V8ClientRectList.cpp', - '$DERIVED_DIR/V8Comment.cpp', - '$DERIVED_DIR/V8Console.cpp', - '$DERIVED_DIR/V8Counter.cpp', - '$DERIVED_DIR/V8CSSCharsetRule.cpp', - '$DERIVED_DIR/V8CSSFontFaceRule.cpp', - '$DERIVED_DIR/V8CSSImportRule.cpp', - '$DERIVED_DIR/V8CSSMediaRule.cpp', - '$DERIVED_DIR/V8CSSPageRule.cpp', - '$DERIVED_DIR/V8CSSPrimitiveValue.cpp', - '$DERIVED_DIR/V8CSSRule.cpp', - '$DERIVED_DIR/V8CSSRuleList.cpp', - '$DERIVED_DIR/V8CSSStyleDeclaration.cpp', - '$DERIVED_DIR/V8CSSStyleRule.cpp', - '$DERIVED_DIR/V8CSSStyleSheet.cpp', - '$DERIVED_DIR/V8CSSValue.cpp', - '$DERIVED_DIR/V8CSSValueList.cpp', - '$DERIVED_DIR/V8CSSVariablesDeclaration.cpp', - '$DERIVED_DIR/V8CSSVariablesRule.cpp', - '$DERIVED_DIR/V8Document.cpp', - '$DERIVED_DIR/V8Database.cpp', - '$DERIVED_DIR/V8DocumentFragment.cpp', - '$DERIVED_DIR/V8DocumentType.cpp', - '$DERIVED_DIR/V8DOMCoreException.cpp', - '$DERIVED_DIR/V8DOMImplementation.cpp', - '$DERIVED_DIR/V8DOMParser.cpp', - '$DERIVED_DIR/V8DOMSelection.cpp', - '$DERIVED_DIR/V8DOMStringList.cpp', - '$DERIVED_DIR/V8DOMWindow.cpp', - '$DERIVED_DIR/V8Element.cpp', - '$DERIVED_DIR/V8Entity.cpp', - '$DERIVED_DIR/V8EntityReference.cpp', - '$DERIVED_DIR/V8Event.cpp', - '$DERIVED_DIR/V8EventException.cpp', - '$DERIVED_DIR/V8File.cpp', - '$DERIVED_DIR/V8FileList.cpp', - '$DERIVED_DIR/V8History.cpp', - '$DERIVED_DIR/V8HTMLAnchorElement.cpp', - '$DERIVED_DIR/V8HTMLAppletElement.cpp', - '$DERIVED_DIR/V8HTMLAreaElement.cpp', - '$DERIVED_DIR/V8HTMLAudioElement.cpp', - '$DERIVED_DIR/V8HTMLBaseElement.cpp', - '$DERIVED_DIR/V8HTMLBaseFontElement.cpp', - '$DERIVED_DIR/V8HTMLBlockquoteElement.cpp', - '$DERIVED_DIR/V8HTMLBodyElement.cpp', - '$DERIVED_DIR/V8HTMLBRElement.cpp', - '$DERIVED_DIR/V8HTMLButtonElement.cpp', - '$DERIVED_DIR/V8HTMLCanvasElement.cpp', - '$DERIVED_DIR/V8HTMLCollection.cpp', - '$DERIVED_DIR/V8HTMLDirectoryElement.cpp', - '$DERIVED_DIR/V8HTMLDivElement.cpp', - '$DERIVED_DIR/V8HTMLDListElement.cpp', - '$DERIVED_DIR/V8HTMLDocument.cpp', - '$DERIVED_DIR/V8HTMLElement.cpp', - '$DERIVED_DIR/V8HTMLEmbedElement.cpp', - '$DERIVED_DIR/V8HTMLFieldSetElement.cpp', - '$DERIVED_DIR/V8HTMLFontElement.cpp', - '$DERIVED_DIR/V8HTMLFormElement.cpp', - '$DERIVED_DIR/V8HTMLFrameElement.cpp', - '$DERIVED_DIR/V8HTMLFrameSetElement.cpp', - '$DERIVED_DIR/V8HTMLHeadElement.cpp', - '$DERIVED_DIR/V8HTMLHeadingElement.cpp', - '$DERIVED_DIR/V8HTMLHRElement.cpp', - '$DERIVED_DIR/V8HTMLHtmlElement.cpp', - '$DERIVED_DIR/V8HTMLIFrameElement.cpp', - '$DERIVED_DIR/V8HTMLImageElement.cpp', - '$DERIVED_DIR/V8HTMLInputElement.cpp', - '$DERIVED_DIR/V8HTMLIsIndexElement.cpp', - '$DERIVED_DIR/V8HTMLLabelElement.cpp', - '$DERIVED_DIR/V8HTMLLegendElement.cpp', - '$DERIVED_DIR/V8HTMLLIElement.cpp', - '$DERIVED_DIR/V8HTMLLinkElement.cpp', - '$DERIVED_DIR/V8HTMLMapElement.cpp', - '$DERIVED_DIR/V8HTMLMarqueeElement.cpp', - '$DERIVED_DIR/V8HTMLMediaElement.cpp', - '$DERIVED_DIR/V8HTMLMenuElement.cpp', - '$DERIVED_DIR/V8HTMLMetaElement.cpp', - '$DERIVED_DIR/V8HTMLModElement.cpp', - '$DERIVED_DIR/V8HTMLObjectElement.cpp', - '$DERIVED_DIR/V8HTMLOListElement.cpp', - '$DERIVED_DIR/V8HTMLOptGroupElement.cpp', - '$DERIVED_DIR/V8HTMLOptionElement.cpp', - '$DERIVED_DIR/V8HTMLOptionsCollection.cpp', - '$DERIVED_DIR/V8HTMLParagraphElement.cpp', - '$DERIVED_DIR/V8HTMLParamElement.cpp', - '$DERIVED_DIR/V8HTMLPreElement.cpp', - '$DERIVED_DIR/V8HTMLQuoteElement.cpp', - '$DERIVED_DIR/V8HTMLScriptElement.cpp', - '$DERIVED_DIR/V8HTMLSelectElement.cpp', - '$DERIVED_DIR/V8HTMLStyleElement.cpp', - '$DERIVED_DIR/V8HTMLTableCaptionElement.cpp', - '$DERIVED_DIR/V8HTMLTableCellElement.cpp', - '$DERIVED_DIR/V8HTMLTableColElement.cpp', - '$DERIVED_DIR/V8HTMLTableElement.cpp', - '$DERIVED_DIR/V8HTMLTableRowElement.cpp', - '$DERIVED_DIR/V8HTMLTableSectionElement.cpp', - '$DERIVED_DIR/V8HTMLTextAreaElement.cpp', - '$DERIVED_DIR/V8HTMLTitleElement.cpp', - '$DERIVED_DIR/V8HTMLUListElement.cpp', - '$DERIVED_DIR/V8HTMLVideoElement.cpp', - '$DERIVED_DIR/V8ImageData.cpp', - '$DERIVED_DIR/V8InspectorController.cpp', - '$DERIVED_DIR/V8KeyboardEvent.cpp', - '$DERIVED_DIR/V8Location.cpp', - '$DERIVED_DIR/V8MediaError.cpp', - '$DERIVED_DIR/V8MediaList.cpp', - '$DERIVED_DIR/V8MessageChannel.cpp', - '$DERIVED_DIR/V8MessageEvent.cpp', - '$DERIVED_DIR/V8MessagePort.cpp', - '$DERIVED_DIR/V8MimeType.cpp', - '$DERIVED_DIR/V8MimeTypeArray.cpp', - '$DERIVED_DIR/V8MouseEvent.cpp', - '$DERIVED_DIR/V8MutationEvent.cpp', - '$DERIVED_DIR/V8NamedNodeMap.cpp', - '$DERIVED_DIR/V8Navigator.cpp', - '$DERIVED_DIR/V8Node.cpp', - '$DERIVED_DIR/V8NodeFilter.cpp', - '$DERIVED_DIR/V8NodeIterator.cpp', - '$DERIVED_DIR/V8NodeList.cpp', - '$DERIVED_DIR/V8Notation.cpp', - '$DERIVED_DIR/V8OverflowEvent.cpp', - '$DERIVED_DIR/V8Plugin.cpp', - '$DERIVED_DIR/V8PluginArray.cpp', - '$DERIVED_DIR/V8ProcessingInstruction.cpp', - '$DERIVED_DIR/V8ProgressEvent.cpp', - '$DERIVED_DIR/V8Range.cpp', - '$DERIVED_DIR/V8RangeException.cpp', - '$DERIVED_DIR/V8Rect.cpp', - '$DERIVED_DIR/V8SQLError.cpp', - '$DERIVED_DIR/V8SQLResultSet.cpp', - '$DERIVED_DIR/V8SQLResultSetRowList.cpp', - '$DERIVED_DIR/V8SQLTransaction.cpp', - '$DERIVED_DIR/V8RGBColor.cpp', - '$DERIVED_DIR/V8Screen.cpp', - '$DERIVED_DIR/V8StyleSheet.cpp', - '$DERIVED_DIR/V8StyleSheetList.cpp', - '$DERIVED_DIR/V8SVGAElement.cpp', - '$DERIVED_DIR/V8SVGAltGlyphElement.cpp', - '$DERIVED_DIR/V8SVGAngle.cpp', - '$DERIVED_DIR/V8SVGAnimateColorElement.cpp', - '$DERIVED_DIR/V8SVGAnimatedAngle.cpp', - '$DERIVED_DIR/V8SVGAnimatedBoolean.cpp', - '$DERIVED_DIR/V8SVGAnimatedEnumeration.cpp', - '$DERIVED_DIR/V8SVGAnimatedInteger.cpp', - '$DERIVED_DIR/V8SVGAnimatedLength.cpp', - '$DERIVED_DIR/V8SVGAnimatedLengthList.cpp', - '$DERIVED_DIR/V8SVGAnimatedNumber.cpp', - '$DERIVED_DIR/V8SVGAnimatedNumberList.cpp', - '$DERIVED_DIR/V8SVGAnimatedPoints.cpp', - '$DERIVED_DIR/V8SVGAnimatedPreserveAspectRatio.cpp', - '$DERIVED_DIR/V8SVGAnimatedRect.cpp', - '$DERIVED_DIR/V8SVGAnimatedString.cpp', - '$DERIVED_DIR/V8SVGAnimatedTransformList.cpp', - '$DERIVED_DIR/V8SVGAnimateElement.cpp', - '$DERIVED_DIR/V8SVGAnimateTransformElement.cpp', - '$DERIVED_DIR/V8SVGAnimationElement.cpp', - '$DERIVED_DIR/V8SVGCircleElement.cpp', - '$DERIVED_DIR/V8SVGClipPathElement.cpp', - '$DERIVED_DIR/V8SVGColor.cpp', - '$DERIVED_DIR/V8SVGCursorElement.cpp', - '$DERIVED_DIR/V8SVGDefinitionSrcElement.cpp', - '$DERIVED_DIR/V8SVGDefsElement.cpp', - '$DERIVED_DIR/V8SVGDescElement.cpp', - '$DERIVED_DIR/V8SVGDocument.cpp', - '$DERIVED_DIR/V8SVGElement.cpp', - '$DERIVED_DIR/V8SVGElementInstance.cpp', - '$DERIVED_DIR/V8SVGElementInstanceList.cpp', - '$DERIVED_DIR/V8SVGEllipseElement.cpp', - '$DERIVED_DIR/V8SVGException.cpp', - '$DERIVED_DIR/V8SVGFontFaceElement.cpp', - '$DERIVED_DIR/V8SVGFontFaceFormatElement.cpp', - '$DERIVED_DIR/V8SVGFontFaceNameElement.cpp', - '$DERIVED_DIR/V8SVGFontFaceSrcElement.cpp', - '$DERIVED_DIR/V8SVGFontFaceUriElement.cpp', - '$DERIVED_DIR/V8SVGForeignObjectElement.cpp', - '$DERIVED_DIR/V8SVGGElement.cpp', - '$DERIVED_DIR/V8SVGGlyphElement.cpp', - '$DERIVED_DIR/V8SVGGradientElement.cpp', - '$DERIVED_DIR/V8SVGImageElement.cpp', - '$DERIVED_DIR/V8SVGLength.cpp', - '$DERIVED_DIR/V8SVGLengthList.cpp', - '$DERIVED_DIR/V8SVGLinearGradientElement.cpp', - '$DERIVED_DIR/V8SVGLineElement.cpp', - '$DERIVED_DIR/V8SVGMarkerElement.cpp', - '$DERIVED_DIR/V8SVGMaskElement.cpp', - '$DERIVED_DIR/V8SVGMatrix.cpp', - '$DERIVED_DIR/V8SVGMetadataElement.cpp', - '$DERIVED_DIR/V8SVGNumber.cpp', - '$DERIVED_DIR/V8SVGNumberList.cpp', - '$DERIVED_DIR/V8SVGPaint.cpp', - '$DERIVED_DIR/V8SVGPathElement.cpp', - '$DERIVED_DIR/V8SVGPathSeg.cpp', - '$DERIVED_DIR/V8SVGPathSegArcAbs.cpp', - '$DERIVED_DIR/V8SVGPathSegArcRel.cpp', - '$DERIVED_DIR/V8SVGPathSegClosePath.cpp', - '$DERIVED_DIR/V8SVGPathSegCurvetoCubicAbs.cpp', - '$DERIVED_DIR/V8SVGPathSegCurvetoCubicRel.cpp', - '$DERIVED_DIR/V8SVGPathSegCurvetoCubicSmoothAbs.cpp', - '$DERIVED_DIR/V8SVGPathSegCurvetoCubicSmoothRel.cpp', - '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticAbs.cpp', - '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticRel.cpp', - '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticSmoothAbs.cpp', - '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticSmoothRel.cpp', - '$DERIVED_DIR/V8SVGPathSegLinetoAbs.cpp', - '$DERIVED_DIR/V8SVGPathSegLinetoHorizontalAbs.cpp', - '$DERIVED_DIR/V8SVGPathSegLinetoHorizontalRel.cpp', - '$DERIVED_DIR/V8SVGPathSegLinetoRel.cpp', - '$DERIVED_DIR/V8SVGPathSegLinetoVerticalAbs.cpp', - '$DERIVED_DIR/V8SVGPathSegLinetoVerticalRel.cpp', - '$DERIVED_DIR/V8SVGPathSegList.cpp', - '$DERIVED_DIR/V8SVGPathSegMovetoAbs.cpp', - '$DERIVED_DIR/V8SVGPathSegMovetoRel.cpp', - '$DERIVED_DIR/V8SVGPatternElement.cpp', - '$DERIVED_DIR/V8SVGPoint.cpp', - '$DERIVED_DIR/V8SVGPointList.cpp', - '$DERIVED_DIR/V8SVGPolygonElement.cpp', - '$DERIVED_DIR/V8SVGPolylineElement.cpp', - '$DERIVED_DIR/V8SVGPreserveAspectRatio.cpp', - '$DERIVED_DIR/V8SVGRadialGradientElement.cpp', - '$DERIVED_DIR/V8SVGRect.cpp', - '$DERIVED_DIR/V8SVGRectElement.cpp', - '$DERIVED_DIR/V8SVGRenderingIntent.cpp', - '$DERIVED_DIR/V8SVGScriptElement.cpp', - '$DERIVED_DIR/V8SVGSetElement.cpp', - '$DERIVED_DIR/V8SVGStopElement.cpp', - '$DERIVED_DIR/V8SVGStringList.cpp', - '$DERIVED_DIR/V8SVGStyleElement.cpp', - '$DERIVED_DIR/V8SVGSVGElement.cpp', - '$DERIVED_DIR/V8SVGSwitchElement.cpp', - '$DERIVED_DIR/V8SVGSymbolElement.cpp', - '$DERIVED_DIR/V8SVGTextContentElement.cpp', - '$DERIVED_DIR/V8SVGTextElement.cpp', - '$DERIVED_DIR/V8SVGTextPathElement.cpp', - '$DERIVED_DIR/V8SVGTextPositioningElement.cpp', - '$DERIVED_DIR/V8SVGTitleElement.cpp', - '$DERIVED_DIR/V8SVGTransform.cpp', - '$DERIVED_DIR/V8SVGTransformList.cpp', - '$DERIVED_DIR/V8SVGTRefElement.cpp', - '$DERIVED_DIR/V8SVGTSpanElement.cpp', - '$DERIVED_DIR/V8SVGUnitTypes.cpp', - '$DERIVED_DIR/V8SVGURIReference.cpp', - '$DERIVED_DIR/V8SVGUseElement.cpp', - '$DERIVED_DIR/V8SVGViewElement.cpp', - '$DERIVED_DIR/V8SVGZoomEvent.cpp', - '$DERIVED_DIR/V8Text.cpp', - '$DERIVED_DIR/V8TextEvent.cpp', - '$DERIVED_DIR/V8TextMetrics.cpp', - '$DERIVED_DIR/V8TimeRanges.cpp', - '$DERIVED_DIR/V8TreeWalker.cpp', - '$DERIVED_DIR/V8UIEvent.cpp', - '$DERIVED_DIR/V8UndetectableHTMLCollection.cpp', - '$DERIVED_DIR/V8WebKitAnimationEvent.cpp', - '$DERIVED_DIR/V8WebKitCSSKeyframeRule.cpp', - '$DERIVED_DIR/V8WebKitCSSKeyframesRule.cpp', - '$DERIVED_DIR/V8WebKitCSSMatrix.cpp', - '$DERIVED_DIR/V8WebKitCSSTransformValue.cpp', - '$DERIVED_DIR/V8WebKitPoint.cpp', - '$DERIVED_DIR/V8WebKitTransitionEvent.cpp', - '$DERIVED_DIR/V8WheelEvent.cpp', - '$DERIVED_DIR/V8Worker.cpp', - '$DERIVED_DIR/V8WorkerContext.cpp', - '$DERIVED_DIR/V8WorkerLocation.cpp', - '$DERIVED_DIR/V8XMLHttpRequest.cpp', - '$DERIVED_DIR/V8XMLHttpRequestException.cpp', - '$DERIVED_DIR/V8XMLHttpRequestProgressEvent.cpp', - '$DERIVED_DIR/V8XMLHttpRequestUpload.cpp', - '$DERIVED_DIR/V8XMLSerializer.cpp', - '$DERIVED_DIR/V8XPathEvaluator.cpp', - '$DERIVED_DIR/V8XPathException.cpp', - '$DERIVED_DIR/V8XPathExpression.cpp', - '$DERIVED_DIR/V8XPathNSResolver.cpp', - '$DERIVED_DIR/V8XPathResult.cpp', - '$DERIVED_DIR/V8XSLTProcessor.cpp', - - '$PORT_DIR/bindings/v8/JSDOMBinding.cpp', - '$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp', - '$PORT_DIR/bindings/v8/NPV8Object.cpp', - '$PORT_DIR/bindings/v8/npruntime.cpp', - '$PORT_DIR/bindings/v8/RGBColor.cpp', - '$WEBCORE_DIR/bindings/v8/ScheduledAction.cpp', - '$WEBCORE_DIR/bindings/v8/ScriptCallFrame.cpp', - '$WEBCORE_DIR/bindings/v8/ScriptCallStack.cpp', - '$WEBCORE_DIR/bindings/v8/ScriptInstance.cpp', - '$WEBCORE_DIR/bindings/v8/ScriptValue.cpp', - '$WEBCORE_DIR/bindings/v8/V8AbstractEventListener.cpp', - '$WEBCORE_DIR/bindings/v8/V8LazyEventListener.cpp', - '$WEBCORE_DIR/bindings/v8/V8NodeFilterCondition.cpp', - '$WEBCORE_DIR/bindings/v8/V8ObjectEventListener.cpp', - '$WEBCORE_DIR/bindings/v8/V8WorkerContextEventListener.cpp', - '$WEBCORE_DIR/bindings/v8/V8XMLHttpRequestUtilities.cpp', - '$WEBCORE_DIR/bindings/v8/WorkerContextExecutionProxy.cpp', - '$WEBCORE_DIR/bindings/v8/WorkerScriptController.cpp', - '$PORT_DIR/bindings/v8/v8_binding.cpp', - '$PORT_DIR/bindings/v8/v8_custom.cpp', - '$PORT_DIR/bindings/v8/v8_helpers.cpp', - '$PORT_DIR/bindings/v8/v8_index.cpp', - '$PORT_DIR/bindings/v8/V8NPUtils.cpp', - '$PORT_DIR/bindings/v8/V8NPObject.cpp', - '$PORT_DIR/bindings/v8/v8_proxy.cpp', - '$PORT_DIR/bindings/v8/V8CanvasPixelArrayCustom.cpp', - '$PORT_DIR/bindings/v8/V8DOMMap.cpp', - '$PORT_DIR/bindings/v8/V8MessagePortCustom.cpp', - '$PORT_DIR/bindings/v8/V8WorkerContextCustom.cpp', - '$PORT_DIR/bindings/v8/V8WorkerCustom.cpp', - - '$WEBCORE_DIR/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8ClipboardCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8CustomEventListener.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8CustomSQLStatementCallback.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8CustomVoidCallback.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8DatabaseCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8DocumentCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8DOMParserConstructor.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8DOMStringListCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8DOMWindowCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8EventCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8HTMLCollectionCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8HTMLDocumentCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8HTMLFormElementCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8HTMLFrameSetElementCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8HTMLInputElementCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8HTMLSelectElementCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8InspectorControllerCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8LocationCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8MessageChannelConstructor.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8NamedNodeMapCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8NamedNodesCollection.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8NavigatorCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8NodeCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8NodeFilterCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8NodeIteratorCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8NodeListCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8SQLTransactionCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8StyleSheetListCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8SVGElementInstanceCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8SVGLengthCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8SVGMatrixCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8TreeWalkerCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8XMLHttpRequestConstructor.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8XMLHttpRequestCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8XMLSerializerConstructor.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8XPathEvaluatorConstructor.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8XSLTProcessorCustom.cpp', - - '$WEBKIT_DIR/extensions/v8/gc_extension.cc', - '$WEBKIT_DIR/extensions/v8/gears_extension.cc', - '$WEBKIT_DIR/extensions/v8/interval_extension.cc', - '$WEBKIT_DIR/extensions/v8/playback_extension.cc', - '$WEBKIT_DIR/extensions/v8/profiler_extension.cc', -] - -if env.Bit('windows'): - inputs.append('precompiled_v8bindings.cpp') - -env.ChromeLibrary('V8Bindings', inputs) - -env.ChromeMSVSProject('$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - dependencies = [ - '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', - ], - guid='{625A8F11-2B4E-45B4-BD99-C6D629C606C0}') - -env.ChromeMSVSProject('$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', - guid='{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}') diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript deleted file mode 100644 index 12c4474..0000000 --- a/webkit/build/WebCore/SConscript +++ /dev/null @@ -1,1014 +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. - -Import('env') - -env = env.Clone() - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - - '/wd4138', - '/wd4244', - '/wd4291', - '/wd4305', - '/wd4521', - '/wd4099', - '/wd4800', - ], - CPPDEFINES = [ - '__STD_C', - ], - ) - -if env.Bit('posix'): - if '-Wall' in env['CXXFLAGS'] and '-Werror' in env['CXXFLAGS']: - # It'd be nice to fix these warnings upstream, but we're not going to - # block on it. - env['CXXFLAGS'].remove('-Werror') - -env.Append( - CPPPATH = [ - '$THIRD_PARTY_DIR/sqlite/preprocessed' - ], - LIBS = [ - 'WebKit', - 'V8Bindings', - 'JavaScriptCore_pcre', - ], -) - -input_files = [ - '$WEBCORE_DIR/css/CSSBorderImageValue.cpp', - '$WEBCORE_DIR/css/CSSCanvasValue.cpp', - '$WEBCORE_DIR/css/CSSCharsetRule.cpp', - '$WEBCORE_DIR/css/CSSComputedStyleDeclaration.cpp', - '$WEBCORE_DIR/css/CSSCursorImageValue.cpp', - '$WEBCORE_DIR/css/CSSFontFace.cpp', - '$WEBCORE_DIR/css/CSSFontFaceRule.cpp', - '$WEBCORE_DIR/css/CSSFontFaceSource.cpp', - '$WEBCORE_DIR/css/CSSFontFaceSrcValue.cpp', - '$WEBCORE_DIR/css/CSSFontSelector.cpp', - '$WEBCORE_DIR/css/CSSFunctionValue.cpp', - '$WEBCORE_DIR/css/CSSGradientValue.cpp', - '$WEBCORE_DIR/css/CSSHelper.cpp', - '$WEBCORE_DIR/css/CSSImageGeneratorValue.cpp', - '$WEBCORE_DIR/css/CSSImageValue.cpp', - '$WEBCORE_DIR/css/CSSImportRule.cpp', - '$WEBCORE_DIR/css/CSSInheritedValue.cpp', - '$WEBCORE_DIR/css/CSSInitialValue.cpp', - '$WEBCORE_DIR/css/CSSMediaRule.cpp', - '$WEBCORE_DIR/css/CSSMutableStyleDeclaration.cpp', - '$WEBCORE_DIR/css/CSSPageRule.cpp', - '$WEBCORE_DIR/css/CSSParser.cpp', - '$WEBCORE_DIR/css/CSSParserValues.cpp', - '$WEBCORE_DIR/css/CSSPrimitiveValue.cpp', - '$WEBCORE_DIR/css/CSSProperty.cpp', - '$WEBCORE_DIR/css/CSSPropertyLonghand.cpp', - '$WEBCORE_DIR/css/CSSReflectValue.cpp', - '$WEBCORE_DIR/css/CSSRule.cpp', - '$WEBCORE_DIR/css/CSSRuleList.cpp', - '$WEBCORE_DIR/css/CSSSegmentedFontFace.cpp', - '$WEBCORE_DIR/css/CSSSelector.cpp', - '$WEBCORE_DIR/css/CSSSelectorList.cpp', - '$WEBCORE_DIR/css/CSSStyleDeclaration.cpp', - '$WEBCORE_DIR/css/CSSStyleRule.cpp', - '$WEBCORE_DIR/css/CSSStyleSelector.cpp', - '$WEBCORE_DIR/css/CSSStyleSheet.cpp', - '$WEBCORE_DIR/css/CSSTimingFunctionValue.cpp', - '$WEBCORE_DIR/css/CSSUnicodeRangeValue.cpp', - '$WEBCORE_DIR/css/CSSValueList.cpp', - '$WEBCORE_DIR/css/CSSVariableDependentValue.cpp', - '$WEBCORE_DIR/css/CSSVariablesDeclaration.cpp', - '$WEBCORE_DIR/css/CSSVariablesRule.cpp', - '$WEBCORE_DIR/css/FontFamilyValue.cpp', - '$WEBCORE_DIR/css/FontValue.cpp', - '$WEBCORE_DIR/css/MediaFeatureNames.cpp', - '$WEBCORE_DIR/css/MediaList.cpp', - '$WEBCORE_DIR/css/MediaQuery.cpp', - '$WEBCORE_DIR/css/MediaQueryEvaluator.cpp', - '$WEBCORE_DIR/css/MediaQueryExp.cpp', - '$WEBCORE_DIR/css/ShadowValue.cpp', - '$WEBCORE_DIR/css/StyleBase.cpp', - '$WEBCORE_DIR/css/StyleList.cpp', - '$WEBCORE_DIR/css/StyleSheet.cpp', - '$WEBCORE_DIR/css/StyleSheetList.cpp', - '$WEBCORE_DIR/css/SVGCSSComputedStyleDeclaration.cpp', - '$WEBCORE_DIR/css/SVGCSSParser.cpp', - '$WEBCORE_DIR/css/SVGCSSStyleSelector.cpp', - '$WEBCORE_DIR/css/WebKitCSSKeyframeRule.cpp', - '$WEBCORE_DIR/css/WebKitCSSKeyframesRule.cpp', - '$WEBCORE_DIR/css/WebKitCSSMatrix.cpp', - '$WEBCORE_DIR/css/WebKitCSSTransformValue.cpp', - - '$WEBCORE_DIR/dom/ActiveDOMObject.cpp', - '$WEBCORE_DIR/dom/Attr.cpp', - '$WEBCORE_DIR/dom/Attribute.cpp', - '$WEBCORE_DIR/dom/BeforeTextInsertedEvent.cpp', - '$WEBCORE_DIR/dom/BeforeUnloadEvent.cpp', - '$WEBCORE_DIR/dom/CDATASection.cpp', - '$WEBCORE_DIR/dom/CharacterData.cpp', - '$WEBCORE_DIR/dom/CheckedRadioButtons.cpp', - '$WEBCORE_DIR/dom/ChildNodeList.cpp', - '$WEBCORE_DIR/dom/ClassNames.cpp', - '$WEBCORE_DIR/dom/ClassNodeList.cpp', - '$WEBCORE_DIR/dom/ClientRect.cpp', - '$WEBCORE_DIR/dom/ClientRectList.cpp', - '$WEBCORE_DIR/dom/Clipboard.cpp', - '$WEBCORE_DIR/dom/ClipboardEvent.cpp', - '$WEBCORE_DIR/dom/Comment.cpp', - '$WEBCORE_DIR/dom/ContainerNode.cpp', - '$WEBCORE_DIR/dom/CSSMappedAttributeDeclaration.cpp', - '$WEBCORE_DIR/dom/Document.cpp', - '$WEBCORE_DIR/dom/DocumentFragment.cpp', - '$WEBCORE_DIR/dom/DocumentType.cpp', - '$WEBCORE_DIR/dom/DOMImplementation.cpp', - '$WEBCORE_DIR/dom/DOMStringList.cpp', - '$WEBCORE_DIR/dom/DynamicNodeList.cpp', - '$WEBCORE_DIR/dom/EditingText.cpp', - '$WEBCORE_DIR/dom/Element.cpp', - '$WEBCORE_DIR/dom/Entity.cpp', - '$WEBCORE_DIR/dom/EntityReference.cpp', - '$WEBCORE_DIR/dom/Event.cpp', - '$WEBCORE_DIR/dom/EventNames.cpp', - '$WEBCORE_DIR/dom/EventTarget.cpp', - '$WEBCORE_DIR/dom/ExceptionBase.cpp', - '$WEBCORE_DIR/dom/ExceptionCode.cpp', - '$WEBCORE_DIR/dom/FormControlElementWithState.cpp', - '$WEBCORE_DIR/dom/FormControlElement.cpp', - '$WEBCORE_DIR/dom/InputElement.cpp', - '$WEBCORE_DIR/dom/KeyboardEvent.cpp', - '$WEBCORE_DIR/dom/MappedAttribute.cpp', - '$WEBCORE_DIR/dom/MessageChannel.cpp', - '$WEBCORE_DIR/dom/MessageEvent.cpp', - '$WEBCORE_DIR/dom/MessagePort.cpp', - '$WEBCORE_DIR/dom/MouseEvent.cpp', - '$WEBCORE_DIR/dom/MouseRelatedEvent.cpp', - '$WEBCORE_DIR/dom/MutationEvent.cpp', - '$WEBCORE_DIR/dom/NamedAttrMap.cpp', - '$WEBCORE_DIR/dom/NamedMappedAttrMap.cpp', - '$WEBCORE_DIR/dom/NameNodeList.cpp', - '$WEBCORE_DIR/dom/Node.cpp', - '$WEBCORE_DIR/dom/NodeFilter.cpp', - '$WEBCORE_DIR/dom/NodeFilterCondition.cpp', - '$WEBCORE_DIR/dom/NodeIterator.cpp', - '$WEBCORE_DIR/dom/Notation.cpp', - '$WEBCORE_DIR/dom/OptionGroupElement.cpp', - '$WEBCORE_DIR/dom/OptionElement.cpp', - '$WEBCORE_DIR/dom/OverflowEvent.cpp', - '$WEBCORE_DIR/dom/Position.cpp', - '$WEBCORE_DIR/dom/PositionIterator.cpp', - '$WEBCORE_DIR/dom/ProcessingInstruction.cpp', - '$WEBCORE_DIR/dom/ProgressEvent.cpp', - '$WEBCORE_DIR/dom/QualifiedName.cpp', - '$WEBCORE_DIR/dom/Range.cpp', - '$WEBCORE_DIR/dom/RegisteredEventListener.cpp', - '$WEBCORE_DIR/dom/ScriptElement.cpp', - '$WEBCORE_DIR/dom/ScriptExecutionContext.cpp', - '$WEBCORE_DIR/dom/SelectorNodeList.cpp', - '$WEBCORE_DIR/dom/StaticNodeList.cpp', - '$WEBCORE_DIR/dom/StyledElement.cpp', - '$WEBCORE_DIR/dom/StyleElement.cpp', - '$WEBCORE_DIR/dom/TagNodeList.cpp', - '$WEBCORE_DIR/dom/Text.cpp', - '$WEBCORE_DIR/dom/TextEvent.cpp', - '$WEBCORE_DIR/dom/Traversal.cpp', - '$WEBCORE_DIR/dom/TreeWalker.cpp', - '$WEBCORE_DIR/dom/UIEvent.cpp', - '$WEBCORE_DIR/dom/UIEventWithKeyState.cpp', - '$WEBCORE_DIR/dom/WebKitAnimationEvent.cpp', - '$WEBCORE_DIR/dom/WebKitTransitionEvent.cpp', - '$WEBCORE_DIR/dom/WheelEvent.cpp', - '$WEBCORE_DIR/dom/XMLTokenizer.cpp', - '$WEBCORE_DIR/dom/XMLTokenizerLibxml2.cpp', - - '$WEBCORE_DIR/editing/chromium/EditorChromium.cpp', - - '$WEBCORE_DIR/editing/AppendNodeCommand.cpp', - '$WEBCORE_DIR/editing/ApplyStyleCommand.cpp', - '$WEBCORE_DIR/editing/BreakBlockquoteCommand.cpp', - '$WEBCORE_DIR/editing/CompositeEditCommand.cpp', - '$WEBCORE_DIR/editing/CreateLinkCommand.cpp', - '$WEBCORE_DIR/editing/DeleteButton.cpp', - '$WEBCORE_DIR/editing/DeleteButtonController.cpp', - '$WEBCORE_DIR/editing/DeleteFromTextNodeCommand.cpp', - '$WEBCORE_DIR/editing/DeleteSelectionCommand.cpp', - '$WEBCORE_DIR/editing/EditCommand.cpp', - '$WEBCORE_DIR/editing/Editor.cpp', - '$WEBCORE_DIR/editing/EditorCommand.cpp', - '$WEBCORE_DIR/editing/FormatBlockCommand.cpp', - '$WEBCORE_DIR/editing/htmlediting.cpp', - '$WEBCORE_DIR/editing/HTMLInterchange.cpp', - '$WEBCORE_DIR/editing/IndentOutdentCommand.cpp', - '$WEBCORE_DIR/editing/InsertIntoTextNodeCommand.cpp', - '$WEBCORE_DIR/editing/InsertLineBreakCommand.cpp', - '$WEBCORE_DIR/editing/InsertListCommand.cpp', - '$WEBCORE_DIR/editing/InsertNodeBeforeCommand.cpp', - '$WEBCORE_DIR/editing/InsertParagraphSeparatorCommand.cpp', - '$WEBCORE_DIR/editing/InsertTextCommand.cpp', - '$WEBCORE_DIR/editing/JoinTextNodesCommand.cpp', - '$WEBCORE_DIR/editing/markup.cpp', - '$WEBCORE_DIR/editing/MergeIdenticalElementsCommand.cpp', - '$WEBCORE_DIR/editing/ModifySelectionListLevel.cpp', - '$WEBCORE_DIR/editing/MoveSelectionCommand.cpp', - '$WEBCORE_DIR/editing/RemoveCSSPropertyCommand.cpp', - '$WEBCORE_DIR/editing/RemoveFormatCommand.cpp', - '$WEBCORE_DIR/editing/RemoveNodeCommand.cpp', - '$WEBCORE_DIR/editing/RemoveNodePreservingChildrenCommand.cpp', - '$WEBCORE_DIR/editing/ReplaceSelectionCommand.cpp', - '$WEBCORE_DIR/editing/SelectionController.cpp', - '$WEBCORE_DIR/editing/SetNodeAttributeCommand.cpp', - #'$WEBCORE_DIR/editing/SmartReplace.cpp', - '$WEBCORE_DIR/editing/SmartReplaceICU.cpp', - '$WEBCORE_DIR/editing/SplitElementCommand.cpp', - '$WEBCORE_DIR/editing/SplitTextNodeCommand.cpp', - '$WEBCORE_DIR/editing/SplitTextNodeContainingElementCommand.cpp', - '$WEBCORE_DIR/editing/TextIterator.cpp', - '$WEBCORE_DIR/editing/TypingCommand.cpp', - '$WEBCORE_DIR/editing/UnlinkCommand.cpp', - '$WEBCORE_DIR/editing/visible_units.cpp', - '$WEBCORE_DIR/editing/VisiblePosition.cpp', - '$WEBCORE_DIR/editing/VisibleSelection.cpp', - '$WEBCORE_DIR/editing/WrapContentsInDummySpanCommand.cpp', - - '$WEBCORE_DIR/history/BackForwardListChromium.cpp', - '$WEBCORE_DIR/history/CachedFrame.cpp', - '$WEBCORE_DIR/history/CachedPage.cpp', - '$WEBCORE_DIR/history/PageCache.cpp', - '$WEBCORE_DIR/history/HistoryItem.cpp', - - '$WEBCORE_DIR/html/CanvasGradient.cpp', - '$WEBCORE_DIR/html/CanvasPattern.cpp', - '$WEBCORE_DIR/html/CanvasPixelArray.cpp', - '$WEBCORE_DIR/html/CanvasRenderingContext2D.cpp', - '$WEBCORE_DIR/html/CanvasStyle.cpp', - '$WEBCORE_DIR/html/File.cpp', - '$WEBCORE_DIR/html/FileList.cpp', - '$WEBCORE_DIR/html/FormDataList.cpp', - '$WEBCORE_DIR/html/HTMLAnchorElement.cpp', - '$WEBCORE_DIR/html/HTMLAppletElement.cpp', - '$WEBCORE_DIR/html/HTMLAreaElement.cpp', - '$WEBCORE_DIR/html/HTMLAudioElement.cpp', - '$WEBCORE_DIR/html/HTMLBaseElement.cpp', - '$WEBCORE_DIR/html/HTMLBaseFontElement.cpp', - '$WEBCORE_DIR/html/HTMLBlockquoteElement.cpp', - '$WEBCORE_DIR/html/HTMLBodyElement.cpp', - '$WEBCORE_DIR/html/HTMLBRElement.cpp', - '$WEBCORE_DIR/html/HTMLButtonElement.cpp', - '$WEBCORE_DIR/html/HTMLCanvasElement.cpp', - '$WEBCORE_DIR/html/HTMLCollection.cpp', - '$WEBCORE_DIR/html/HTMLDirectoryElement.cpp', - '$WEBCORE_DIR/html/HTMLDivElement.cpp', - '$WEBCORE_DIR/html/HTMLDListElement.cpp', - '$WEBCORE_DIR/html/HTMLDocument.cpp', - '$WEBCORE_DIR/html/HTMLElement.cpp', - '$WEBCORE_DIR/html/HTMLEmbedElement.cpp', - '$WEBCORE_DIR/html/HTMLFieldSetElement.cpp', - '$WEBCORE_DIR/html/HTMLFontElement.cpp', - '$WEBCORE_DIR/html/HTMLFormCollection.cpp', - '$WEBCORE_DIR/html/HTMLFormControlElement.cpp', - '$WEBCORE_DIR/html/HTMLFormElement.cpp', - '$WEBCORE_DIR/html/HTMLFrameElement.cpp', - '$WEBCORE_DIR/html/HTMLFrameElementBase.cpp', - '$WEBCORE_DIR/html/HTMLFrameOwnerElement.cpp', - '$WEBCORE_DIR/html/HTMLFrameSetElement.cpp', - '$WEBCORE_DIR/html/HTMLHeadElement.cpp', - '$WEBCORE_DIR/html/HTMLHeadingElement.cpp', - '$WEBCORE_DIR/html/HTMLHRElement.cpp', - '$WEBCORE_DIR/html/HTMLHtmlElement.cpp', - '$WEBCORE_DIR/html/HTMLIFrameElement.cpp', - '$WEBCORE_DIR/html/HTMLImageElement.cpp', - '$WEBCORE_DIR/html/HTMLImageLoader.cpp', - '$WEBCORE_DIR/html/HTMLInputElement.cpp', - '$WEBCORE_DIR/html/HTMLIsIndexElement.cpp', - '$WEBCORE_DIR/html/HTMLKeygenElement.cpp', - '$WEBCORE_DIR/html/HTMLLabelElement.cpp', - '$WEBCORE_DIR/html/HTMLLegendElement.cpp', - '$WEBCORE_DIR/html/HTMLLIElement.cpp', - '$WEBCORE_DIR/html/HTMLLinkElement.cpp', - '$WEBCORE_DIR/html/HTMLMapElement.cpp', - '$WEBCORE_DIR/html/HTMLMarqueeElement.cpp', - '$WEBCORE_DIR/html/HTMLMediaElement.cpp', - '$WEBCORE_DIR/html/HTMLMenuElement.cpp', - '$WEBCORE_DIR/html/HTMLMetaElement.cpp', - '$WEBCORE_DIR/html/HTMLModElement.cpp', - '$WEBCORE_DIR/html/HTMLNameCollection.cpp', - '$WEBCORE_DIR/html/HTMLObjectElement.cpp', - '$WEBCORE_DIR/html/HTMLOListElement.cpp', - '$WEBCORE_DIR/html/HTMLOptGroupElement.cpp', - '$WEBCORE_DIR/html/HTMLOptionElement.cpp', - '$WEBCORE_DIR/html/HTMLOptionsCollection.cpp', - '$WEBCORE_DIR/html/HTMLParagraphElement.cpp', - '$WEBCORE_DIR/html/HTMLParamElement.cpp', - '$WEBCORE_DIR/html/HTMLParser.cpp', - '$WEBCORE_DIR/html/HTMLParserErrorCodes.cpp', - '$WEBCORE_DIR/html/HTMLPlugInElement.cpp', - '$WEBCORE_DIR/html/HTMLPlugInImageElement.cpp', - '$WEBCORE_DIR/html/HTMLPreElement.cpp', - '$WEBCORE_DIR/html/HTMLQuoteElement.cpp', - '$WEBCORE_DIR/html/HTMLScriptElement.cpp', - '$WEBCORE_DIR/html/HTMLSelectElement.cpp', - '$WEBCORE_DIR/html/HTMLSourceElement.cpp', - '$WEBCORE_DIR/html/HTMLStyleElement.cpp', - '$WEBCORE_DIR/html/HTMLTableCaptionElement.cpp', - '$WEBCORE_DIR/html/HTMLTableCellElement.cpp', - '$WEBCORE_DIR/html/HTMLTableColElement.cpp', - '$WEBCORE_DIR/html/HTMLTableElement.cpp', - '$WEBCORE_DIR/html/HTMLTablePartElement.cpp', - '$WEBCORE_DIR/html/HTMLTableRowElement.cpp', - '$WEBCORE_DIR/html/HTMLTableRowsCollection.cpp', - '$WEBCORE_DIR/html/HTMLTableSectionElement.cpp', - '$WEBCORE_DIR/html/HTMLTextAreaElement.cpp', - '$WEBCORE_DIR/html/HTMLTitleElement.cpp', - '$WEBCORE_DIR/html/HTMLTokenizer.cpp', - '$WEBCORE_DIR/html/HTMLUListElement.cpp', - '$WEBCORE_DIR/html/HTMLVideoElement.cpp', - '$WEBCORE_DIR/html/HTMLViewSourceDocument.cpp', - '$WEBCORE_DIR/html/ImageData.cpp', - '$WEBCORE_DIR/html/PreloadScanner.cpp', - '$WEBCORE_DIR/html/TimeRanges.cpp', - - '$WEBCORE_DIR/inspector/InspectorController.cpp', - - '$WEBCORE_DIR/loader/Cache.cpp', - '$WEBCORE_DIR/loader/CachedCSSStyleSheet.cpp', - '$WEBCORE_DIR/loader/CachedFont.cpp', - '$WEBCORE_DIR/loader/CachedImage.cpp', - '$WEBCORE_DIR/loader/CachedResource.cpp', - '$WEBCORE_DIR/loader/CachedResourceHandle.cpp', - '$WEBCORE_DIR/loader/CachedResourceClientWalker.cpp', - '$WEBCORE_DIR/loader/CachedScript.cpp', - '$WEBCORE_DIR/loader/CachedXBLDocument.cpp', - '$WEBCORE_DIR/loader/CachedXSLStyleSheet.cpp', - '$WEBCORE_DIR/loader/CrossOriginAccessControl.cpp', - '$WEBCORE_DIR/loader/CrossOriginPreflightResultCache.cpp', - '$WEBCORE_DIR/loader/DocLoader.cpp', - '$WEBCORE_DIR/loader/DocumentLoader.cpp', - '$WEBCORE_DIR/loader/DocumentThreadableLoader.cpp', - '$WEBCORE_DIR/loader/FormState.cpp', - '$WEBCORE_DIR/loader/FrameLoader.cpp', - '$WEBCORE_DIR/loader/FTPDirectoryDocument.cpp', - '$WEBCORE_DIR/loader/FTPDirectoryParser.cpp', - '$WEBCORE_DIR/loader/ImageDocument.cpp', - '$WEBCORE_DIR/loader/ImageLoader.cpp', - '$WEBCORE_DIR/loader/loader.cpp', - '$WEBCORE_DIR/loader/MainResourceLoader.cpp', - '$WEBCORE_DIR/loader/MediaDocument.cpp', - '$WEBCORE_DIR/loader/NavigationAction.cpp', - '$WEBCORE_DIR/loader/NetscapePlugInStreamLoader.cpp', - '$WEBCORE_DIR/loader/PluginDocument.cpp', - '$WEBCORE_DIR/loader/ProgressTracker.cpp', - '$WEBCORE_DIR/loader/Request.cpp', - '$WEBCORE_DIR/loader/ResourceLoader.cpp', - '$WEBCORE_DIR/loader/SubresourceLoader.cpp', - '$WEBCORE_DIR/loader/TextDocument.cpp', - '$WEBCORE_DIR/loader/TextResourceDecoder.cpp', - '$WEBCORE_DIR/loader/ThreadableLoader.cpp', - '$WEBCORE_DIR/loader/WorkerThreadableLoader.cpp', - - '$WEBCORE_DIR/loader/archive/ArchiveFactory.cpp', - '$WEBCORE_DIR/loader/archive/ArchiveResource.cpp', - '$WEBCORE_DIR/loader/archive/ArchiveResourceCollection.cpp', - - '$WEBCORE_DIR/loader/icon/IconLoader.cpp', - '$WEBCORE_DIR/loader/icon/IconDatabaseNone.cpp', - - '$WEBCORE_DIR/page/AccessibilityImageMapLink.cpp', - '$WEBCORE_DIR/page/AccessibilityList.cpp', - '$WEBCORE_DIR/page/AccessibilityListBox.cpp', - '$WEBCORE_DIR/page/AccessibilityListBoxOption.cpp', - '$WEBCORE_DIR/page/AccessibilityObject.cpp', - '$WEBCORE_DIR/page/AccessibilityRenderObject.cpp', - '$WEBCORE_DIR/page/AccessibilityTable.cpp', - '$WEBCORE_DIR/page/AccessibilityTableCell.cpp', - '$WEBCORE_DIR/page/AccessibilityTableColumn.cpp', - '$WEBCORE_DIR/page/AccessibilityTableHeaderContainer.cpp', - '$WEBCORE_DIR/page/AccessibilityTableRow.cpp', - '$WEBCORE_DIR/page/AXObjectCache.cpp', - '$WEBCORE_DIR/page/BarInfo.cpp', - '$WEBCORE_DIR/page/Chrome.cpp', - '$WEBCORE_DIR/page/Console.cpp', - '$WEBCORE_DIR/page/ContextMenuController.cpp', - '$WEBCORE_DIR/page/DOMSelection.cpp', - '$WEBCORE_DIR/page/DOMTimer.cpp', - '$WEBCORE_DIR/page/DOMWindow.cpp', - '$WEBCORE_DIR/page/DragController.cpp', - '$WEBCORE_DIR/page/EventHandler.cpp', - '$WEBCORE_DIR/page/FocusController.cpp', - '$WEBCORE_DIR/page/Frame.cpp', - '$WEBCORE_DIR/page/FrameTree.cpp', - '$WEBCORE_DIR/page/FrameView.cpp', - '$WEBCORE_DIR/page/Geolocation.cpp', - '$WEBCORE_DIR/page/History.cpp', - '$WEBCORE_DIR/page/Location.cpp', - '$WEBCORE_DIR/page/MouseEventWithHitTestResults.cpp', - '$WEBCORE_DIR/page/Navigator.cpp', - '$WEBCORE_DIR/page/NavigatorBase.cpp', - '$WEBCORE_DIR/page/Page.cpp', - '$WEBCORE_DIR/page/PageGroup.cpp', - '$WEBCORE_DIR/page/PrintContext.cpp', - '$WEBCORE_DIR/page/Screen.cpp', - '$WEBCORE_DIR/page/SecurityOrigin.cpp', - '$WEBCORE_DIR/page/Settings.cpp', - '$WEBCORE_DIR/page/WindowFeatures.cpp', - '$WEBCORE_DIR/page/WorkerNavigator.cpp', - - '$WEBCORE_DIR/page/animation/AnimationBase.cpp', - '$WEBCORE_DIR/page/animation/AnimationController.cpp', - '$WEBCORE_DIR/page/animation/CompositeAnimation.cpp', - '$WEBCORE_DIR/page/animation/ImplicitAnimation.cpp', - '$WEBCORE_DIR/page/animation/KeyframeAnimation.cpp', - - '$WEBCORE_DIR/page/chromium/AccessibilityObjectChromium.cpp', - '$WEBCORE_DIR/page/chromium/AXObjectCacheChromium.cpp', - '$WEBCORE_DIR/page/chromium/DragControllerChromium.cpp', - '$WEBCORE_DIR/page/chromium/EventHandlerChromium.cpp', - '$WEBCORE_DIR/page/chromium/FrameChromium.cpp', - - '$WEBCORE_DIR/platform/Arena.cpp', - '$WEBCORE_DIR/platform/ContentType.cpp', - '$WEBCORE_DIR/platform/ContextMenu.cpp', - '$WEBCORE_DIR/platform/CrossThreadCopier.cpp', - '$WEBCORE_DIR/platform/DeprecatedPtrListImpl.cpp', - '$WEBCORE_DIR/platform/DragData.cpp', - '$WEBCORE_DIR/platform/DragImage.cpp', - '$WEBCORE_DIR/platform/FileChooser.cpp', - '$WEBCORE_DIR/platform/GeolocationService.cpp', - '$WEBCORE_DIR/platform/KURLGoogle.cpp', - '$WEBCORE_DIR/platform/Length.cpp', - '$WEBCORE_DIR/platform/LinkHash.cpp', - '$WEBCORE_DIR/platform/Logging.cpp', - '$WEBCORE_DIR/platform/Scrollbar.cpp', - '$WEBCORE_DIR/platform/ScrollbarThemeComposite.cpp', - '$WEBCORE_DIR/platform/ScrollView.cpp', - '$WEBCORE_DIR/platform/SharedBuffer.cpp', - '$WEBCORE_DIR/platform/ThreadGlobalData.cpp', - '$WEBCORE_DIR/platform/ThreadTimers.cpp', - '$WEBCORE_DIR/platform/Timer.cpp', - '$WEBCORE_DIR/platform/Widget.cpp', - - '$WEBCORE_DIR/platform/animation/Animation.cpp', - '$WEBCORE_DIR/platform/animation/AnimationList.cpp', - - '$WEBCORE_DIR/platform/graphics/BitmapImage.cpp', - '$WEBCORE_DIR/platform/graphics/Color.cpp', - '$WEBCORE_DIR/platform/graphics/FloatPoint.cpp', - '$WEBCORE_DIR/platform/graphics/FloatPoint3D.cpp', - '$WEBCORE_DIR/platform/graphics/FloatQuad.cpp', - '$WEBCORE_DIR/platform/graphics/FloatRect.cpp', - '$WEBCORE_DIR/platform/graphics/FloatSize.cpp', - '$WEBCORE_DIR/platform/graphics/FontFastPath.cpp', - '$WEBCORE_DIR/platform/graphics/Font.cpp', - '$WEBCORE_DIR/platform/graphics/FontData.cpp', - '$WEBCORE_DIR/platform/graphics/FontFallbackList.cpp', - '$WEBCORE_DIR/platform/graphics/FontDescription.cpp', - '$WEBCORE_DIR/platform/graphics/FontFamily.cpp', - '$WEBCORE_DIR/platform/graphics/FontCache.cpp', - '$WEBCORE_DIR/platform/graphics/GeneratedImage.cpp', - '$WEBCORE_DIR/platform/graphics/GlyphPageTreeNode.cpp', - '$WEBCORE_DIR/platform/graphics/GlyphWidthMap.cpp', - '$WEBCORE_DIR/platform/graphics/Gradient.cpp', - '$WEBCORE_DIR/platform/graphics/GraphicsContext.cpp', - '$WEBCORE_DIR/platform/graphics/GraphicsTypes.cpp', - '$WEBCORE_DIR/platform/graphics/Image.cpp', - '$WEBCORE_DIR/platform/graphics/IntRect.cpp', - '$WEBCORE_DIR/platform/graphics/MediaPlayer.cpp', - '$WEBCORE_DIR/platform/graphics/Path.cpp', - '$WEBCORE_DIR/platform/graphics/PathTraversalState.cpp', - '$WEBCORE_DIR/platform/graphics/Pattern.cpp', - '$WEBCORE_DIR/platform/graphics/Pen.cpp', - '$WEBCORE_DIR/platform/graphics/SegmentedFontData.cpp', - '$WEBCORE_DIR/platform/graphics/SimpleFontData.cpp', - '$WEBCORE_DIR/platform/graphics/StringTruncator.cpp', - '$WEBCORE_DIR/platform/graphics/WidthIterator.cpp', - - '$WEBCORE_DIR/platform/chromium/ChromiumDataObject.cpp', - '$WEBCORE_DIR/platform/chromium/ClipboardChromium.cpp', - '$WEBCORE_DIR/platform/chromium/ClipboardUtilitiesChromium.cpp', - '$WEBCORE_DIR/platform/chromium/ContextMenuChromium.cpp', - '$WEBCORE_DIR/platform/chromium/ContextMenuItemChromium.cpp', - '$WEBCORE_DIR/platform/chromium/CursorChromium.cpp', - '$WEBCORE_DIR/platform/chromium/DragDataChromium.cpp', - '$WEBCORE_DIR/platform/chromium/DragImageChromium.cpp', - '$WEBCORE_DIR/platform/chromium/FileChooserChromium.cpp', - '$WEBCORE_DIR/platform/chromium/FileSystemChromium.cpp', - '$WEBCORE_DIR/platform/chromium/FramelessScrollView.cpp', - '$WEBCORE_DIR/platform/chromium/Language.cpp', - '$WEBCORE_DIR/platform/chromium/MimeTypeRegistryChromium.cpp', - '$WEBCORE_DIR/platform/chromium/PasteboardChromium.cpp', - '$WEBCORE_DIR/platform/chromium/PlatformKeyboardEventChromium.cpp', - '$WEBCORE_DIR/platform/chromium/PlatformScreenChromium.cpp', - '$WEBCORE_DIR/platform/chromium/PopupMenuChromium.cpp', - '$WEBCORE_DIR/platform/chromium/SearchPopupMenuChromium.cpp', - '$WEBCORE_DIR/platform/chromium/SharedTimerChromium.cpp', - '$WEBCORE_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp', - '$WEBCORE_DIR/platform/chromium/SystemTimeChromium.cpp', - '$WEBCORE_DIR/platform/chromium/TemporaryLinkStubs.cpp', - '$WEBCORE_DIR/platform/chromium/WidgetChromium.cpp', - '$WEBCORE_DIR/platform/chromium/ScrollbarThemeChromium.cpp', - - '$WEBCORE_DIR/platform/graphics/chromium/ColorChromium.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/FontCustomPlatformData.cpp', - - '$WEBCORE_DIR/platform/graphics/transforms/Matrix3DTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/MatrixTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/PerspectiveTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/RotateTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/ScaleTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/SkewTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/TransformOperations.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/TranslateTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/TransformationMatrix.cpp', - - '$WEBCORE_DIR/platform/graphics/skia/FloatPointSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/FloatRectSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/GradientSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/GraphicsContextSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/ImageBufferSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/ImageSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/ImageSourceSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/IntPointSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/IntRectSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/NativeImageSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/PathSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/PatternSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/PlatformContextSkia.cpp', - '$WEBCORE_DIR/platform/graphics/skia/SkiaUtils.cpp', - '$WEBCORE_DIR/platform/graphics/skia/TransformationMatrixSkia.cpp', - - '$WEBCORE_DIR/platform/image-decoders/skia/BMPImageDecoder.cpp', - '$WEBCORE_DIR/platform/image-decoders/skia/BMPImageReader.cpp', - '$WEBCORE_DIR/platform/image-decoders/skia/GIFImageDecoder.cpp', - '$WEBCORE_DIR/platform/image-decoders/skia/GIFImageReader.cpp', - '$WEBCORE_DIR/platform/image-decoders/skia/ICOImageDecoder.cpp', - '$WEBCORE_DIR/platform/image-decoders/skia/JPEGImageDecoder.cpp', - '$WEBCORE_DIR/platform/image-decoders/skia/PNGImageDecoder.cpp', - '$WEBCORE_DIR/platform/image-decoders/skia/XBMImageDecoder.cpp', - - '$WEBCORE_DIR/platform/image-encoders/skia/PNGImageEncoder.cpp', - - '$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp', - '$WEBCORE_DIR/platform/network/Credential.cpp', - '$WEBCORE_DIR/platform/network/FormData.cpp', - '$WEBCORE_DIR/platform/network/FormDataBuilder.cpp', - '$WEBCORE_DIR/platform/network/HTTPHeaderMap.cpp', - '$WEBCORE_DIR/platform/network/HTTPParsers.cpp', - '$WEBCORE_DIR/platform/network/NetworkStateNotifier.cpp', - '$WEBCORE_DIR/platform/network/ProtectionSpace.cpp', - '$WEBCORE_DIR/platform/network/ResourceErrorBase.cpp', - #'$WEBCORE_DIR/platform/network/ResourceHandle.cpp', - '$WEBCORE_DIR/platform/network/ResourceRequestBase.cpp', - '$WEBCORE_DIR/platform/network/ResourceResponseBase.cpp', - - '$WEBCORE_DIR/platform/network/chromium/AuthenticationChallengeChromium.cpp', - '$WEBCORE_DIR/platform/network/chromium/CookieJarChromium.cpp', - '$WEBCORE_DIR/platform/network/chromium/DNSChromium.cpp', - '$WEBCORE_DIR/platform/network/chromium/NetworkStateNotifierChromium.cpp', - - '$WEBCORE_DIR/platform/sql/SQLiteAuthorizer.cpp', - '$WEBCORE_DIR/platform/sql/SQLiteDatabase.cpp', - '$WEBCORE_DIR/platform/sql/SQLiteStatement.cpp', - '$WEBCORE_DIR/platform/sql/SQLiteTransaction.cpp', - '$WEBCORE_DIR/platform/sql/SQLValue.cpp', - - '$WEBCORE_DIR/platform/text/AtomicString.cpp', - '$WEBCORE_DIR/platform/text/Base64.cpp', - '$WEBCORE_DIR/platform/text/BidiContext.cpp', - '$WEBCORE_DIR/platform/text/CString.cpp', - '$WEBCORE_DIR/platform/text/RegularExpression.cpp', - '$WEBCORE_DIR/platform/text/SegmentedString.cpp', - '$WEBCORE_DIR/platform/text/String.cpp', - '$WEBCORE_DIR/platform/text/StringBuilder.cpp', - '$WEBCORE_DIR/platform/text/StringImpl.cpp', - '$WEBCORE_DIR/platform/text/TextBoundariesICU.cpp', - '$WEBCORE_DIR/platform/text/TextBreakIteratorICU.cpp', - '$WEBCORE_DIR/platform/text/TextCodec.cpp', - '$WEBCORE_DIR/platform/text/TextCodecICU.cpp', - '$WEBCORE_DIR/platform/text/TextCodecLatin1.cpp', - '$WEBCORE_DIR/platform/text/TextCodecUserDefined.cpp', - '$WEBCORE_DIR/platform/text/TextCodecUTF16.cpp', - '$WEBCORE_DIR/platform/text/TextEncoding.cpp', - '$WEBCORE_DIR/platform/text/TextEncodingDetectorICU.cpp', - '$WEBCORE_DIR/platform/text/TextEncodingRegistry.cpp', - '$WEBCORE_DIR/platform/text/TextStream.cpp', - '$WEBCORE_DIR/platform/text/UnicodeRange.cpp', - - '$WEBCORE_DIR/platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp', - - '$WEBCORE_DIR/plugins/MimeType.cpp', - '$WEBCORE_DIR/plugins/MimeTypeArray.cpp', - '$WEBCORE_DIR/plugins/Plugin.cpp', - '$WEBCORE_DIR/plugins/PluginArray.cpp', - '$WEBCORE_DIR/plugins/PluginData.cpp', - - '$WEBCORE_DIR/plugins/chromium/PluginDataChromium.cpp', - - '$WEBCORE_DIR/rendering/AutoTableLayout.cpp', - '$WEBCORE_DIR/rendering/bidi.cpp', - '$WEBCORE_DIR/rendering/break_lines.cpp', - '$WEBCORE_DIR/rendering/CounterNode.cpp', - '$WEBCORE_DIR/rendering/EllipsisBox.cpp', - '$WEBCORE_DIR/rendering/FixedTableLayout.cpp', - '$WEBCORE_DIR/rendering/HitTestResult.cpp', - '$WEBCORE_DIR/rendering/InlineBox.cpp', - '$WEBCORE_DIR/rendering/InlineFlowBox.cpp', - '$WEBCORE_DIR/rendering/InlineTextBox.cpp', - '$WEBCORE_DIR/rendering/LayoutState.cpp', - '$WEBCORE_DIR/rendering/ListMarkerBox.cpp', - '$WEBCORE_DIR/rendering/MediaControlElements.cpp', - '$WEBCORE_DIR/rendering/PointerEventsHitRules.cpp', - '$WEBCORE_DIR/rendering/RenderApplet.cpp', - '$WEBCORE_DIR/rendering/RenderArena.cpp', - '$WEBCORE_DIR/rendering/RenderBlock.cpp', - '$WEBCORE_DIR/rendering/RenderBox.cpp', - '$WEBCORE_DIR/rendering/RenderBoxModelObject.cpp', - '$WEBCORE_DIR/rendering/RenderBR.cpp', - '$WEBCORE_DIR/rendering/RenderButton.cpp', - '$WEBCORE_DIR/rendering/RenderCounter.cpp', - '$WEBCORE_DIR/rendering/RenderFieldset.cpp', - '$WEBCORE_DIR/rendering/RenderFileUploadControl.cpp', - '$WEBCORE_DIR/rendering/RenderFlexibleBox.cpp', - '$WEBCORE_DIR/rendering/RenderForeignObject.cpp', - '$WEBCORE_DIR/rendering/RenderFrame.cpp', - '$WEBCORE_DIR/rendering/RenderFrameSet.cpp', - '$WEBCORE_DIR/rendering/RenderHTMLCanvas.cpp', - '$WEBCORE_DIR/rendering/RenderImage.cpp', - '$WEBCORE_DIR/rendering/RenderImageGeneratedContent.cpp', - '$WEBCORE_DIR/rendering/RenderInline.cpp', - '$WEBCORE_DIR/rendering/RenderLayer.cpp', - '$WEBCORE_DIR/rendering/RenderLineBoxList.cpp', - '$WEBCORE_DIR/rendering/RenderListBox.cpp', - '$WEBCORE_DIR/rendering/RenderListItem.cpp', - '$WEBCORE_DIR/rendering/RenderListMarker.cpp', - '$WEBCORE_DIR/rendering/RenderMarquee.cpp', - '$WEBCORE_DIR/rendering/RenderMedia.cpp', - '$WEBCORE_DIR/rendering/RenderMenuList.cpp', - '$WEBCORE_DIR/rendering/RenderObject.cpp', - '$WEBCORE_DIR/rendering/RenderObjectChildList.cpp', - '$WEBCORE_DIR/rendering/RenderPart.cpp', - '$WEBCORE_DIR/rendering/RenderPartObject.cpp', - '$WEBCORE_DIR/rendering/RenderPath.cpp', - '$WEBCORE_DIR/rendering/RenderReplaced.cpp', - '$WEBCORE_DIR/rendering/RenderReplica.cpp', - '$WEBCORE_DIR/rendering/RenderScrollbar.cpp', - '$WEBCORE_DIR/rendering/RenderScrollbarPart.cpp', - '$WEBCORE_DIR/rendering/RenderScrollbarTheme.cpp', - '$WEBCORE_DIR/rendering/RenderSlider.cpp', - '$WEBCORE_DIR/rendering/RenderSVGBlock.cpp', - '$WEBCORE_DIR/rendering/RenderSVGContainer.cpp', - '$WEBCORE_DIR/rendering/RenderSVGGradientStop.cpp', - '$WEBCORE_DIR/rendering/RenderSVGHiddenContainer.cpp', - '$WEBCORE_DIR/rendering/RenderSVGImage.cpp', - '$WEBCORE_DIR/rendering/RenderSVGInline.cpp', - '$WEBCORE_DIR/rendering/RenderSVGInlineText.cpp', - '$WEBCORE_DIR/rendering/RenderSVGRoot.cpp', - '$WEBCORE_DIR/rendering/RenderSVGText.cpp', - '$WEBCORE_DIR/rendering/RenderSVGTextPath.cpp', - '$WEBCORE_DIR/rendering/RenderSVGTransformableContainer.cpp', - '$WEBCORE_DIR/rendering/RenderSVGTSpan.cpp', - '$WEBCORE_DIR/rendering/RenderSVGViewportContainer.cpp', - '$WEBCORE_DIR/rendering/RenderTable.cpp', - '$WEBCORE_DIR/rendering/RenderTableCell.cpp', - '$WEBCORE_DIR/rendering/RenderTableCol.cpp', - '$WEBCORE_DIR/rendering/RenderTableRow.cpp', - '$WEBCORE_DIR/rendering/RenderTableSection.cpp', - '$WEBCORE_DIR/rendering/RenderText.cpp', - '$WEBCORE_DIR/rendering/RenderTextControl.cpp', - '$WEBCORE_DIR/rendering/RenderTextControlMultiLine.cpp', - '$WEBCORE_DIR/rendering/RenderTextControlSingleLine.cpp', - '$WEBCORE_DIR/rendering/RenderTextFragment.cpp', - '$WEBCORE_DIR/rendering/RenderTheme.cpp', - '$WEBCORE_DIR/rendering/RenderTreeAsText.cpp', - '$WEBCORE_DIR/rendering/RenderVideo.cpp', - '$WEBCORE_DIR/rendering/RenderView.cpp', - '$WEBCORE_DIR/rendering/RenderWidget.cpp', - '$WEBCORE_DIR/rendering/RenderWordBreak.cpp', - '$WEBCORE_DIR/rendering/RootInlineBox.cpp', - '$WEBCORE_DIR/rendering/ScrollBehavior.cpp', - '$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp', - '$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp', - '$WEBCORE_DIR/rendering/SVGInlineTextBox.cpp', - '$WEBCORE_DIR/rendering/SVGRenderSupport.cpp', - '$WEBCORE_DIR/rendering/SVGRenderTreeAsText.cpp', - '$WEBCORE_DIR/rendering/SVGRootInlineBox.cpp', - '$WEBCORE_DIR/rendering/TextControlInnerElements.cpp', - '$WEBCORE_DIR/rendering/TransformState.cpp', - - '$WEBCORE_DIR/rendering/style/BindingURI.cpp', - '$WEBCORE_DIR/rendering/style/ContentData.cpp', - '$WEBCORE_DIR/rendering/style/CounterDirectives.cpp', - '$WEBCORE_DIR/rendering/style/FillLayer.cpp', - '$WEBCORE_DIR/rendering/style/KeyframeList.cpp', - '$WEBCORE_DIR/rendering/style/NinePieceImage.cpp', - '$WEBCORE_DIR/rendering/style/RenderStyle.cpp', - '$WEBCORE_DIR/rendering/style/ShadowData.cpp', - '$WEBCORE_DIR/rendering/style/StyleBackgroundData.cpp', - '$WEBCORE_DIR/rendering/style/StyleBoxData.cpp', - '$WEBCORE_DIR/rendering/style/StyleCachedImage.cpp', - '$WEBCORE_DIR/rendering/style/StyleFlexibleBoxData.cpp', - '$WEBCORE_DIR/rendering/style/StyleGeneratedImage.cpp', - '$WEBCORE_DIR/rendering/style/StyleInheritedData.cpp', - '$WEBCORE_DIR/rendering/style/StyleMarqueeData.cpp', - '$WEBCORE_DIR/rendering/style/StyleMultiColData.cpp', - '$WEBCORE_DIR/rendering/style/StyleRareInheritedData.cpp', - '$WEBCORE_DIR/rendering/style/StyleRareNonInheritedData.cpp', - '$WEBCORE_DIR/rendering/style/StyleSurroundData.cpp', - '$WEBCORE_DIR/rendering/style/StyleTransformData.cpp', - '$WEBCORE_DIR/rendering/style/StyleVisualData.cpp', - '$WEBCORE_DIR/rendering/style/SVGRenderStyle.cpp', - '$WEBCORE_DIR/rendering/style/SVGRenderStyleDefs.cpp', - - '$WEBCORE_DIR/storage/ChangeVersionWrapper.cpp', - '$WEBCORE_DIR/storage/Database.cpp', - '$WEBCORE_DIR/storage/DatabaseAuthorizer.cpp', - '$WEBCORE_DIR/storage/DatabaseTask.cpp', - '$WEBCORE_DIR/storage/DatabaseThread.cpp', - '$WEBCORE_DIR/storage/DatabaseTracker.cpp', - '$WEBCORE_DIR/storage/OriginQuotaManager.cpp', - '$WEBCORE_DIR/storage/OriginUsageRecord.cpp', - '$WEBCORE_DIR/storage/SQLResultSet.cpp', - '$WEBCORE_DIR/storage/SQLResultSetRowList.cpp', - '$WEBCORE_DIR/storage/SQLStatement.cpp', - '$WEBCORE_DIR/storage/SQLTransaction.cpp', - - '$WEBCORE_DIR/svg/ColorDistance.cpp', - '$WEBCORE_DIR/svg/Filter.cpp', - '$WEBCORE_DIR/svg/FilterEffect.cpp', - '$WEBCORE_DIR/svg/SVGAElement.cpp', - '$WEBCORE_DIR/svg/SVGAltGlyphElement.cpp', - '$WEBCORE_DIR/svg/SVGAngle.cpp', - '$WEBCORE_DIR/svg/SVGAnimateColorElement.cpp', - '$WEBCORE_DIR/svg/SVGAnimatedPathData.cpp', - '$WEBCORE_DIR/svg/SVGAnimatedPoints.cpp', - '$WEBCORE_DIR/svg/SVGAnimateElement.cpp', - '$WEBCORE_DIR/svg/SVGAnimateMotionElement.cpp', - '$WEBCORE_DIR/svg/SVGAnimateTransformElement.cpp', - '$WEBCORE_DIR/svg/SVGAnimationElement.cpp', - '$WEBCORE_DIR/svg/SVGCircleElement.cpp', - '$WEBCORE_DIR/svg/SVGClipPathElement.cpp', - '$WEBCORE_DIR/svg/SVGColor.cpp', - '$WEBCORE_DIR/svg/SVGComponentTransferFunctionElement.cpp', - '$WEBCORE_DIR/svg/SVGCursorElement.cpp', - '$WEBCORE_DIR/svg/SVGDefinitionSrcElement.cpp', - '$WEBCORE_DIR/svg/SVGDefsElement.cpp', - '$WEBCORE_DIR/svg/SVGDescElement.cpp', - '$WEBCORE_DIR/svg/SVGDocument.cpp', - '$WEBCORE_DIR/svg/SVGDocumentExtensions.cpp', - '$WEBCORE_DIR/svg/SVGElement.cpp', - '$WEBCORE_DIR/svg/SVGElementInstance.cpp', - '$WEBCORE_DIR/svg/SVGElementInstanceList.cpp', - '$WEBCORE_DIR/svg/SVGEllipseElement.cpp', - '$WEBCORE_DIR/svg/SVGExternalResourcesRequired.cpp', - '$WEBCORE_DIR/svg/SVGFEBlendElement.cpp', - '$WEBCORE_DIR/svg/SVGFEColorMatrixElement.cpp', - '$WEBCORE_DIR/svg/SVGFEComponentTransferElement.cpp', - '$WEBCORE_DIR/svg/SVGFECompositeElement.cpp', - '$WEBCORE_DIR/svg/SVGFEDiffuseLightingElement.cpp', - '$WEBCORE_DIR/svg/SVGFEDisplacementMapElement.cpp', - '$WEBCORE_DIR/svg/SVGFEDistantLightElement.cpp', - '$WEBCORE_DIR/svg/SVGFEFloodElement.cpp', - '$WEBCORE_DIR/svg/SVGFEFuncAElement.cpp', - '$WEBCORE_DIR/svg/SVGFEFuncBElement.cpp', - '$WEBCORE_DIR/svg/SVGFEFuncGElement.cpp', - '$WEBCORE_DIR/svg/SVGFEFuncRElement.cpp', - '$WEBCORE_DIR/svg/SVGFEGaussianBlurElement.cpp', - '$WEBCORE_DIR/svg/SVGFEImageElement.cpp', - '$WEBCORE_DIR/svg/SVGFELightElement.cpp', - '$WEBCORE_DIR/svg/SVGFEMergeElement.cpp', - '$WEBCORE_DIR/svg/SVGFEMergeNodeElement.cpp', - '$WEBCORE_DIR/svg/SVGFEOffsetElement.cpp', - '$WEBCORE_DIR/svg/SVGFEPointLightElement.cpp', - '$WEBCORE_DIR/svg/SVGFESpecularLightingElement.cpp', - '$WEBCORE_DIR/svg/SVGFESpotLightElement.cpp', - '$WEBCORE_DIR/svg/SVGFETileElement.cpp', - '$WEBCORE_DIR/svg/SVGFETurbulenceElement.cpp', - '$WEBCORE_DIR/svg/SVGFilterElement.cpp', - '$WEBCORE_DIR/svg/SVGFilterPrimitiveStandardAttributes.cpp', - '$WEBCORE_DIR/svg/SVGFitToViewBox.cpp', - '$WEBCORE_DIR/svg/SVGFont.cpp', - '$WEBCORE_DIR/svg/SVGFontData.cpp', - '$WEBCORE_DIR/svg/SVGFontElement.cpp', - '$WEBCORE_DIR/svg/SVGFontFaceElement.cpp', - '$WEBCORE_DIR/svg/SVGFontFaceFormatElement.cpp', - '$WEBCORE_DIR/svg/SVGFontFaceNameElement.cpp', - '$WEBCORE_DIR/svg/SVGFontFaceSrcElement.cpp', - '$WEBCORE_DIR/svg/SVGFontFaceUriElement.cpp', - '$WEBCORE_DIR/svg/SVGForeignObjectElement.cpp', - '$WEBCORE_DIR/svg/SVGGElement.cpp', - '$WEBCORE_DIR/svg/SVGGlyphElement.cpp', - '$WEBCORE_DIR/svg/SVGGradientElement.cpp', - '$WEBCORE_DIR/svg/SVGHKernElement.cpp', - '$WEBCORE_DIR/svg/SVGImageElement.cpp', - '$WEBCORE_DIR/svg/SVGImageLoader.cpp', - '$WEBCORE_DIR/svg/SVGLangSpace.cpp', - '$WEBCORE_DIR/svg/SVGLength.cpp', - '$WEBCORE_DIR/svg/SVGLengthList.cpp', - '$WEBCORE_DIR/svg/SVGLinearGradientElement.cpp', - '$WEBCORE_DIR/svg/SVGLineElement.cpp', - '$WEBCORE_DIR/svg/SVGLocatable.cpp', - '$WEBCORE_DIR/svg/SVGMarkerElement.cpp', - '$WEBCORE_DIR/svg/SVGMaskElement.cpp', - '$WEBCORE_DIR/svg/SVGMetadataElement.cpp', - '$WEBCORE_DIR/svg/SVGMissingGlyphElement.cpp', - '$WEBCORE_DIR/svg/SVGMPathElement.cpp', - '$WEBCORE_DIR/svg/SVGNumberList.cpp', - '$WEBCORE_DIR/svg/SVGPaint.cpp', - '$WEBCORE_DIR/svg/SVGParserUtilities.cpp', - '$WEBCORE_DIR/svg/SVGPathElement.cpp', - '$WEBCORE_DIR/svg/SVGPathSegArc.cpp', - '$WEBCORE_DIR/svg/SVGPathSegClosePath.cpp', - '$WEBCORE_DIR/svg/SVGPathSegCurvetoCubic.cpp', - '$WEBCORE_DIR/svg/SVGPathSegCurvetoCubicSmooth.cpp', - '$WEBCORE_DIR/svg/SVGPathSegCurvetoQuadratic.cpp', - '$WEBCORE_DIR/svg/SVGPathSegCurvetoQuadraticSmooth.cpp', - '$WEBCORE_DIR/svg/SVGPathSegLineto.cpp', - '$WEBCORE_DIR/svg/SVGPathSegLinetoHorizontal.cpp', - '$WEBCORE_DIR/svg/SVGPathSegLinetoVertical.cpp', - '$WEBCORE_DIR/svg/SVGPathSegList.cpp', - '$WEBCORE_DIR/svg/SVGPathSegMoveto.cpp', - '$WEBCORE_DIR/svg/SVGPatternElement.cpp', - '$WEBCORE_DIR/svg/SVGPointList.cpp', - '$WEBCORE_DIR/svg/SVGPolyElement.cpp', - '$WEBCORE_DIR/svg/SVGPolygonElement.cpp', - '$WEBCORE_DIR/svg/SVGPolylineElement.cpp', - '$WEBCORE_DIR/svg/SVGPreserveAspectRatio.cpp', - '$WEBCORE_DIR/svg/SVGRadialGradientElement.cpp', - '$WEBCORE_DIR/svg/SVGRectElement.cpp', - '$WEBCORE_DIR/svg/SVGScriptElement.cpp', - '$WEBCORE_DIR/svg/SVGSetElement.cpp', - '$WEBCORE_DIR/svg/SVGStopElement.cpp', - '$WEBCORE_DIR/svg/SVGStringList.cpp', - '$WEBCORE_DIR/svg/SVGStylable.cpp', - '$WEBCORE_DIR/svg/SVGStyledElement.cpp', - '$WEBCORE_DIR/svg/SVGStyledLocatableElement.cpp', - '$WEBCORE_DIR/svg/SVGStyledTransformableElement.cpp', - '$WEBCORE_DIR/svg/SVGStyleElement.cpp', - '$WEBCORE_DIR/svg/SVGSVGElement.cpp', - '$WEBCORE_DIR/svg/SVGSwitchElement.cpp', - '$WEBCORE_DIR/svg/SVGSymbolElement.cpp', - '$WEBCORE_DIR/svg/SVGTests.cpp', - '$WEBCORE_DIR/svg/SVGTextContentElement.cpp', - '$WEBCORE_DIR/svg/SVGTextElement.cpp', - '$WEBCORE_DIR/svg/SVGTextPathElement.cpp', - '$WEBCORE_DIR/svg/SVGTextPositioningElement.cpp', - '$WEBCORE_DIR/svg/SVGTitleElement.cpp', - '$WEBCORE_DIR/svg/SVGTransform.cpp', - '$WEBCORE_DIR/svg/SVGTransformable.cpp', - '$WEBCORE_DIR/svg/SVGTransformDistance.cpp', - '$WEBCORE_DIR/svg/SVGTransformList.cpp', - '$WEBCORE_DIR/svg/SVGTRefElement.cpp', - '$WEBCORE_DIR/svg/SVGTSpanElement.cpp', - '$WEBCORE_DIR/svg/SVGURIReference.cpp', - '$WEBCORE_DIR/svg/SVGUseElement.cpp', - '$WEBCORE_DIR/svg/SVGViewElement.cpp', - '$WEBCORE_DIR/svg/SVGViewSpec.cpp', - '$WEBCORE_DIR/svg/SVGZoomAndPan.cpp', - '$WEBCORE_DIR/svg/SVGZoomEvent.cpp', - - '$WEBCORE_DIR/svg/animation/SMILTime.cpp', - '$WEBCORE_DIR/svg/animation/SMILTimeContainer.cpp', - '$WEBCORE_DIR/svg/animation/SVGSMILElement.cpp', - - '$WEBCORE_DIR/svg/graphics/SVGImage.cpp', - '$WEBCORE_DIR/svg/graphics/SVGPaintServer.cpp', - '$WEBCORE_DIR/svg/graphics/SVGPaintServerGradient.cpp', - '$WEBCORE_DIR/svg/graphics/SVGPaintServerLinearGradient.cpp', - '$WEBCORE_DIR/svg/graphics/SVGPaintServerPattern.cpp', - '$WEBCORE_DIR/svg/graphics/SVGPaintServerRadialGradient.cpp', - '$WEBCORE_DIR/svg/graphics/SVGPaintServerSolid.cpp', - '$WEBCORE_DIR/svg/graphics/SVGResource.cpp', - '$WEBCORE_DIR/svg/graphics/SVGResourceClipper.cpp', - '$WEBCORE_DIR/svg/graphics/SVGResourceFilter.cpp', - '$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp', - '$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp', - - '$WEBCORE_DIR/svg/graphics/skia/SVGResourceFilterSkia.cpp', - - '$WEBCORE_DIR/workers/Worker.cpp', - '$WEBCORE_DIR/workers/WorkerContext.cpp', - '$WEBCORE_DIR/workers/WorkerImportScriptsClient.cpp', - '$WEBCORE_DIR/workers/WorkerLocation.cpp', - '$WEBCORE_DIR/workers/WorkerMessagingProxy.cpp', - '$WEBCORE_DIR/workers/WorkerRunLoop.cpp', - '$WEBCORE_DIR/workers/WorkerThread.cpp', - - '$WEBCORE_DIR/xml/DOMParser.cpp', - '$WEBCORE_DIR/xml/NativeXPathNSResolver.cpp', - '$WEBCORE_DIR/xml/XMLHttpRequest.cpp', - '$WEBCORE_DIR/xml/XMLHttpRequestUpload.cpp', - '$WEBCORE_DIR/xml/XMLSerializer.cpp', - '$WEBCORE_DIR/xml/XPathEvaluator.cpp', - '$WEBCORE_DIR/xml/XPathExpression.cpp', - '$WEBCORE_DIR/xml/XPathExpressionNode.cpp', - '$WEBCORE_DIR/xml/XPathFunctions.cpp', - '$WEBCORE_DIR/xml/XPathNamespace.cpp', - '$WEBCORE_DIR/xml/XPathNodeSet.cpp', - '$WEBCORE_DIR/xml/XPathNSResolver.cpp', - '$WEBCORE_DIR/xml/XPathParser.cpp', - '$WEBCORE_DIR/xml/XPathPath.cpp', - '$WEBCORE_DIR/xml/XPathPredicate.cpp', - '$WEBCORE_DIR/xml/XPathResult.cpp', - '$WEBCORE_DIR/xml/XPathStep.cpp', - '$WEBCORE_DIR/xml/XPathUtil.cpp', - '$WEBCORE_DIR/xml/XPathValue.cpp', - '$WEBCORE_DIR/xml/XPathVariableReference.cpp', - '$WEBCORE_DIR/xml/XSLImportRule.cpp', - '$WEBCORE_DIR/xml/XSLStyleSheet.cpp', - '$WEBCORE_DIR/xml/XSLTExtensions.cpp', - '$WEBCORE_DIR/xml/XSLTProcessor.cpp', - '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp', -] - -if env.Bit('windows'): - # Windows specific implementations. - input_files.extend([ - '$WEBCORE_DIR/platform/chromium/FileSystemChromiumWin.cpp', - '$WEBCORE_DIR/platform/chromium/ScrollBarThemeChromiumWin.cpp', - '$WEBCORE_DIR/platform/chromium/SoundChromiumWin.cpp', - '$WEBCORE_DIR/platform/chromium/WindowsVersion.cpp', - - '$WEBCORE_DIR/platform/chromium/ClipboardChromiumWin.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/FontCacheChromiumWin.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/FontUtilsChromiumWin.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/FontChromiumWin.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/IconChromiumWin.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/SimpleFontDataChromiumWin.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/ThemeHelperChromiumWin.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelper.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelperTextRun.cpp', - '$WEBCORE_DIR/platform/graphics/opentype/OpenTypeUtilities.cpp', - '$WEBCORE_DIR/platform/graphics/skia/SkiaFontWin.cpp', - - '$WEBCORE_DIR/rendering/RenderThemeChromiumWin.cpp', - ]) - -if env.Bit('linux'): - # Linux specific implementations. - input_files.extend([ - '$WEBCORE_DIR/platform/chromium/FileSystemChromiumLinux.cpp', - '$WEBCORE_DIR/platform/chromium/KeyCodeConversionGtk.cpp', - '$WEBCORE_DIR/platform/chromium/ScrollbarThemeChromiumLinux.cpp', - '$WEBCORE_DIR/platform/chromium/SoundChromiumPosix.cpp', - - '$WEBCORE_DIR/platform/chromium/ClipboardChromiumLinux.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/FontCacheLinux.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/FontLinux.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/FontPlatformDataLinux.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/IconChromiumLinux.cpp', - '$WEBCORE_DIR/platform/graphics/chromium/SimpleFontDataLinux.cpp', - - '$WEBCORE_DIR/rendering/RenderThemeChromiumLinux.cpp', - ]) - # Remove from the list files that haven't yet been made portable to Linux. - to_be_ported_files = [ - '$WEBCORE_DIR/platform/graphics/chromium/FontCustomPlatformData.cpp', - ] - input_files = list(set(input_files) - set(to_be_ported_files)) - -# These files don't compile yet on linux or mac. -if env.Bit('mac'): - remove_files = [ - # includes platform specific FontCustomPlatformData.h - '$WEBCORE_DIR/css/CSSFontFaceSource.cpp', - '$WEBCORE_DIR/loader/CachedFont.cpp', - ] - input_files = list(set(input_files) - set(remove_files)) - -# These files don't compile on the mac -if env.Bit('mac'): - remove_files = [ - # Missing WebCore::FrameView::printPanScrollIcon - '$WEBCORE_DIR/page/EventHandler.cpp', - '$WEBCORE_DIR/page/chromium/AXObjectCacheChromium.cpp', - '$WEBCORE_DIR/page/chromium/EventHandlerChromium.cpp', - ] - for remove in remove_files: - input_files.remove(remove) - -# Precompiled headers only work under MSVC in scons. -if env.Bit('windows'): - env_p = env.Clone() - env_p.Append(CCFLAGS='/Ylwebcore') - pch, obj = env_p.PCH('$OBJ_ROOT/webkit/build/precompiled_webkit.cc') - env['PCH'] = pch - env['PCHSTOP'] = 'precompiled_webkit.h' - env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h']) - input_files += [obj] - -env.ChromeLibrary('WebCore', input_files) - -env.ChromeMSVSProject('$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - dependencies = [ - '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', - '$LIBXML_DIR/build/libxml_config.vcproj', - '$LIBXSLT_DIR/build/libxslt_config.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - ], - guid='{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}') diff --git a/webkit/build/WebKit/SConscript b/webkit/build/WebKit/SConscript deleted file mode 100644 index fe82687..0000000 --- a/webkit/build/WebKit/SConscript +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2009 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. - -Import('env') - -env = env.Clone() - -env.Append( - CPPDEFINES = [ - 'WEBKIT_IMPLEMENTATION', - ], - CPPPATH = [ - '$WEBKIT_DIR/build/WebCore', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/public', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/public/gtk', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src', - ] -) - -input_files = [ - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumBridge.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumCurrentTime.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumThreading.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebCache.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebCString.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebImageSkia.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebInputEvent.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebKit.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebString.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebURL.cpp', - '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/gtk/WebInputEventFactory.cpp', -] - -env.ChromeLibrary('WebKit', input_files) diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript deleted file mode 100644 index 0b41874..0000000 --- a/webkit/build/port/SConscript +++ /dev/null @@ -1,664 +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. - -import os.path -import re - -Import('env') - -webcore = env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore') -webcore_posix = webcore.abspath.replace('\\', '/') - -cygwin = env.Dir('$CYGWIN_DIR/bin') -cygwin_posix = cygwin.abspath.replace('\\', '/') - -pending = env.Dir('$CHROME_SRC_DIR/webkit/pending') -portroot = env.Dir('$CHROME_SRC_DIR/webkit/port') -webkit_build = env.Dir('$CHROME_SRC_DIR/webkit/build') - - -def PosixIncludes(env, prefix, files, suffix): - # This is basically a custom version of the _concat() function, - # which we need because the binding script needs posix style paths, - # even on windows, and _concat() doesn't make that easy to do... :-( - # - # Note that because we're not using the RDirs function that the - # normal _concat() call uses, this will only add the build - # directory paths, not the paths in the underlying source directory, - # to its list. - posix_files = [str(env.Dir(f).abspath).replace('\\', '/') for f in files] - combined = [prefix + f + suffix for f in posix_files] - return ' '.join(combined) - - -env = env.Clone( - WEBCORE = webcore, - PENDING = pending, - PORTROOT = portroot, - WEBKIT_BUILD = webkit_build, - - BINDINGS_SCRIPTS_DIR = '$WEBKIT_DIR/port/bindings/scripts', - BINDINGS_SCRIPT = '$BINDINGS_SCRIPTS_DIR/generate-bindings.pl', - - PERL_INCLUDE_PATH = ['$BINDINGS_SCRIPTS_DIR', - '$CHROME_SRC_DIR/third_party/WebKit/WebCore/bindings/scripts'], - - FEATURE_DEFINES = [ - 'ENABLE_CROSS_DOCUMENT_MESSAGING', - 'ENABLE_XSLT', - 'ENABLE_XPATH', - 'ENABLE_SVG', - 'ENABLE_SVG_ANIMATION', - 'ENABLE_SVG_AS_IMAGE', - 'ENABLE_SVG_FONTS', - 'ENABLE_SVG_FOREIGN_OBJECT', - 'ENABLE_SVG_USE', - ], - - SVG_FLAGS = [ - 'ENABLE_SVG_ANIMATION=1', - 'ENABLE_SVG_AS_IMAGE=1', - 'ENABLE_SVG_FONTS=1', - 'ENABLE_SVG_FOREIGN_OBJECT=1', - 'ENABLE_SVG_USE=1', - ], - - BINDINGS_INCLUDE_PATH = [ - '$PENDING', - '$WEBCORE/css', - '$WEBCORE/dom', - '$WEBCORE/html', - '$WEBCORE/page', - '$WEBCORE/svg', - '$WEBCORE/xml', - ], - BINDINGS_INCLUDE_FLAG = '--include ', - BINDINGS_INCLUDE_SUFFIX = '', - _posix_includes = PosixIncludes, - _BINDINGS_INCLUDE_FLAGS = '${_posix_includes(__env__, ' + \ - 'BINDINGS_INCLUDE_FLAG, ' + \ - 'BINDINGS_INCLUDE_PATH, ' + \ - 'BINDINGS_INCLUDE_SUFFIX)}', -) - -env.PrependENVPath('PATH', cygwin_posix) - - -# When we haven't specified --verbose (aka brief_comstr), make the -# WebKit bindings building step output more brief to match the brief -# compile/link/etc. lines. -if env.GetOption('brief_comstr'): - env.SetDefault(BINDINGSCOMSTR='________Building bindings in $TARGET') - -bindings_perl_modules = env.Glob('$BINDINGS_SCRIPTS_DIR/*.pm') - -def BindingsEmitter(target, source, env): - source.append('$BINDINGS_SCRIPT') - try: - idl_contents = open(source[0].rfile().abspath, 'r').read() - except EnvironmentError: - return target, source - idl_contents = re.sub('//[^\\n]*\\n', '', idl_contents) - interfaces = re.findall('interface\\s*(?:\\[[^]]+\\])?\\s*' - '(\\w+)[^{]*[{]', idl_contents) - new_target = [] - for i in interfaces: - new_cpp = '$DERIVED_DIR/${BINDINGSPREFIX}' + i + '.cpp' - new_h = '$DERIVED_DIR/${BINDINGSPREFIX}' + i + '.h' - new_target.extend([new_cpp, new_h]) - env.Depends(new_cpp, bindings_perl_modules) - env.Depends(new_h, bindings_perl_modules) - return new_target, source - -env.Append( - BUILDERS = {'Bindings': Builder( - action = Action('$BINDINGSCOM', '$BINDINGSCOMSTR'), - src_suffix = '.idl', - emitter = BindingsEmitter, - )}, -) - -env.Replace( - # TODO(bradnelson): fix ugly hack with one include! - BINDINGSCOM = '$PERL $_PERL_INCLUDE_FLAGS ' + \ - '${SOURCES[1].posix} ' + \ - '--defines "$FEATURE_DEFINES $BINDINGS_LANGUAGE" ' + \ - '--generator $BINDINGS_GENERATOR_ARG ' + \ - '$_BINDINGS_INCLUDE_FLAGS ' + \ - '--outputdir ${TARGET.dir} ' + \ - '${SOURCES[0].posix}', -) - -if env.Bit('mac'): # Mac OS X - env['BINDINGSPREFIX'] = 'DOM' - env['BINDINGS_GENERATOR_ARG'] = 'ObjC' - env['BINDINGS_LANGUAGE'] = 'LANGUAGE_OBJECTIVE_C' - env.Append(BINDINGS_INCLUDE_PATH = [ 'bindings/js' ]) -elif False: - env['BINDINGSPREFIX'] = 'JS' - env['BINDINGS_GENERATOR_ARG'] = 'JS' - env['BINDINGS_LANGUAGE'] = 'LANGUAGE_JAVASCRIPT' - env.Append(BINDINGS_INCLUDE_PATH = [ 'bindings/js' ]) -elif True: - env['BINDINGSPREFIX'] = 'V8' - env['BINDINGS_GENERATOR_ARG'] = 'V8' - env['BINDINGS_LANGUAGE'] = 'LANGUAGE_JAVASCRIPT V8_BINDING' - env.Prepend(PERL_INCLUDE_PATH = [ '$PORTROOT/bindings/scripts' ]) -else: - print 'I am not going to generate bindings for you!' - - -idl_files = [ - 'bindings/v8/UndetectableHTMLCollection.idl', - - 'css/Counter.idl', - 'css/CSSCharsetRule.idl', - 'css/CSSFontFaceRule.idl', - 'css/CSSImportRule.idl', - 'css/CSSMediaRule.idl', - 'css/CSSPageRule.idl', - 'css/CSSPrimitiveValue.idl', - 'css/CSSRule.idl', - 'css/CSSRuleList.idl', - 'css/CSSStyleDeclaration.idl', - 'css/CSSStyleRule.idl', - 'css/CSSStyleSheet.idl', - 'css/CSSUnknownRule.idl', - 'css/CSSValue.idl', - 'css/CSSValueList.idl', - 'css/CSSVariablesDeclaration.idl', - 'css/CSSVariablesRule.idl', - 'css/MediaList.idl', - 'css/Rect.idl', - 'css/RGBColor.idl', - 'css/StyleSheet.idl', - 'css/StyleSheetList.idl', - 'css/WebKitCSSKeyframeRule.idl', - 'css/WebKitCSSKeyframesRule.idl', - 'css/WebKitCSSMatrix.idl', - 'css/WebKitCSSTransformValue.idl', - - 'dom/Attr.idl', - 'dom/CDATASection.idl', - 'dom/CharacterData.idl', - 'dom/ClientRect.idl', - 'dom/ClientRectList.idl', - 'dom/Clipboard.idl', - 'dom/Comment.idl', - 'dom/Document.idl', - 'dom/DocumentFragment.idl', - 'dom/DocumentType.idl', - 'dom/DOMCoreException.idl', - 'dom/DOMImplementation.idl', - 'dom/DOMStringList.idl', - 'dom/Element.idl', - 'dom/Entity.idl', - 'dom/EntityReference.idl', - 'dom/Event.idl', - 'dom/EventException.idl', - 'dom/EventListener.idl', - 'dom/EventTarget.idl', - 'dom/KeyboardEvent.idl', - 'dom/MessageChannel.idl', - 'dom/MessageEvent.idl', - 'dom/MessagePort.idl', - 'dom/MouseEvent.idl', - 'dom/MutationEvent.idl', - 'dom/NamedNodeMap.idl', - 'dom/Node.idl', - 'dom/NodeFilter.idl', - 'dom/NodeIterator.idl', - 'dom/NodeList.idl', - 'dom/Notation.idl', - 'dom/OverflowEvent.idl', - 'dom/ProcessingInstruction.idl', - 'dom/ProgressEvent.idl', - 'dom/Range.idl', - 'dom/RangeException.idl', - 'dom/Text.idl', - 'dom/TextEvent.idl', - 'dom/TreeWalker.idl', - 'dom/UIEvent.idl', - 'dom/WebKitAnimationEvent.idl', - 'dom/WebKitTransitionEvent.idl', - 'dom/WheelEvent.idl', - - 'html/CanvasGradient.idl', - 'html/CanvasPattern.idl', - 'html/CanvasPixelArray.idl', - 'html/CanvasRenderingContext2D.idl', - 'html/File.idl', - 'html/FileList.idl', - 'html/HTMLAnchorElement.idl', - 'html/HTMLAppletElement.idl', - 'html/HTMLAreaElement.idl', - 'html/HTMLAudioElement.idl', - 'html/HTMLBaseElement.idl', - 'html/HTMLBaseFontElement.idl', - 'html/HTMLBlockquoteElement.idl', - 'html/HTMLBodyElement.idl', - 'html/HTMLBRElement.idl', - 'html/HTMLButtonElement.idl', - 'html/HTMLCanvasElement.idl', - 'html/HTMLCollection.idl', - 'html/HTMLDirectoryElement.idl', - 'html/HTMLDivElement.idl', - 'html/HTMLDListElement.idl', - 'html/HTMLDocument.idl', - 'html/HTMLElement.idl', - 'html/HTMLEmbedElement.idl', - 'html/HTMLFieldSetElement.idl', - 'html/HTMLFontElement.idl', - 'html/HTMLFormElement.idl', - 'html/HTMLFrameElement.idl', - 'html/HTMLFrameSetElement.idl', - 'html/HTMLHeadElement.idl', - 'html/HTMLHeadingElement.idl', - 'html/HTMLHRElement.idl', - 'html/HTMLHtmlElement.idl', - 'html/HTMLIFrameElement.idl', - 'html/HTMLImageElement.idl', - 'html/HTMLInputElement.idl', - 'html/HTMLIsIndexElement.idl', - 'html/HTMLLabelElement.idl', - 'html/HTMLLegendElement.idl', - 'html/HTMLLIElement.idl', - 'html/HTMLLinkElement.idl', - 'html/HTMLMapElement.idl', - 'html/HTMLMarqueeElement.idl', - 'html/HTMLMediaElement.idl', - 'html/HTMLMenuElement.idl', - 'html/HTMLMetaElement.idl', - 'html/HTMLModElement.idl', - 'html/HTMLObjectElement.idl', - 'html/HTMLOListElement.idl', - 'html/HTMLOptGroupElement.idl', - 'html/HTMLOptionElement.idl', - 'html/HTMLOptionsCollection.idl', - 'html/HTMLParagraphElement.idl', - 'html/HTMLParamElement.idl', - 'html/HTMLPreElement.idl', - 'html/HTMLQuoteElement.idl', - 'html/HTMLScriptElement.idl', - 'html/HTMLSelectElement.idl', - 'html/HTMLSourceElement.idl', - 'html/HTMLStyleElement.idl', - 'html/HTMLTableCaptionElement.idl', - 'html/HTMLTableCellElement.idl', - 'html/HTMLTableColElement.idl', - 'html/HTMLTableElement.idl', - 'html/HTMLTableRowElement.idl', - 'html/HTMLTableSectionElement.idl', - 'html/HTMLTextAreaElement.idl', - 'html/HTMLTitleElement.idl', - 'html/HTMLUListElement.idl', - 'html/HTMLVideoElement.idl', - 'html/ImageData.idl', - 'html/MediaError.idl', - 'html/TextMetrics.idl', - 'html/TimeRanges.idl', - 'html/VoidCallback.idl', - - # 'loader/appcache/DOMApplicationCache.idl', - - 'page/AbstractView.idl', - 'page/BarInfo.idl', - 'page/Console.idl', - 'page/DOMSelection.idl', - 'page/DOMWindow.idl', - 'page/History.idl', - 'page/Location.idl', - 'page/Navigator.idl', - 'page/Screen.idl', - 'page/WebKitPoint.idl', - 'page/WorkerNavigator.idl', - - 'inspector/InspectorController.idl', - - 'plugins/MimeTypeArray.idl', - 'plugins/MimeType.idl', - 'plugins/PluginArray.idl', - 'plugins/Plugin.idl', - - 'storage/Database.idl', - 'storage/SQLError.idl', - 'storage/SQLResultSet.idl', - 'storage/SQLResultSetRowList.idl', - 'storage/SQLTransaction.idl', - - 'svg/ElementTimeControl.idl', - 'svg/SVGAElement.idl', - 'svg/SVGAltGlyphElement.idl', - 'svg/SVGAngle.idl', - 'svg/SVGAnimateColorElement.idl', - 'svg/SVGAnimatedAngle.idl', - 'svg/SVGAnimatedBoolean.idl', - 'svg/SVGAnimatedEnumeration.idl', - 'svg/SVGAnimatedInteger.idl', - 'svg/SVGAnimatedLength.idl', - 'svg/SVGAnimatedLengthList.idl', - 'svg/SVGAnimatedNumber.idl', - 'svg/SVGAnimatedNumberList.idl', - 'svg/SVGAnimatedPathData.idl', - 'svg/SVGAnimatedPoints.idl', - 'svg/SVGAnimatedPreserveAspectRatio.idl', - 'svg/SVGAnimatedRect.idl', - 'svg/SVGAnimatedString.idl', - 'svg/SVGAnimatedTransformList.idl', - 'svg/SVGAnimateElement.idl', - 'svg/SVGAnimateTransformElement.idl', - 'svg/SVGAnimationElement.idl', - 'svg/SVGCircleElement.idl', - 'svg/SVGClipPathElement.idl', - 'svg/SVGColor.idl', - 'svg/SVGComponentTransferFunctionElement.idl', - 'svg/SVGCursorElement.idl', - 'svg/SVGDefinitionSrcElement.idl', - 'svg/SVGDefsElement.idl', - 'svg/SVGDescElement.idl', - 'svg/SVGDocument.idl', - 'svg/SVGElement.idl', - 'svg/SVGElementInstance.idl', - 'svg/SVGElementInstanceList.idl', - 'svg/SVGEllipseElement.idl', - 'svg/SVGException.idl', - 'svg/SVGExternalResourcesRequired.idl', - 'svg/SVGFEBlendElement.idl', - 'svg/SVGFEColorMatrixElement.idl', - 'svg/SVGFEComponentTransferElement.idl', - 'svg/SVGFECompositeElement.idl', - 'svg/SVGFEDiffuseLightingElement.idl', - 'svg/SVGFEDisplacementMapElement.idl', - 'svg/SVGFEDistantLightElement.idl', - 'svg/SVGFEFloodElement.idl', - 'svg/SVGFEFuncAElement.idl', - 'svg/SVGFEFuncBElement.idl', - 'svg/SVGFEFuncGElement.idl', - 'svg/SVGFEFuncRElement.idl', - 'svg/SVGFEGaussianBlurElement.idl', - 'svg/SVGFEImageElement.idl', - 'svg/SVGFEMergeElement.idl', - 'svg/SVGFEMergeNodeElement.idl', - 'svg/SVGFEOffsetElement.idl', - 'svg/SVGFEPointLightElement.idl', - 'svg/SVGFESpecularLightingElement.idl', - 'svg/SVGFESpotLightElement.idl', - 'svg/SVGFETileElement.idl', - 'svg/SVGFETurbulenceElement.idl', - 'svg/SVGFilterElement.idl', - 'svg/SVGFilterPrimitiveStandardAttributes.idl', - 'svg/SVGFitToViewBox.idl', - 'svg/SVGFontElement.idl', - 'svg/SVGFontFaceElement.idl', - 'svg/SVGFontFaceFormatElement.idl', - 'svg/SVGFontFaceNameElement.idl', - 'svg/SVGFontFaceSrcElement.idl', - 'svg/SVGFontFaceUriElement.idl', - 'svg/SVGForeignObjectElement.idl', - 'svg/SVGGElement.idl', - 'svg/SVGGlyphElement.idl', - 'svg/SVGGradientElement.idl', - 'svg/SVGHKernElement.idl', - 'svg/SVGImageElement.idl', - 'svg/SVGLangSpace.idl', - 'svg/SVGLength.idl', - 'svg/SVGLengthList.idl', - 'svg/SVGLinearGradientElement.idl', - 'svg/SVGLineElement.idl', - 'svg/SVGLocatable.idl', - 'svg/SVGMarkerElement.idl', - 'svg/SVGMaskElement.idl', - 'svg/SVGMatrix.idl', - 'svg/SVGMetadataElement.idl', - 'svg/SVGMissingGlyphElement.idl', - 'svg/SVGNumber.idl', - 'svg/SVGNumberList.idl', - 'svg/SVGPaint.idl', - 'svg/SVGPathElement.idl', - 'svg/SVGPathSeg.idl', - 'svg/SVGPathSegArcAbs.idl', - 'svg/SVGPathSegArcRel.idl', - 'svg/SVGPathSegClosePath.idl', - 'svg/SVGPathSegCurvetoCubicAbs.idl', - 'svg/SVGPathSegCurvetoCubicRel.idl', - 'svg/SVGPathSegCurvetoCubicSmoothAbs.idl', - 'svg/SVGPathSegCurvetoCubicSmoothRel.idl', - 'svg/SVGPathSegCurvetoQuadraticAbs.idl', - 'svg/SVGPathSegCurvetoQuadraticRel.idl', - 'svg/SVGPathSegCurvetoQuadraticSmoothAbs.idl', - 'svg/SVGPathSegCurvetoQuadraticSmoothRel.idl', - 'svg/SVGPathSegLinetoAbs.idl', - 'svg/SVGPathSegLinetoHorizontalAbs.idl', - 'svg/SVGPathSegLinetoHorizontalRel.idl', - 'svg/SVGPathSegLinetoRel.idl', - 'svg/SVGPathSegLinetoVerticalAbs.idl', - 'svg/SVGPathSegLinetoVerticalRel.idl', - 'svg/SVGPathSegList.idl', - 'svg/SVGPathSegMovetoAbs.idl', - 'svg/SVGPathSegMovetoRel.idl', - 'svg/SVGPatternElement.idl', - 'svg/SVGPoint.idl', - 'svg/SVGPointList.idl', - 'svg/SVGPolygonElement.idl', - 'svg/SVGPolylineElement.idl', - 'svg/SVGPreserveAspectRatio.idl', - 'svg/SVGRadialGradientElement.idl', - 'svg/SVGRect.idl', - 'svg/SVGRectElement.idl', - 'svg/SVGRenderingIntent.idl', - 'svg/SVGScriptElement.idl', - 'svg/SVGSetElement.idl', - 'svg/SVGStopElement.idl', - 'svg/SVGStringList.idl', - 'svg/SVGStylable.idl', - 'svg/SVGStyleElement.idl', - 'svg/SVGSVGElement.idl', - 'svg/SVGSwitchElement.idl', - 'svg/SVGSymbolElement.idl', - 'svg/SVGTests.idl', - 'svg/SVGTextContentElement.idl', - 'svg/SVGTextElement.idl', - 'svg/SVGTextPathElement.idl', - 'svg/SVGTextPositioningElement.idl', - 'svg/SVGTitleElement.idl', - 'svg/SVGTransform.idl', - 'svg/SVGTransformable.idl', - 'svg/SVGTransformList.idl', - 'svg/SVGTRefElement.idl', - 'svg/SVGTSpanElement.idl', - 'svg/SVGUnitTypes.idl', - 'svg/SVGURIReference.idl', - 'svg/SVGUseElement.idl', - 'svg/SVGViewElement.idl', - 'svg/SVGViewSpec.idl', - 'svg/SVGZoomAndPan.idl', - 'svg/SVGZoomEvent.idl', - - 'workers/Worker.idl', - 'workers/WorkerContext.idl', - 'workers/WorkerLocation.idl', - - 'xml/DOMParser.idl', - 'xml/DOMParser.idl', - 'xml/XMLHttpRequest.idl', - 'xml/XMLHttpRequestException.idl', - 'xml/XMLHttpRequestProgressEvent.idl', - 'xml/XMLHttpRequestUpload.idl', - 'xml/XMLSerializer.idl', - 'xml/XPathEvaluator.idl', - 'xml/XPathException.idl', - 'xml/XPathExpression.idl', - 'xml/XPathNSResolver.idl', - 'xml/XPathResult.idl', - 'xml/XSLTProcessor.idl', -] - -for name in idl_files: - env.Bindings('$WEBKIT_DIR/port/' + name) - - -# copy over some files -# TODO(eroman): can probably get rid of this. -i = env.Install('$SHARED_DIR', []) -env.Alias('webkit', i) - -# HTML tag and attribute names -# If we add ENABLE_ flags via HTML_FLAGS, we need to pass in -# --extraDefines $HTML_FLAGS. -env.Command(['$DERIVED_DIR/HTMLNames.cpp', - '$DERIVED_DIR/HTMLNames.h', - '$DERIVED_DIR/HTMLElementFactory.cpp', - '$DERIVED_DIR/HTMLElementFactory.h'], - ['$PORT_DIR/dom/make_names.pl', - '$PORT_DIR/html/HTMLTagNames.in', - '$PORT_DIR/html/HTMLAttributeNames.in'], - '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' - '--tags ${SOURCES[1].posix} ' - '--attrs ${SOURCES[2].posix} ' - '--factory ' - '--wrapperFactory ' - '--outputDir $DERIVED_DIR') - -env.Command(['$DERIVED_DIR/XMLNames.cpp', - '$DERIVED_DIR/XMLNames.h'], - ['$PORT_DIR/dom/make_names.pl', - '$PORT_DIR/xml/xmlattrs.in'], - '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' - '--attrs ${SOURCES[1].posix} ' - '--outputDir $DERIVED_DIR') - -env.Command(['$DERIVED_DIR/SVGElementFactory.cpp', - '$DERIVED_DIR/SVGElementFactory.h', - '$DERIVED_DIR/SVGNames.cpp', - '$DERIVED_DIR/SVGNames.h'], - ['$PORT_DIR/dom/make_names.pl', - '$PORT_DIR/svg/svgtags.in', - '$PORT_DIR/svg/svgattrs.in'], - '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' - '--tags ${SOURCES[1].posix} ' - '--attrs ${SOURCES[2].posix} ' - '--extraDefines "$SVG_FLAGS" ' - '--factory ' - '--wrapperFactory ' - '--outputDir $DERIVED_DIR') - -env.Command(['$DERIVED_DIR/XLinkNames.cpp', - '$DERIVED_DIR/XLinkNames.h'], - ['$PORT_DIR/dom/make_names.pl', - '$PORT_DIR/svg/xlinkattrs.in'], - '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' - '--attrs ${SOURCES[1].posix} ' - '--outputDir $DERIVED_DIR') - -# Add SVG Symbols to the WebCore exported symbols file -# TODO(bradnelson): fix this -#WebCore.exp : WebCore.base.exp WebCore.SVG.exp -# cat $^ > $@ - -def cat_files(target, source, env): - fout = open(str(target[0]), "w") - for src in source: - fin = open(str(src)) - fout.writelines(fin.readlines()) - fin.close() - fout.close() - -env.Command(['$DERIVED_DIR/UserAgentStyleSheets.h', - '$DERIVED_DIR/UserAgentStyleSheetsData.cpp'], - ['$PORT_DIR/css/make-css-file-arrays.pl', - '$PORT_DIR/css/view-source.css', - '$PORT_DIR/css/svg.css', - '$PORT_DIR/css/html4.css', - '$PORT_DIR/css/quirks.css', - '$PORT_DIR/css/themeWin.css', - '$PORT_DIR/css/themeWinQuirks.css'], - '$PERL ${SOURCES[0].posix} ${TARGETS.posix} ${SOURCES[1:].posix}') - -def create_h_wrapper(target, source, env): - """ - Create a *.h file by surrounding the contents of a - yacc-generated *.hpp with a #ifndef-#define-#endif guard. - """ - t = str(target[1]) - fp = open(t, 'w') - define = os.path.splitext(os.path.split(t)[1])[0] - fp.write('#ifndef %s_h\n' % define) - fp.write('#define %s_h\n' % define) - fp.write(open(t + 'pp', 'r').read()) - fp.write('#endif // %s_h\n' % define) - -# TODO(sgk): make this a real pseudo-Builder -def BuildYacc(env, dir, name, file): - yacc_env = env.Clone() - yacc_env['YACC'] = env.Detect('bison') or 'yacc' - yacc_env.Command(['$DERIVED_DIR/%s.cpp' % file, - '$DERIVED_DIR/%s.h' % file], - ['$PORT_DIR/%s/%s.y' % (dir, file)], - ['$YACC -d -p %s ${SOURCES[0].posix} ' % name + - '-o ${TARGET.posix}', - Action(create_h_wrapper), - Delete('${TARGETS[1]}pp')]) - -BuildYacc(env, 'xml', 'xpathyy', 'XPathGrammar') -BuildYacc(env, 'css', 'cssyy', 'CSSGrammar') - -# TODO(bradnelson): need to add in error checking - -env.Command('$PORT_DIR/SVGCSSValueKeywords.in', - '$PORT_DIR/css/SVGCSSValueKeywords.in', - '$PERL -ne "print lc" $SOURCES > $TARGET') - -env.Command('$PORT_DIR/CSSValueKeywords.in', - ['$PORT_DIR/css/CSSValueKeywords.in', - '$PORT_DIR/css/SVGCSSValueKeywords.in'], - '$PERL -ne "print lc" $SOURCES > $TARGET') - -env.Command('$PORT_DIR/CSSPropertyNames.in', - ['$PORT_DIR/css/CSSPropertyNames.in', - '$PORT_DIR/css/SVGCSSPropertyNames.in'], - '$PERL -ne "print lc" $SOURCES > $TARGET') - -env.Command(['$DERIVED_DIR/CSSValueKeywords.c', - '$DERIVED_DIR/CSSValueKeywords.h'], - ['$PORT_DIR/css/makevalues.pl', - '$PORT_DIR/CSSValueKeywords.in'], - ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}', - Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'), - Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'), - ]) - -env.Command(['$DERIVED_DIR/CSSPropertyNames.cpp', - '$DERIVED_DIR/CSSPropertyNames.h'], - ['$PORT_DIR/css/makeprop.pl', - '$PORT_DIR/CSSPropertyNames.in'], - ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}', - Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'), - Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'), - ]) - - -# DOCTYPE strings -env.Command('$DERIVED_DIR/DocTypeStrings.cpp', - '$PORT_DIR/html/DocTypeStrings.gperf', - 'gperf -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ' + \ - ',PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards ' + \ - '$SOURCE > $TARGET') - -# color names -env.Command('$DERIVED_DIR/ColorData.c', - '$PORT_DIR/platform/ColorData.gperf', - 'gperf -CDEot -L ANSI-C -k "*" -N findColor -D -s 2 ' + \ - '$SOURCE > $TARGET') - -# HTML entity names -env.Command('$DERIVED_DIR/HTMLEntityNames.c', - '$PORT_DIR/html/HTMLEntityNames.gperf', - 'gperf -a -L ANSI-C -C -G -c -o -t -k "*" -N findEntity ' + \ - '-D -s 2 $SOURCE > $TARGET') - -# CSS tokenizer -env.Command('$DERIVED_DIR/tokenizer.cpp', - ['$PORT_DIR/css/tokenizer.flex', - '$PORT_DIR/css/maketokenizer'], - 'flex --nowarn -t $SOURCE | perl ${SOURCES[1]} > $TARGET') diff --git a/webkit/build/webkit_resources/SConscript b/webkit/build/webkit_resources/SConscript deleted file mode 100644 index e9066d4..0000000 --- a/webkit/build/webkit_resources/SConscript +++ /dev/null @@ -1,35 +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. - -Import(['env', 'env_res']) - -env = env.Clone() -env_res = env_res.Clone() - -env_res.Append( - CPPPATH = [ - "$CHROME_SRC_DIR", - ], -) - -if env_res.Bit('windows'): - env_res.Append( - RCFLAGS = [ - ["/l", "0x409"], - ], - ) - -env_grd = env.Clone() -# This dummy target (webkit_resources) is used to tell the emitter where -# to put the target files. -generated = env_grd.GRIT( - '$TARGET_ROOT/grit_derived_sources/fake_generated_resources', - '$CHROME_SRC_DIR/webkit/glue/webkit_resources.grd') - -if env_res.Bit('windows'): - for g in [g for g in generated if str(g).endswith('.rc')]: - env_res.RES(g) - -env.ChromeMSVSProject('$WEBKIT_DIR/build/webkit_resources/webkit_resources.vcproj', - guid='{0B469837-3D46-484A-AFB3-C5A6C68730B9}') diff --git a/webkit/build/webkit_strings/SConscript b/webkit/build/webkit_strings/SConscript deleted file mode 100644 index 6dec4b7..0000000 --- a/webkit/build/webkit_strings/SConscript +++ /dev/null @@ -1,38 +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. - -Import(['env', 'env_res']) - -env = env.Clone() -env_res = env_res.Clone() - -env_res.Append( - CPPPATH = [ - ".", - #"$CHROME_SRC_DIR/chrome/Debug/obj/chrome_dll", - "$CHROME_SRC_DIR", - #"$CHROME_SRC_DIR/chrome/Debug/obj", - ], -) - -if env_res.Bit('windows'): - env_res.Append( - RCFLAGS = [ - ["/l", "0x409"], - ], - ) - -env_grd = env.Clone() -# This dummy target (webkit_strings) is used to tell the emitter where -# to put the target files. -generated = env_grd.GRIT( - '$TARGET_ROOT/grit_derived_sources/fake_generated_target', - '$CHROME_SRC_DIR/webkit/glue/webkit_strings.grd') - -if env_res.Bit('windows'): - for g in [g for g in generated if str(g).endswith('.rc')]: - env_res.RES(g) - -env.ChromeMSVSProject('$WEBKIT_DIR/build/localized_strings/localized_strings.vcproj', - guid='{60B43839-95E6-4526-A661-209F16335E0E}') diff --git a/webkit/default_plugin/SConscript b/webkit/default_plugin/SConscript deleted file mode 100644 index 79417f8..0000000 --- a/webkit/default_plugin/SConscript +++ /dev/null @@ -1,61 +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. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR/webkit/glue', - '$ICU38/public/common', - '$ICU38/public/i18n', - '$CHROME_SRC_DIR/third_party/libxml/include', - '$CHROME_SRC_DIR/third_party/npapi', - '$CHROME_SRC_DIR', - ], -) - -env.Append( - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - 'LIBXML_STATIC', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - - '/WX', - '/Wp64', - ], - ) - -# Platform-independent files. -input_files = [ -] - -# TODO: Quarantine files -- need porting to platform-specific blocks above. -if env.Bit('windows'): - input_files.extend([ - 'activex_installer.cc', - 'default_plugin.cc', - 'plugin_main.cc', - 'plugin_impl_win.cc', - 'plugin_database_handler.cc', - 'plugin_install_job_monitor.cc', - 'install_dialog.cc', - ]) - -env.ChromeLibrary('default_plugin', input_files) - -env.ChromeMSVSProject('$WEBKIT_DIR/default_plugin/default_plugin.vcproj', - dependencies = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - ('$WEBKIT_DIR/build/localized_strings/' + - 'localized_strings.vcproj'), - ], - guid='{5916D37D-8C97-424F-A904-74E52594C2D6}') diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript deleted file mode 100644 index 73aef79..0000000 --- a/webkit/glue/SConscript +++ /dev/null @@ -1,172 +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. - -Import('env') - -env = env.Clone() - -env.Append( - CPPPATH = [ - '$WEBKIT_DIR/build/WebCore', - ], - LIBS = [ - 'port', - 'renderer', - 'V8Bindings', - 'WebCore', - 'WTF', - ], -) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/TP', - - '/WX', - - '/wd4800', - ], - ) - -input_files = [ - 'alt_404_page_resource_fetcher.cc', - 'alt_error_page_resource_fetcher.cc', - 'autofill_form.cc', - 'back_forward_list_client_impl.cc', - 'chrome_client_impl.cc', - 'chromium_bridge_impl.cc', - 'clipboard_conversion.cc', - 'context_menu_client_impl.cc', - 'cpp_binding_example.cc', - 'cpp_bound_class.cc', - 'cpp_variant.cc', - 'debugger_bridge.cc', - 'devtools/devtools_rpc.cc', - 'devtools/devtools_rpc.h', - 'devtools/devtools_rpc_js.h', - 'devtools/debugger_agent.h', - 'devtools/debugger_agent_impl.cc', - 'devtools/debugger_agent_impl.h', - 'devtools/debugger_agent_manager.cc', - 'devtools/debugger_agent_manager.h', - 'devtools/dom_agent.h', - 'devtools/dom_agent_impl.cc', - 'devtools/dom_agent_impl.h', - 'devtools/net_agent.h', - 'devtools/net_agent_impl.cc', - 'devtools/net_agent_impl.h', - 'devtools/tools_agent.h', - 'dom_operations.cc', - 'dom_serializer.cc', - 'dragclient_impl.cc', - 'editor_client_impl.cc', - 'entity_map.cc', - 'event_conversion.cc', - 'feed_preview.cc', - 'glue_util.cc', - 'glue_serialize.cc', - 'image_decoder.cc', - 'image_resource_fetcher.cc', - 'inspector_client_impl.cc', - 'localized_strings.cc', - 'media_player_private_impl.cc', - 'multipart_response_delegate.cc', - 'npruntime_util.cc', - 'password_autocomplete_listener.cc', - 'password_form_dom_manager.cc', - 'plugins/plugin_host.cc', - 'plugins/plugin_instance.cc', - 'plugins/plugin_lib.cc', - 'plugins/plugin_list.cc', - 'plugins/plugin_stream.cc', - 'plugins/plugin_stream_url.cc', - 'plugins/plugin_string_stream.cc', - 'resource_fetcher.cc', - 'resource_handle_impl.cc', - 'resource_loader_bridge.cc', - 'searchable_form_data.cc', - 'simple_webmimeregistry_impl.cc', - 'stacking_order_iterator.cc', - 'webclipboard_impl.cc', - 'webcursor.cc', - 'webdatasource_impl.cc', - 'webdevtoolsagent.h', - 'webdevtoolsagent_delegate.h', - 'webdevtoolsagent_impl.cc', - 'webdevtoolsagent_impl.h', - 'webdevtoolsclient.h', - 'webdevtoolsclient_delegate.h', - 'webdevtoolsclient_impl.cc', - 'webdevtoolsclient_impl.h', - 'weberror_impl.cc', - 'webframe_impl.cc', - 'webframeloaderclient_impl.cc', - 'webhistoryitem_impl.cc', - 'webkitclient_impl.cc', - 'webkit_glue.cc', - 'webmediaplayer_impl.cc', - 'webplugin_delegate.cc', - 'webplugin_impl.cc', - 'webtextinput_impl.cc', - 'weburlrequest_impl.cc', - 'webwidget_impl.cc', - 'webview_delegate.cc', - 'webview_impl.cc', -] - -if env.Bit('windows'): - # TODO(port): These extra files aren't win32-specific, they've just not been - # tested on other platforms yet. - input_files.extend([ - '$PENDING_DIR/AccessibleBase.cpp', - '$PENDING_DIR/AccessibleDocument.cpp', - 'webaccessibilitymanager_impl.cc', - 'glue_accessibility_object.cc' - 'plugins/mozilla_extensions.cc', - 'plugins/webplugin_delegate_impl.cc', - 'webdropdata.cc', - ]) - -if env.Bit('windows'): - input_files.extend([ - 'plugins/plugin_lib_win.cc', - 'plugins/plugin_list_win.cc', - 'plugins/plugin_stream_win.cc', - 'webcursor_win.cc', - 'webkit_glue_win.cc', - ]) -elif env.Bit('linux'): - input_files.extend([ - 'plugins/plugin_lib_linux.cc', - 'plugins/plugin_list_linux.cc', - 'plugins/webplugin_delegate_impl_gtk.cc', - 'webcursor_gtk.cc', - 'webkit_glue_gtk.cc', - ]) -elif env.Bit('mac'): - input_files.extend([ - 'plugins/plugin_lib_mac.mm', - 'plugins/plugin_list_mac.mm', - 'webcursor_mac.mm', - ]) - -if env.Bit('posix'): - input_files.extend([ - 'plugins/plugin_stream_posix.cc', - ]) - -env.ChromeLibrary('glue', input_files) - -env.ChromeMSVSProject('$WEBKIT_DIR/build/glue/glue.vcproj', - name = 'Glue', - dependencies = [ - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', - ('$WEBKIT_DIR/build/V8Bindings/' + - 'V8Bindings_prebuild.vcproj'), - ('$WEBKIT_DIR/build/localized_strings/' + - 'localized_strings.vcproj'), - ], - guid='{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}') diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript deleted file mode 100644 index ee9ebac..0000000 --- a/webkit/glue/plugins/test/SConscript +++ /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. - -Import('env', 'env_res') - -env = env.Clone() -env_res = env_res.Clone() - -input_files = [ - 'npapi_constants.cc', - 'npapi_test.cc', - 'plugin_arguments_test.cc', - 'plugin_delete_plugin_in_stream_test.cc', - 'plugin_get_javascript_url_test.cc', - 'plugin_geturl_test.cc', - 'plugin_new_fails_test.cc', - 'plugin_npobject_proxy_test.cc', - 'plugin_test.cc' -] - -if env.Bit('windows'): - # TODO(port): Port these. - input_files.extend([ - 'plugin_execute_script_delete_test.cc', - 'plugin_javascript_open_popup.cc', - 'plugin_client.cc', # Includes not ported headers. - 'plugin_npobject_lifetime_test.cc', # Has win32-isms (HWND, CALLBACK). - 'plugin_window_size_test.cc' # Has w32-isms including HWND. - ]) - -env.Append( - LIBS = [ - 'base', - 'icu', - ], -) - -if env.Bit('windows'): - input_files.extend([ - env_res.RES('npapi_test.rc'), - 'npapi_test.def' - ]) - - env.Append( - CCFLAGS = [ - '/TP', - '/wd4800', - ], - - LIBS = [ - 'comctl32.lib', - 'rpcrt4.lib', - 'shlwapi.lib', - 'winmm.lib', - ], - - LINKFLAGS = [ - '/INCREMENTAL', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/FIXED:No', - '/SUBSYSTEM:CONSOLE', - '/MACHINE:X86', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -dll = env.ChromeSharedLibrary('npapi_test_plugin', input_files) - -# Install ourselves into the destination root so that dependent tests -# can find us. -i = env.Install('$DESTINATION_ROOT/plugins', dll) -env.Alias('webkit', i) - -env.ChromeMSVSProject('$WEBKIT_DIR/glue/plugins/test/npapi_test_plugin.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - ], - guid='{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}') diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript deleted file mode 100644 index 2f6c4ac..0000000 --- a/webkit/tools/npapi_layout_test_plugin/SConscript +++ /dev/null @@ -1,57 +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. - -Import('env', 'env_res') - -env = env.Clone() -env_res = env_res.Clone() - -input_files = [ - 'main.cpp', - 'PluginObject.cpp', - 'TestObject.cpp' -] - -if env.Bit('windows'): - input_files.extend([ - env_res.RES('npapi_layout_test_plugin.rc'), - 'npapi_layout_test_plugin.def' - ]) - - env.Append( - CCFLAGS = [ - '/TP', - '/WX', - ], - - LIBS = [ - 'comctl32.lib', - 'rpcrt4.lib', - 'shlwapi.lib', - 'winmm.lib', - ], - - LINKFLAGS = [ - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/FIXED:No', - '/SUBSYSTEM:CONSOLE', - '/MACHINE:X86', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -dll = env.ChromeSharedLibrary('npapi_layout_test_plugin', input_files) - -env.ChromeMSVSProject(('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' + - 'npapi_layout_test_plugin.vcproj'), - guid='{BE6D5659-A8D5-4890-A42C-090DD10EF62C}') - -# Install ourselves into the destination root so that dependent tests -# can find us. -i = env.Install('$DESTINATION_ROOT/plugins', dll) -env.Alias('webkit', i) diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript deleted file mode 100644 index afd0b60..0000000 --- a/webkit/tools/test_shell/SConscript +++ /dev/null @@ -1,328 +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. - -Import('env', 'env_res') - -env = env.Clone() -env_res = env_res.Clone() - -if env.Bit('windows'): - env_res.Append( - CPPPATH = [ - '.', - '$CHROME_SRC_DIR', - '$NET_DIR', - ], - RCFLAGS = [ - ['/l', '0x409'], - ], - ) - -env.Append( - CPPPATH = [ - '$BREAKPAD_DIR/src', - '$WEBKIT_DIR/glue', - '$GTEST_DIR/include', - ], - LIBS = [ - 'glue', - 'port', - 'base', - 'base_gfx', - 'browser', - 'googleurl', - 'net', - 'sdch', - 'skia', - 'gtest', - 'V8Bindings', - 'WebCore', - 'WebKit', - 'WTF', - env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'libjpeg', - 'libpng', - 'libxslt', - 'modp_b64', - 'zlib', - 'sqlite', - 'JavaScriptCore_pcre', - 'default_plugin', - ], -) - -if env.Bit('windows'): - # TODO(port): put portable libs in above declaration. - env.Append( - LIBS = [ - 'activex_shim', - 'breakpad_handler', - 'breakpad_sender', - ] - ) - -if env.Bit('windows'): - env.Append( - LIBS = [ - 'comctl32.lib', - 'rpcrt4.lib', - 'shlwapi.lib', - 'winmm.lib', - 'Urlmon', - ], - - LINKFLAGS = [ - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/FIXED:No', - '/SUBSYSTEM:CONSOLE', - '/MACHINE:X86', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) -elif env.Bit('posix'): - env.Append( - LIBS = [ - 'event', - ] - ) - -if env.Bit('mac'): - env.Append( - CPPPATH = [ - '$THIRD_PARTY_DIR/WebKit/WebKit/mac/WebCoreSupport', - ], - ) - -env_lib = env.Clone() - -env.SConscript([ - '$BZIP2_DIR/using_bzip2.scons', - '$LIBXML_DIR/using_libxml.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', -], {'env':env}) - -env_lib.SConscript([ - '$BZIP2_DIR/using_bzip2.scons', - '$LIBXML_DIR/using_libxml.scons', -], {'env':env_lib}) - -input_files = [ - 'event_sending_controller.cc', - 'layout_test_controller.cc', - 'mock_webclipboard_impl.cc', - 'simple_resource_loader_bridge.cc', - - # This file is only used by test_shell/test_shell_tests. It should - # probably be moved to the test_shell directory like - # simple_resource_loader_bridge.cc. - '$WEBKIT_DIR/glue/simple_clipboard_impl.cc', - 'test_navigation_controller.cc', - 'test_shell_request_context.cc', - 'test_shell_switches.cc', - 'test_shell.cc', - 'test_webview_delegate.cc', - 'text_input_controller.cc', -] -if env.Bit('windows'): - # TODO(port): Consider porting drag_delegate.cc and drop_delegate.cc. - input_files.extend([ - 'drag_delegate.cc', - 'drop_delegate.cc', - 'test_shell_platform_delegate_win.cc', - 'test_shell_win.cc', - 'test_webview_delegate_win.cc', - 'webview_host_win.cc', - 'webwidget_host_win.cc', - ]) -elif env.Bit('linux'): - input_files.extend([ - 'webview_host_gtk.cc', - 'webwidget_host_gtk.cc', - 'test_shell_gtk.cc', - 'test_shell_platform_delegate_gtk.cc', - 'test_webview_delegate_gtk.cc', - ]) - -lib = env_lib.ChromeLibrary('test_shell', input_files) - -env.Append(LIBS = ['test_shell']) - -env.ChromeMSVSProject('$WEBKIT_DIR/tools/test_shell/test_shell.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj', - ('$WEBKIT_DIR/build/JavaScriptCore/' + - 'JavaScriptCore_pcre.vcproj'), - '$WEBKIT_DIR/build/port/port.vcproj', - '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - '$BREAKPAD_DIR/breakpad_handler.vcproj', - ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' + - 'npapi_layout_test_plugin.vcproj'), - '$TESTING_DIR/gtest.vcproj', - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$SKIA_DIR/skia.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - ], - guid='{FA39524D-3067-4141-888D-28A86C66F2B9}') - - -resources = [] -exe_input_files = [ - 'test_shell_main.cc', -] - -if env.Bit('windows'): - resources = [ - env_res.RES('resources/test_shell.rc'), - '$TARGET_ROOT/grit_derived_sources/net_resources.res', - '$TARGET_ROOT/grit_derived_sources/webkit_strings_en-US.res', - ] - - exe_input_files += [ - '$V8_DIR/snapshot-empty$OBJSUFFIX' - ] - -test_shell = env.ChromeProgram('test_shell', resources + exe_input_files) - -i = env.Install('$TARGET_ROOT', test_shell) -env.Alias('webkit', i) - -if env.Bit('windows'): - env.Depends(test_shell, '$V8_DIR/vc80.pdb') - -if env.Bit('linux'): - # Build the linux resource files. - env_grd = env.Clone() - # This dummy target is used to tell the emitter where to put the target - # files. - generated = env_grd.GRIT( - '$TARGET_ROOT/grit_derived_sources/fake_test_shell_resources', - '$CHROME_SRC_DIR/webkit/tools/test_shell/test_shell_resources.grd') - - test_shell_data = env.Repack( - '$TARGET_ROOT/test_shell.pak', - ['$TARGET_ROOT/grit_derived_sources/net_resources.pak', - '$TARGET_ROOT/grit_derived_sources/test_shell_resources.pak', - '$TARGET_ROOT/grit_derived_sources/webkit_resources.pak', - '$TARGET_ROOT/grit_derived_sources/webkit_strings_en-US.pak', - ] - ) - env.Depends(test_shell, test_shell_data) - - i = env.Install('$DESTINATION_ROOT', test_shell_data) - env.Requires(test_shell, i) - env.Alias('webkit', i) - - # We need the npapi plugin stuffed into the right place. - # TODO(evanm): find a cleaner way of requiring this. - env.Requires(test_shell, - '$DESTINATION_ROOT/plugins/libnpapi_test_plugin.so') - env.Requires(test_shell, - '$DESTINATION_ROOT/plugins/libnpapi_layout_test_plugin.so') - -test_files = [ - 'image_decoder_unittest.cc', - 'keyboard_unittest.cc', - 'layout_test_controller_unittest.cc', - 'node_leak_test.cc', - 'run_all_tests.cc', - 'test_shell_test.cc', - 'text_input_controller_unittest.cc', - '$SKIA_DIR/ext/convolver_unittest.cc', - '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', - '$WEBKIT_DIR/glue/context_menu_unittest.cc', - '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', - '$WEBKIT_DIR/glue/cpp_variant_unittest.cc', - '$WEBKIT_DIR/glue/devtools/devtools_rpc_unittest.cc', - '$WEBKIT_DIR/glue/devtools/dom_agent_unittest.cc', - '$WEBKIT_DIR/glue/dom_operations_unittest.cc', - '$WEBKIT_DIR/glue/dom_serializer_unittest.cc', - '$WEBKIT_DIR/glue/glue_serialize_unittest.cc', - '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc', - '$WEBKIT_DIR/glue/mimetype_unittest.cc', - '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc', - '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc', - '$WEBKIT_DIR/glue/regular_expression_unittest.cc', - '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc', - '$WEBKIT_DIR/glue/webframe_unittest.cc', - '$WEBKIT_DIR/tools/webcore_unit_tests/GKURL_unittest.cpp', - '$WEBKIT_DIR/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp', - '$WEBKIT_DIR/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp', - '$WEBKIT_DIR/tools/webcore_unit_tests/XBMImageDecoder_unittest.cpp', - '$V8_DIR/snapshot-empty$OBJSUFFIX', -] - -if env.Bit('windows'): - # TODO(port): put portable files in above test_files declaration. - test_files.extend([ - '$SKIA_DIR/ext/platform_canvas_unittest.cc', - 'plugin_tests.cc', - # Commented out until a regression is fixed and this file is restored. - #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', - '$SKIA_DIR/ext/vector_canvas_unittest.cc', - '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', - '$WEBKIT_DIR/tools/webcore_unit_tests/UniscribeHelper_unittest.cpp', - ]) - -test_shell_tests = env.ChromeTestProgram('test_shell_tests', - resources + test_files) -# We need the npapi plugin stuffed into the right place. -# TODO(evanm): find a cleaner way of requiring this. -env.Requires(test_shell, - '$DESTINATION_ROOT/plugins/libnpapi_test_plugin.so') -env.Requires(test_shell_tests, - '$DESTINATION_ROOT/plugins/libnpapi_layout_test_plugin.so') - -i = env.Install('$TARGET_ROOT', test_shell_tests) -env.Alias('webkit', i) - -env.ChromeMSVSProject('$WEBKIT_DIR/tools/test_shell/test_shell_tests.vcproj', - dependencies = [ - '$WEBKIT_DIR/glue/plugins/test/npapi_test_plugin.vcproj', - '$BASE_DIR/build/base.vcproj', - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj' , - ('$WEBKIT_DIR/build/JavaScriptCore/' + - 'JavaScriptCore_pcre.vcproj'), - '$WEBKIT_DIR/build/port/port.vcproj', - '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - '$BREAKPAD_DIR/breakpad_handler.vcproj', - '$TESTING_DIR/gtest.vcproj', - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$SKIA_DIR/skia.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - ], - guid='{E6766F81-1FCD-4CD7-BC16-E36964A14867}') diff --git a/webkit/webkit_main.scons b/webkit/webkit_main.scons deleted file mode 100644 index 605dbfc..0000000 --- a/webkit/webkit_main.scons +++ /dev/null @@ -1,22 +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 webkit components. -""" - -Import('env') - -# Arrange for Hammer to add all programs to the 'webkit' Alias. -env.Append( - COMPONENT_PROGRAM_GROUPS = ['webkit'], - COMPONENT_TEST_PROGRAM_GROUPS = ['webkit'], -) - -sconscript_files = [ - 'SConscript', - 'webkit_sln.scons', -] - -SConscript(sconscript_files, exports=['env']) diff --git a/webkit/webkit_sln.scons b/webkit/webkit_sln.scons deleted file mode 100644 index 3257d20..0000000 --- a/webkit/webkit_sln.scons +++ /dev/null @@ -1,164 +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('webkit dependencies', - name='dependencies', - entries = [ - 'webkit libxslt projects', - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$V8_DIR/tools/visual_studio/v8.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - '$NET_DIR/build/net.vcproj', - '$MEDIA_DIR/build/media.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$V8_DIR/tools/visual_studio/v8_mksnapshot.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - '$BASE_DIR/build/base_gfx.vcproj', - '$BREAKPAD_DIR/breakpad_handler.vcproj', - 'webkit libxml projects', - '$TESTING_DIR/gtest.vcproj', - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - '$SKIA_DIR/skia.vcproj', - '$NET_DIR/build/tld_cleanup.vcproj', - '$V8_DIR/tools/visual_studio/v8_base.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$NET_DIR/build/net_resources.vcproj', - ], - guid='{2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}') - -env.ChromeMSVSFolder('webkit libxml projects', - name='libxml projects', - entries = [ - '$LIBXML_DIR/build/libxml_config.vcproj', - '$LIBXML_DIR/build/libxml.vcproj', - ], - guid='{B5EEDCC4-877F-4537-AD0E-A3FA070522DF}') - -env.ChromeMSVSFolder('webkit libxslt projects', - name='libxslt projects', - entries = [ - '$LIBXSLT_DIR/build/libxslt_config.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - ], - guid='{0655DC38-C685-436C-8D99-7CF64CB2CC35}') - -env.ChromeMSVSFolder('webkit test', - name='test', - entries = [ - '$WEBKIT_DIR/glue/plugins/test/npapi_test_plugin.vcproj', - ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' + - 'npapi_layout_test_plugin.vcproj'), - '$WEBKIT_DIR/tools/test_shell/test_shell_tests.vcproj', - '$WEBKIT_DIR/tools/test_shell/test_shell.vcproj', - ], - guid='{4A249B49-19FB-4BD1-B017-718E7A4448EF}') - -env.ChromeMSVSFolder('webkit (readonly)', - entries = [ - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', - ('$WEBKIT_DIR/build/JavaScriptCore/' + - 'JavaScriptCore_pcre.vcproj'), - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - ], - guid='{1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}') - -env.ChromeMSVSFolder('webkit (ours)', - entries = [ - '$WEBKIT_DIR/build/V8Bindings/V8Bindings_prebuild.vcproj', - '$WEBKIT_DIR/activex_shim_dll/activex_shim_dll.vcproj', - '$WEBKIT_DIR/build/port/port.vcproj', - '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', - ('$WEBKIT_DIR/build/localized_strings/' + - 'localized_strings.vcproj'), - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - ], - guid='{4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}') - - -solution = env.ChromeMSVSSolution('webkit.sln', - dest='$CHROME_SRC_DIR/webkit/webkit.sln', - entries = [ - 'webkit dependencies', - '$WEBKIT_DIR/build/glue/glue.vcproj', - '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', - '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', - '$WEBKIT_DIR/build/JSConfig/V8Config.vcproj', - '$WEBKIT_DIR/build/port/port.vcproj', - 'webkit (readonly)', - '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', - ('$WEBKIT_DIR/build/localized_strings/' + - 'localized_strings.vcproj'), - 'webkit (ours)', - 'webkit test', - '$BASE_DIR/build/base_gfx.vcproj', - '$BASE_DIR/build/base.vcproj', - '$BASE_DIR/build/debug_message.vcproj', - '$NET_DIR/build/net.vcproj', - '$NET_DIR/build/tld_cleanup.vcproj', - '$MEDIA_DIR/build/media.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - '$SKIA_DIR/skia.vcproj', - '$ICU38_DIR/build/icudt.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$WEBKIT_DIR/tools/test_shell/test_shell.vcproj', - '$LIBPNG_DIR/libpng.vcproj', - ('$WEBKIT_DIR/tools/test_shell/' + - 'test_shell_tests.vcproj'), - '$LIBXML_DIR/build/libxml.vcproj', - '$LIBXSLT_DIR/build/libxslt.vcproj', - '$ZLIB_DIR/zlib.vcproj', - '$LIBJPEG_DIR/libjpeg.vcproj', - '$BREAKPAD_DIR/breakpad_handler.vcproj', - '$MODP_B64_DIR/modp_b64.vcproj', - '$BZIP2_DIR/bzip2.vcproj', - ('$WEBKIT_DIR/glue/plugins/test/' + - 'npapi_test_plugin.vcproj'), - ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' + - 'npapi_layout_test_plugin.vcproj'), - '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', - '$WEBKIT_DIR/activex_shim_dll/activex_shim_dll.vcproj', - 'webkit libxml projects', - '$LIBXML_DIR/build/libxml_config.vcproj', - 'webkit libxslt projects', - '$LIBXSLT_DIR/build/libxslt_config.vcproj', - ('$WEBKIT_DIR/default_plugin/' + - 'default_plugin.vcproj'), - ('$WEBKIT_DIR/build/JavaScriptCore/' + - 'JavaScriptCore_pcre.vcproj'), - ('$WEBKIT_DIR/build/V8Bindings/' + - 'V8Bindings_prebuild.vcproj'), - '$TESTING_DIR/gtest.vcproj', - '$V8_DIR/tools/visual_studio/v8_base.vcproj', - '$V8_DIR/tools/visual_studio/v8.vcproj', - ('$V8_DIR/tools/visual_studio/' + - 'v8_mksnapshot.vcproj'), - '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', - '$SDCH_DIR/sdch.vcproj', - '$SQLITE_DIR/sqlite.vcproj', - ], - variants = [ - 'Debug|Win32', - 'Release|Win32', - ]) |