diff options
| -rw-r--r-- | chrome/SConscript | 43 | ||||
| -rw-r--r-- | chrome/SConscript.automated_ui_tests | 39 | ||||
| -rw-r--r-- | chrome/SConscript.ui_tests | 4 | ||||
| -rw-r--r-- | chrome/SConscript.unit_tests | 46 | ||||
| -rw-r--r-- | chrome/browser/SConscript | 5 | ||||
| -rw-r--r-- | chrome/browser/views/SConscript | 6 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/SConscript | 5 | ||||
| -rw-r--r-- | chrome/installer/setup/SConscript | 1 | ||||
| -rw-r--r-- | chrome/installer/util/SConscript | 1 | ||||
| -rw-r--r-- | chrome/renderer/SConscript | 1 | ||||
| -rw-r--r-- | chrome/test/automation/SConscript | 2 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/SConscript | 13 | ||||
| -rw-r--r-- | chrome/test/memory_test/SConscript | 1 | ||||
| -rw-r--r-- | chrome/test/reliability/SConscript | 34 | ||||
| -rw-r--r-- | chrome/test/startup/SConscript | 2 | ||||
| -rw-r--r-- | chrome/views/SConscript | 2 |
16 files changed, 109 insertions, 96 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 49fe41c..4fb7297 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -122,6 +122,21 @@ env_dll.Append( 'glue', 'JavaScriptCore_pcre', 'port', + + 'browser', + 'browser_views', + 'debugger', + 'common', + 'util', + 'jscre', + 'plugin', + 'renderer', + 'hunspell', + # TODO(sgk): Windows doesn't use libevent, revisit when Linux gets here + #'libevent', + 'sqlite', + 'views', + 'v8', ], ) @@ -170,7 +185,6 @@ if env_dll['PLATFORM'] == 'win32': '/nxcompat', '/PDB:${TARGETS[1]}', - '/IMPLIB:${TARGETS[2]}', ], ) @@ -182,23 +196,6 @@ if env_dll['PLATFORM'] == 'win32': '$V8_DIR/snapshot-empty$OBJSUFFIX', ]) -libs = [ - 'browser/browser.lib', - 'browser/views/browser_views.lib', - 'browser/debugger/debugger.lib', - 'common/common.lib', - 'installer/util/util.lib', - 'libjscre.lib', - 'plugin/plugin.lib', - 'renderer/renderer.lib', - 'third_party/hunspell/hunspell.lib', - # TODO(sgk): libevent isn't used on Windows, revisit when Linux gets here - #'third_party/libevent/libevent.lib', - 'third_party/sqlite/sqlite.lib', - 'views/views.lib', - '$V8_DIR/v8.lib', -] - # TODO(sgk): make a pseudo-Builder for these @@ -228,7 +225,7 @@ grit_files.extend(google_chrome) # TODO(port) if env_dll['PLATFORM'] == 'win32': dll_targets = env_dll.ChromeSharedLibrary('chrome.dll', - dll_resources + input_files + libs, + dll_resources + input_files, PDB='chrome_dll.pdb') install_targets.extend(dll_targets) @@ -310,7 +307,7 @@ env_exe.Append( '/nxcompat', '/PDB:${TARGETS[1]}', - '/IMPLIB:${TARGETS[2]}', + #'/IMPLIB:${TARGETS[2]}', ], ) @@ -326,7 +323,8 @@ if env['PLATFORM'] == 'win32': 'app/google_update_client.cc', 'common/common.lib', - '$CHROME_DIR/chrome_dll.lib', + #'$CHROME_DIR/chrome_dll.lib', + 'chrome.lib', ] ) @@ -445,7 +443,8 @@ env.SConscript(sconscript_files, exports=['env', 'env_res', 'env_test']) # TODO(port) if env['PLATFORM'] == 'win32': - env.InstallAs('libjscre.lib', '$WEBKIT_DIR/JavaScriptCore_pcre.lib') + env.InstallAs('$LIBS_DIR/${LIBPREFIX}jscre${LIBSUFFIX}', + '$WEBKIT_DIR/JavaScriptCore_pcre.lib') i = env.Install('$TARGET_ROOT', install_targets) diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests index b4b15bb..e8a973d 100644 --- a/chrome/SConscript.automated_ui_tests +++ b/chrome/SConscript.automated_ui_tests @@ -24,19 +24,27 @@ env_test.Prepend( 'LIBXML_STATIC', ], LIBS = [ - 'libxml', + 'automation', + 'base', + 'base_gfx', + 'browser', + 'browser_views', + 'common', 'googleurl', - 'skia', - 'libpng', 'gtest', - 'base_gfx', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed + 'libpng', + 'libxml', + 'modp_b64', + 'net', + 'skia', 'zlib', - 'base', - ], -) -env_test.Prepend( + 'comsupp', + 'oleacc', + 'psapi', + 'rpcrt4', + ], LINKFLAGS = [ '/INCREMENTAL', @@ -54,21 +62,8 @@ env_test.Prepend( '/MACHINE:X86', '/FIXED:No', ], - LIBS = [ - 'comsupp.lib', - 'oleacc.lib', - 'psapi.lib', - 'rpcrt4.lib', - ], ) -libs = [ - 'common/common.lib', - 'browser/browser.lib', - 'browser/views/browser_views.lib', - 'test/automation/automation.lib', -] - test_files = [ 'test/automated_ui_tests/automated_ui_tests.cc', '$CHROME_DIR/test/test_file_util$OBJSUFFIX', @@ -78,7 +73,7 @@ test_files = [ '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', ] -exe = env_test.ChromeTestProgram('automated_ui_tests', test_files + libs) +exe = env_test.ChromeTestProgram('automated_ui_tests', test_files) i = env_test.Install('$TARGET_ROOT', exe) Alias('chrome', i) diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests index 0443a4d..0526cd5 100644 --- a/chrome/SConscript.ui_tests +++ b/chrome/SConscript.ui_tests @@ -136,8 +136,8 @@ ui_test_files = [ if env_test['PLATFORM'] == 'win32': ui_test_files.extend([ - 'find_bar_win_interactive_uitest.cc', - 'find_bar_win_uitest.cc', + 'browser/views/find_bar_win_interactive_uitest.cc', + 'browser/views/find_bar_win_uitest.cc', ]) ui_tests = env_test.ChromeTestProgram('ui_tests', ui_test_files + libs) diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests index 531c8af..04d6707 100644 --- a/chrome/SConscript.unit_tests +++ b/chrome/SConscript.unit_tests @@ -27,6 +27,7 @@ env_test.Prepend( '$GTEST_DIR/include', 'third_party/wtl/include', 'tools/build/win', + '$CHROME_DIR/app/resources', '$CHROME_SRC_DIR', ], CPPDEFINES = [ @@ -42,19 +43,27 @@ env_test.Prepend( # base must come after net, bzip2 must come before base, etc. LIBS = [ 'net', # On Linux, dependencies must follow dependents. - 'bzip2', + 'base', 'base_gfx', + 'browser', + 'bzip2', 'googleurl', 'gtest', + 'hunspell', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libjpeg', 'libpng', 'libxml', 'libxslt', 'modp_b64', + 'plugin', + 'renderer', 'skia', + 'sqlite', + 'util', 'v8', + 'v8_snapshot', 'zlib', 'WTF', @@ -63,6 +72,7 @@ env_test.Prepend( 'glue', 'JavaScriptCore_pcre', 'port', + 'WebCore', ], ) @@ -70,8 +80,14 @@ if env_test['PLATFORM'] == 'win32': # TODO(port): Port or mark as Windows-specific. env_test.Prepend( LIBS = [ - # TODO(sgk): to be ported to Mac and Linux + # TODO(port): to be ported to Mac and Linux, or else + # moved to real Windows-specific lists + 'browser_views', + 'debugger', + 'jscre', 'sdch', + 'test_chrome_plugin', + 'views', 'WebCore', ], @@ -106,22 +122,6 @@ if env_test['PLATFORM'] == 'win32': ], ) - libs = [ - 'snapshotv8.lib', - - 'browser/browser.lib', - 'browser/views/browser_views.lib', - 'browser/debugger/debugger.lib', - 'installer/util/util.lib', - 'libjscre.lib', - 'plugin/plugin.lib', - 'renderer/renderer.lib', - 'test/chrome_plugin/test_chrome_plugin.lib', - 'third_party/hunspell/hunspell.lib', - 'third_party/sqlite/sqlite.lib', - 'views/views.lib', - ] - unit_test_files = [] if env_test['PLATFORM'] in ('posix', 'win32'): @@ -173,6 +173,7 @@ if env_test['PLATFORM'] == 'win32': 'browser/cache_manager_host_unittest.cc', 'browser/controller_unittest.cc', 'browser/download/download_manager_unittest.cc', + 'browser/download/download_request_manager_unittest.cc', 'browser/download/save_package_unittest.cc', 'browser/encryptor_unittest.cc', 'browser/google_url_tracker_unittest.cc', @@ -199,13 +200,13 @@ if env_test['PLATFORM'] == 'win32': 'browser/profile_manager_unittest.cc', 'browser/renderer_security_policy_unittest.cc', 'browser/resource_dispatcher_host_unittest.cc', - 'browser/download_request_manager_unittest.cc', 'browser/rlz/rlz_unittest.cc', 'browser/safe_browsing/protocol_manager_unittest.cc', 'browser/session_backend_unittest.cc', 'browser/session_service_test_helper.cc', 'browser/session_service_unittest.cc', 'browser/site_instance_unittest.cc', + 'browser/spellcheck_unittest.cc', 'browser/tabs/tab_strip_model_unittest.cc', 'browser/template_url_model_unittest.cc', 'browser/template_url_parser_unittest.cc', @@ -236,7 +237,6 @@ if env_test['PLATFORM'] == 'win32': 'common/win_util_unittest.cc', 'renderer/net/render_dns_master_unittest.cc', 'renderer/net/render_dns_queue_unittest.cc', - 'renderer/spellcheck_unittest.cc', 'test/test_notification_tracker.cc', 'test/test_tab_contents.cc', 'test/testing_profile.cc', @@ -256,11 +256,7 @@ if env_test['PLATFORM'] == 'win32': if env_test['PLATFORM'] in ('posix', 'win32'): # TODO(port): This should work on all platforms. - test_program_files = unit_test_files - if env_test['PLATFORM'] == 'win32': - # This is probably Windows-specific. - test_program_files.extend(libs) - unit_tests = env_test.ChromeTestProgram('unit_tests', test_program_files) + unit_tests = env_test.ChromeTestProgram('unit_tests', unit_test_files) i = env_test.Install('$TARGET_ROOT', unit_tests) Alias('chrome', i) diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript index 5dbf23e..5b6cc6f 100644 --- a/chrome/browser/SConscript +++ b/chrome/browser/SConscript @@ -128,8 +128,11 @@ if env['PLATFORM'] == 'win32': 'bookmark_bar_context_menu_controller.cc', 'bookmarks/bookmark_codec.cc', 'bookmarks/bookmark_drag_data.cc', + 'bookmarks/bookmark_drag_utils.cc', + 'bookmarks/bookmark_folder_tree_model.cc', 'bookmarks/bookmark_model.cc', 'bookmarks/bookmark_storage.cc', + 'bookmarks/bookmark_table_model.cc', 'browser.cc', 'browser_about_handler.cc', 'browser_accessibility.cc', @@ -141,6 +144,7 @@ if env['PLATFORM'] == 'win32': 'browser_prefs.cc', 'browser_process_impl.cc', 'browser_shutdown.cc', + 'browser_trial.cc', 'browser_url_handler.cc', 'browser_window.cc', 'browsing_data_remover.cc', @@ -175,6 +179,7 @@ if env['PLATFORM'] == 'win32': 'first_run.cc', 'frame_util.cc', 'gears_integration.cc', + 'greasemonkey_master.cc', 'hang_monitor/hung_plugin_action.cc', 'hang_monitor/hung_window_detector.cc', 'history/download_database.cc', diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript index d99443e..f882bc2 100644 --- a/chrome/browser/views/SConscript +++ b/chrome/browser/views/SConscript @@ -68,6 +68,7 @@ input_files = [ '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', @@ -136,4 +137,9 @@ input_files = [ 'user_data_dir_dialog.cc', ] +if env['PLATFORM'] == 'win32': + input_files.extend([ + 'find_bar_win.cc', + ]) + env.ChromeStaticLibrary('browser_views', input_files) diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index 606a112..bce8d00 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -52,7 +52,7 @@ env.Prepend( '/DYNAMICBASE:NO', '/PDB:${TARGETS[1]}', - '/MAP:${TARGETS[2]}', + #'/MAP:${TARGETS[2]}', ], LIBS = [ 'shlwapi.lib', @@ -64,7 +64,8 @@ env['CCFLAGS'].remove('/RTC1') components = [ "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", - "$TARGET_ROOT/chrome_dll.lib", + #"$TARGET_ROOT/chrome_dll.lib", + "$TARGET_ROOT/chrome.lib", ] input_files = [ diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index 3c99c45..e754c56 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -61,7 +61,6 @@ env.Prepend( '/nxcompat', '/PDB:${TARGETS[1]}', - '/MAP:${TARGETS[2]}', ], LIBS = [ 'msi.lib', diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript index fde62a7a..eaa9fb5 100644 --- a/chrome/installer/util/SConscript +++ b/chrome/installer/util/SConscript @@ -38,7 +38,6 @@ env.Prepend( ) input_files = [ - '../../app/google_update_settings$OBJSUFFIX', 'browser_distribution.cc', 'copy_tree_work_item.cc', 'create_dir_work_item.cc', diff --git a/chrome/renderer/SConscript b/chrome/renderer/SConscript index e1fbd63..76ea461 100644 --- a/chrome/renderer/SConscript +++ b/chrome/renderer/SConscript @@ -56,6 +56,7 @@ if env['PLATFORM'] == 'win32': 'dom_ui_bindings.cc', 'external_js_object.cc', 'external_host_bindings.cc', + 'greasemonkey_slave.cc', 'localized_error.cc', 'net/render_dns_master.cc', 'plugin_channel_host.cc', diff --git a/chrome/test/automation/SConscript b/chrome/test/automation/SConscript index 71a09c1..1b9d786 100644 --- a/chrome/test/automation/SConscript +++ b/chrome/test/automation/SConscript @@ -30,5 +30,5 @@ input_files = [ lib = env.ChromeStaticLibrary('automation', input_files) i = env.Install('$TARGET_ROOT', lib) -env.Alias('chrome', i) +#env.Alias('chrome', i) diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript index f788335..7b0fdda 100644 --- a/chrome/test/interactive_ui/SConscript +++ b/chrome/test/interactive_ui/SConscript @@ -33,13 +33,21 @@ env_test.Prepend( 'browser_views', 'bzip2', 'common', + 'debugger', + 'glue', 'googleurl', 'gtest', + 'hunspell', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libpng', 'modp_b64', 'net', + 'renderer', 'skia', + 'sqlite', + 'views', + 'v8', + 'WebCore', 'zlib', ], ) @@ -74,13 +82,14 @@ input_files = [ '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc', '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc', '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc', + '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX', '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', + '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc', '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + 'view_event_test_base.cc', - '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX', - '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc', ] exe = env_test.ChromeTestProgram('interactive_ui_tests', input_files) diff --git a/chrome/test/memory_test/SConscript b/chrome/test/memory_test/SConscript index 75a595f..454a1b3 100644 --- a/chrome/test/memory_test/SConscript +++ b/chrome/test/memory_test/SConscript @@ -31,6 +31,7 @@ env_test.Prepend( 'gtest', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libpng', + 'modp_b64', 'net', 'skia', 'zlib', diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript index 0922599..3504e61 100644 --- a/chrome/test/reliability/SConscript +++ b/chrome/test/reliability/SConscript @@ -22,22 +22,27 @@ env_test.Prepend( '$CHROME_SRC_DIR', ], LIBS = [ + 'automation', + 'base', + 'base_gfx', + 'browser', + 'browser_views', + 'common', 'googleurl', - 'skia', - 'libpng', 'gtest', - 'base_gfx', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'common', + 'libpng', + 'modp_b64', + 'net', + 'skia', 'zlib', - 'browser', - 'browser_views', - 'base', - 'automation', - ], -) -env_test.Prepend( + 'comsupp', + 'oleacc', + 'psapi', + 'rpcrt4', + 'winmm', + ], LINKFLAGS = [ '/INCREMENTAL', '/DEBUG', @@ -53,13 +58,6 @@ env_test.Prepend( '/ignore:4199', '/nxcompat', ], - LIBS = [ - 'comsupp.lib', - 'oleacc.lib', - 'psapi.lib', - 'rpcrt4.lib', - 'winmm.lib', - ], ) input_files = [ diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript index 9e95689..ab57d9c 100644 --- a/chrome/test/startup/SConscript +++ b/chrome/test/startup/SConscript @@ -32,6 +32,8 @@ env_test.Prepend( 'browser_views', 'base', 'automation', + 'modp_b64', + 'net', ], ) diff --git a/chrome/views/SConscript b/chrome/views/SConscript index 21a936a..58c15d7 100644 --- a/chrome/views/SConscript +++ b/chrome/views/SConscript @@ -21,6 +21,8 @@ env.Prepend( env.Append( CPPPATH = [ '$CHROME_DIR/app/resources', + '$ICU38_DIR/public/common', + '$ICU38_DIR/public/i18n', '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/include/platform', |