| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 Import('env', 'env_res') | 5 Import('env', 'env_res') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 env_res = env_res.Clone() | 8 env_res = env_res.Clone() |
| 9 | 9 |
| 10 env_res.Append( | 10 if env['PLATFORM'] == 'win32': |
| 11 CPPPATH = [ | 11 env_res.Append( |
| 12 '.', | 12 CPPPATH = [ |
| 13 '#/..', | 13 '.', |
| 14 '$NET_DIR', | 14 '#/..', |
| 15 ], | 15 '$NET_DIR', |
| 16 RCFLAGS = [ | 16 ], |
| 17 ['/l', '0x409'], | 17 RCFLAGS = [ |
| 18 ], | 18 ['/l', '0x409'], |
| 19 ) | 19 ], |
| 20 ) |
| 20 | 21 |
| 21 env.Append( | 22 env.Append( |
| 22 CPPPATH = [ | 23 CPPPATH = [ |
| 23 '$BREAKPAD_DIR/src', | 24 '$BREAKPAD_DIR/src', |
| 24 '$WEBKIT_DIR/glue', | 25 '$WEBKIT_DIR/glue', |
| 25 '$GTEST_DIR/include', | 26 '$GTEST_DIR/include', |
| 26 ], | 27 ], |
| 27 LIBS = [ | 28 LIBS = [ |
| 28 'test_shell', | 29 'test_shell', |
| 29 'base', | 30 'base', |
| 30 'base_gfx', | 31 'base_gfx', |
| 31 'breakpad_handler', | |
| 32 'breakpad_sender', | |
| 33 'googleurl', | 32 'googleurl', |
| 34 'net', | 33 'net', |
| 35 'sdch', | 34 'sdch', |
| 36 'skia', | 35 'skia', |
| 37 'gtest', | 36 'gtest', |
| 38 'bzip2', | 37 'bzip2', |
| 39 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed | 38 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed |
| 40 'libjpeg', | 39 'libjpeg', |
| 41 'libpng', | 40 'libpng', |
| 42 'libxml', | 41 'libxml', |
| 43 'libxslt', | 42 'libxslt', |
| 44 'modp_b64', | 43 'modp_b64', |
| 45 'zlib', | 44 'zlib', |
| 46 'v8', | 45 'v8', |
| 47 'JavaScriptCore_pcre', | 46 'JavaScriptCore_pcre', |
| 48 'port', | 47 'port', |
| 49 'activex_shim', | |
| 50 'WTF', | 48 'WTF', |
| 51 'V8Bindings', | 49 'V8Bindings', |
| 52 'WebCore', | |
| 53 'default_plugin', | 50 'default_plugin', |
| 54 'glue', | 51 'glue', |
| 55 ], | 52 ], |
| 56 ) | 53 ) |
| 57 | 54 |
| 58 env.Append( | 55 if env['PLATFORM'] == 'win32': |
| 59 LIBS = [ | 56 env.Append( |
| 60 'comctl32.lib', | 57 LIBS = [ |
| 61 'rpcrt4.lib', | 58 'activex_shim', |
| 62 'shlwapi.lib', | 59 'breakpad_handler', |
| 63 'winmm.lib', | 60 'breakpad_sender', |
| 64 ], | 61 'WebCore', |
| 62 'comctl32.lib', |
| 63 'rpcrt4.lib', |
| 64 'shlwapi.lib', |
| 65 'winmm.lib', |
| 66 ], |
| 65 | 67 |
| 66 LINKFLAGS = [ | 68 LINKFLAGS = [ |
| 67 '/DELAYLOAD:"ws2_32.dll"', | 69 '/DELAYLOAD:"ws2_32.dll"', |
| 68 '/DELAYLOAD:"dwmapi.dll"', | 70 '/DELAYLOAD:"dwmapi.dll"', |
| 69 '/DELAYLOAD:"uxtheme.dll"', | 71 '/DELAYLOAD:"uxtheme.dll"', |
| 70 '/FIXED:No', | 72 '/FIXED:No', |
| 71 '/SUBSYSTEM:CONSOLE', | 73 '/SUBSYSTEM:CONSOLE', |
| 72 '/MACHINE:X86', | 74 '/MACHINE:X86', |
| 73 '/safeseh', | 75 '/safeseh', |
| 74 '/dynamicbase', | 76 '/dynamicbase', |
| 75 '/ignore:4199', | 77 '/ignore:4199', |
| 76 '/nxcompat', | 78 '/nxcompat', |
| 77 ], | 79 ], |
| 78 ) | 80 ) |
| 79 | 81 |
| 80 input_files = [ | 82 input_files = [ |
| 81 'drag_delegate.cc', | |
| 82 'drop_delegate.cc', | |
| 83 'event_sending_controller.cc', | |
| 84 'layout_test_controller.cc', | |
| 85 'simple_resource_loader_bridge.cc', | |
| 86 'test_navigation_controller.cc', | 83 'test_navigation_controller.cc', |
| 87 'test_shell.cc', | |
| 88 'test_shell_switches.cc', | 84 'test_shell_switches.cc', |
| 89 'test_shell_request_context.cc', | |
| 90 'test_webview_delegate.cc', | |
| 91 'text_input_controller.cc', | |
| 92 'webview_host.cc', | |
| 93 'webwidget_host.cc', | |
| 94 ] | 85 ] |
| 86 if env['PLATFORM'] == 'win32': |
| 87 # TODO(port): move more files to shared list. |
| 88 input_files.append([ |
| 89 'drag_delegate.cc', |
| 90 'drop_delegate.cc', |
| 91 'event_sending_controller.cc', |
| 92 'layout_test_controller.cc', |
| 93 'simple_resource_loader_bridge.cc', |
| 94 'test_shell.cc', |
| 95 'test_shell_request_context.cc', |
| 96 'test_webview_delegate.cc', |
| 97 'text_input_controller.cc', |
| 98 'webview_host.cc', |
| 99 'webwidget_host.cc', |
| 100 ]) |
| 101 elif env['PLATFORM'] == 'posix': |
| 102 input_files.append([ |
| 103 'test_shell_gtk.cc', |
| 104 'webwidget_host_gtk.cc', |
| 105 ]) |
| 95 | 106 |
| 96 lib = env.ChromeStaticLibrary('test_shell', input_files) | 107 lib = env.ChromeStaticLibrary('test_shell', input_files) |
| 97 | 108 |
| 98 | 109 |
| 99 | 110 |
| 100 resources = [ | 111 # TODO(port): figure out what we're doing with resources. |
| 101 env_res.RES('resources/test_shell.rc'), | 112 resources = [] |
| 102 '$NET_DIR/net_resources.res', | 113 if env['PLATFORM'] == 'win32': |
| 103 '$WEBKIT_DIR/build/localized_strings/webkit_strings_en-US.res', | 114 resources = [ |
| 104 ] | 115 env_res.RES('resources/test_shell.rc'), |
| 116 '$NET_DIR/net_resources.res', |
| 117 '$WEBKIT_DIR/build/localized_strings/webkit_strings_en-US.res', |
| 118 ] |
| 105 | 119 |
| 106 | 120 |
| 107 exe_input_files = [ | 121 exe_input_files = [ |
| 108 'test_shell_main.cc', | 122 'test_shell_main.cc', |
| 109 '$V8_DIR/snapshot-empty$OBJSUFFIX' | 123 '$V8_DIR/snapshot-empty$OBJSUFFIX' |
| 110 ] | 124 ] |
| 125 elif env['PLATFORM'] == 'posix': |
| 126 exe_input_files = [ |
| 127 'test_shell_main_gtk.cc', |
| 128 ] |
| 111 | 129 |
| 112 test_shell = env.ChromeProgram('test_shell', resources + exe_input_files) | 130 test_shell = env.ChromeProgram('test_shell', resources + exe_input_files) |
| 113 i = env.Install('$TARGET_ROOT', test_shell) | 131 i = env.Install('$TARGET_ROOT', test_shell) |
| 114 env.Alias('webkit', i) | 132 env.Alias('webkit', i) |
| 115 | 133 |
| 116 env.Depends(test_shell, '$V8_DIR/vc80.pdb') | 134 if env['PLATFORM'] == 'win32': |
| 135 env.Depends(test_shell, '$V8_DIR/vc80.pdb') |
| 117 | 136 |
| 118 | 137 |
| 119 test_files = [ | 138 if env['PLATFORM'] == 'win32': |
| 120 'drag_delegate.cc', | 139 # TODO(port): move files to a shared list. |
| 121 'drop_delegate.cc', | 140 test_files = [ |
| 122 'event_sending_controller.cc', | 141 'drag_delegate.cc', |
| 123 'image_decoder_unittest.cc', | 142 'drop_delegate.cc', |
| 124 'keyboard_unittest.cc', | 143 'event_sending_controller.cc', |
| 125 'layout_test_controller.cc', | 144 'image_decoder_unittest.cc', |
| 126 'layout_test_controller_unittest.cc', | 145 'keyboard_unittest.cc', |
| 127 'node_leak_test.cc', | 146 'layout_test_controller.cc', |
| 128 'plugin_tests.cc', | 147 'layout_test_controller_unittest.cc', |
| 129 'run_all_tests.cc', | 148 'node_leak_test.cc', |
| 130 'simple_resource_loader_bridge.cc', | 149 'plugin_tests.cc', |
| 131 'test_navigation_controller.cc', | 150 'run_all_tests.cc', |
| 132 'test_shell.cc', | 151 'simple_resource_loader_bridge.cc', |
| 133 'test_shell_request_context.cc', | 152 'test_navigation_controller.cc', |
| 134 'test_shell_switches.cc', | 153 'test_shell.cc', |
| 135 'test_shell_test.cc', | 154 'test_shell_request_context.cc', |
| 136 'test_webview_delegate.cc', | 155 'test_shell_switches.cc', |
| 137 'text_input_controller.cc', | 156 'test_shell_test.cc', |
| 138 'text_input_controller_unittest.cc', | 157 'test_webview_delegate.cc', |
| 139 'webview_host.cc', | 158 'text_input_controller.cc', |
| 140 'webwidget_host.cc', | 159 'text_input_controller_unittest.cc', |
| 141 '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc', | 160 'webview_host.cc', |
| 142 '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', | 161 'webwidget_host.cc', |
| 143 '$WEBKIT_DIR/glue/context_menu_unittest.cc', | 162 '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc', |
| 144 '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', | 163 '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', |
| 145 '$WEBKIT_DIR/glue/cpp_variant_unittest.cc', | 164 '$WEBKIT_DIR/glue/context_menu_unittest.cc', |
| 146 '$WEBKIT_DIR/glue/dom_operations_unittest.cc', | 165 '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', |
| 147 '$WEBKIT_DIR/glue/dom_serializer_unittest.cc', | 166 '$WEBKIT_DIR/glue/cpp_variant_unittest.cc', |
| 148 '$WEBKIT_DIR/glue/glue_serialize_unittest.cc', | 167 '$WEBKIT_DIR/glue/dom_operations_unittest.cc', |
| 149 '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc', | 168 '$WEBKIT_DIR/glue/dom_serializer_unittest.cc', |
| 150 '$WEBKIT_DIR/glue/mimetype_unittest.cc', | 169 '$WEBKIT_DIR/glue/glue_serialize_unittest.cc', |
| 151 '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc', | 170 '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc', |
| 152 '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc', | 171 '$WEBKIT_DIR/glue/mimetype_unittest.cc', |
| 153 '$WEBKIT_DIR/glue/regular_expression_unittest.cc', | 172 '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc', |
| 154 '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc', | 173 '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc', |
| 155 # Commented out until a regression is fixed and this file is restored. | 174 '$WEBKIT_DIR/glue/regular_expression_unittest.cc', |
| 156 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', | 175 '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc', |
| 157 '$WEBKIT_DIR/glue/webframe_unittest.cc', | 176 # Commented out until a regression is fixed and this file is restored. |
| 158 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', | 177 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', |
| 159 '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp', | 178 '$WEBKIT_DIR/glue/webframe_unittest.cc', |
| 160 '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp', | 179 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', |
| 161 '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp', | 180 '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp', |
| 162 '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp', | 181 '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp
', |
| 182 '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp
', |
| 183 '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp
', |
| 163 | 184 |
| 164 '$V8_DIR/snapshot-empty$OBJSUFFIX', | 185 '$V8_DIR/snapshot-empty$OBJSUFFIX', |
| 165 ] | 186 ] |
| 166 | 187 |
| 167 test_shell_tests = env.ChromeTestProgram('test_shell_tests', | 188 test_shell_tests = env.ChromeTestProgram('test_shell_tests', |
| 168 resources + test_files) | 189 resources + test_files) |
| 169 i = env.Install('$TARGET_ROOT', test_shell_tests) | 190 i = env.Install('$TARGET_ROOT', test_shell_tests) |
| 170 env.Alias('webkit', i) | 191 env.Alias('webkit', i) |
| 171 | 192 |
| OLD | NEW |