Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: webkit/tools/test_shell/test_shell.gyp

Issue 39219: test_shell and test_shell_tests on Linux from gyp-generated scons files: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/SConscript.main ('k') | webkit/webkit.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../../../build/common.gypi', 10 '../../../build/common.gypi',
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 'webwidget_host_gtk.cc', 74 'webwidget_host_gtk.cc',
75 'webwidget_host_win.cc', 75 'webwidget_host_win.cc',
76 ], 76 ],
77 'export_dependent_settings': [ 77 'export_dependent_settings': [
78 '../../../base/base.gyp:base', 78 '../../../base/base.gyp:base',
79 '../../../net/net.gyp:net', 79 '../../../net/net.gyp:net',
80 '../../webkit.gyp:glue', 80 '../../webkit.gyp:glue',
81 '../../webkit.gyp:webkit', 81 '../../webkit.gyp:webkit',
82 ], 82 ],
83 'conditions': [ 83 'conditions': [
84 ['OS!="linux"', {'sources/': [['exclude', '_gtk\\.cc$']]}], 84 ['OS=="linux"', {
85 'dependencies': [
86 'test_shell_resources',
87 ],
88 # for: test_shell_gtk.cc
89 'cflags': ['-Wno-multichar'],
90 }, { # else: OS!=linux
91 'sources/': [
92 ['exclude', '_gtk\\.cc$']
93 ],
94 }],
85 ['OS=="mac"', { 95 ['OS=="mac"', {
86 'sources': [ 96 'sources': [
87 # Windows/Linux use this code normally when constructing events, so 97 # Windows/Linux use this code normally when constructing events, so
88 # in test_shell they get it from glue. The Mac has its own code for 98 # in test_shell they get it from glue. The Mac has its own code for
89 # accomplishing it, so in test_shell, where events are constructed 99 # accomplishing it, so in test_shell, where events are constructed
90 # from scratch, we need to pull this in. 100 # from scratch, we need to pull this in.
91 '../../glue/webinputevent_util.cc', 101 '../../glue/webinputevent_util.cc',
92 ] 102 ]
93 }, { # else: OS!=mac 103 }, { # else: OS!=mac
94 'sources/': [ 104 'sources/': [
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 'mac_bundle_resources!': [ 147 'mac_bundle_resources!': [
138 # TODO(mark): Come up with a fancier way to do this (mac_info_plist?) 148 # TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
139 # that automatically sets the correct INFOPLIST_FILE setting and adds 149 # that automatically sets the correct INFOPLIST_FILE setting and adds
140 # the file to a source group. 150 # the file to a source group.
141 'mac/Info.plist', 151 'mac/Info.plist',
142 ], 152 ],
143 'xcode_settings': { 153 'xcode_settings': {
144 'INFOPLIST_FILE': 'mac/Info.plist', 154 'INFOPLIST_FILE': 'mac/Info.plist',
145 }, 155 },
146 'conditions': [ 156 'conditions': [
157 ['OS=="linux"', {
158 'dependencies': [
159 '../../../net/net.gyp:net_resources',
160 '../../webkit.gyp:glue', # for webkit_{resources,strings_en-US}.pak
161 'test_shell_resources',
162 ],
163 'actions': [
164 {
165 'action_name': 'test_shell_repack',
166 'inputs': [
167 '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/net_resources.p ak',
168 '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/test_shell_reso urces.pak',
169 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
170 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
171 ],
172 'outputs': [
173 '<(PRODUCT_DIR)/test_shell.pak',
174 ],
175 'action': ['python', '../tools/data_pack/repack.py', '<@(_outputs) ', '<@(_inputs)'],
176 },
177 ],
178 'scons_depends': [
179 ['<(PRODUCT_DIR)/test_shell'],
180 ['<(PRODUCT_DIR)/test_shell.pak'],
181 ],
182 }],
147 ['OS=="mac"', { 183 ['OS=="mac"', {
148 'product_name': 'TestShell', 184 'product_name': 'TestShell',
149 'variables': { 185 'variables': {
150 'repack_path': '../../../tools/data_pack/repack.py', 186 'repack_path': '../../../tools/data_pack/repack.py',
151 }, 187 },
152 'actions': [ 188 'actions': [
153 { 189 {
154 # TODO(mark): Make this work with more languages than the 190 # TODO(mark): Make this work with more languages than the
155 # hardcoded en-US. 191 # hardcoded en-US.
156 'action_name': 'repack_locale', 192 'action_name': 'repack_locale',
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 }, { # else: OS!=win 264 }, { # else: OS!=win
229 'sources!': [ 265 'sources!': [
230 '../../../skia/ext/vector_canvas_unittest.cc', 266 '../../../skia/ext/vector_canvas_unittest.cc',
231 '../webcore_unit_tests/UniscribeHelper_unittest.cpp', 267 '../webcore_unit_tests/UniscribeHelper_unittest.cpp',
232 'plugin_tests.cc' 268 'plugin_tests.cc'
233 ], 269 ],
234 }], 270 }],
235 ], 271 ],
236 }, 272 },
237 ], 273 ],
274 'conditions': [
275 ['OS=="linux"', {
276 'targets': [
277 {
278 'target_name': 'test_shell_resources',
279 'type': 'none',
280 'sources': [
281 'test_shell_resources.grd',
282 ],
283 # This was orignally in grit_resources.rules
284 # NOTE: this version doesn't mimic the Properties specified there.
285 'rules': [
286 {
287 'rule_name': 'grit',
288 'extension': 'grd',
289 'inputs': [
290 '../../../tools/grit/grit.py',
291 ],
292 'outputs': [
293 '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/grit/<(RULE_INP UT_ROOT).h',
294 '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/<(RULE_INPUT_RO OT).pak',
295 ],
296 'action':
297 ['python', '../tools/grit/grit.py', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources'],
298 },
299 ],
300 'direct_dependent_settings': {
301 'include_dirs': [
302 '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources',
303 ],
304 },
305 },
306 ],
307 }],
308 ],
238 } 309 }
OLDNEW
« no previous file with comments | « build/SConscript.main ('k') | webkit/webkit.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698