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

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

Issue 100174: add .pak files to list of grd outputs (so make can compute dependencies) (Closed)
Patch Set: rebase Created 11 years, 7 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
« no previous file with comments | « chrome/installer/util/util.gyp ('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 'test_shell_windows_resource_files': [ 8 'test_shell_windows_resource_files': [
9 'resources/test_shell.rc', 9 'resources/test_shell.rc',
10 'resources/pan_east.cur', 10 'resources/pan_east.cur',
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 'INFOPLIST_FILE': 'mac/Info.plist', 180 'INFOPLIST_FILE': 'mac/Info.plist',
181 }, 181 },
182 'conditions': [ 182 'conditions': [
183 ['OS=="win"', { 183 ['OS=="win"', {
184 'sources': [ '<@(test_shell_windows_resource_files)' ], 184 'sources': [ '<@(test_shell_windows_resource_files)' ],
185 }], 185 }],
186 ['OS=="linux"', { 186 ['OS=="linux"', {
187 'dependencies': [ 187 'dependencies': [
188 '../../../build/linux/system.gyp:gtk', 188 '../../../build/linux/system.gyp:gtk',
189 '../../../net/net.gyp:net_resources', 189 '../../../net/net.gyp:net_resources',
190 '../../webkit.gyp:glue', # for webkit_{resources,strings_en-US}.pak 190 '../../webkit.gyp:webkit_resources',
191 '../../webkit.gyp:webkit_strings',
191 'test_shell_resources', 192 'test_shell_resources',
192 ], 193 ],
193 'actions': [ 194 'actions': [
194 { 195 {
195 'action_name': 'test_shell_repack', 196 'action_name': 'test_shell_repack',
196 'inputs': [ 197 'inputs': [
197 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 198 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
198 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak' , 199 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak' ,
199 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 200 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
200 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', 201 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 }], 453 }],
453 ], 454 ],
454 }, 455 },
455 ], 456 ],
456 'conditions': [ 457 'conditions': [
457 ['OS=="linux"', { 458 ['OS=="linux"', {
458 'targets': [ 459 'targets': [
459 { 460 {
460 'target_name': 'test_shell_resources', 461 'target_name': 'test_shell_resources',
461 'type': 'none', 462 'type': 'none',
462 'sources': [ 463 'actions': [
463 'test_shell_resources.grd',
464 ],
465 # This was orignally in grit_resources.rules
466 # NOTE: this version doesn't mimic the Properties specified there.
467 'rules': [
468 { 464 {
469 'rule_name': 'grit', 465 'action_name': 'test_shell_resources',
470 'extension': 'grd', 466 'variables': {
467 'grit_path': '../../../tools/grit/grit.py',
468 'input_path': './test_shell_resources.grd',
469 'out_dir': '<(SHARED_INTERMEDIATE_DIR)/test_shell',
470 },
471 'inputs': [ 471 'inputs': [
472 '../../../tools/grit/grit.py', 472 '<(input_path)',
473 ], 473 ],
474 'outputs': [ 474 'outputs': [
475 '<(SHARED_INTERMEDIATE_DIR)/test_shell/grit/<(RULE_INPUT_ROOT).h ', 475 '<(out_dir)/grit/test_shell_resources.h',
476 '<(SHARED_INTERMEDIATE_DIR)/test_shell/<(RULE_INPUT_ROOT).pak', 476 '<(out_dir)/test_shell_resources.pak',
477 ], 477 ],
478 'action': 478 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build ', '-o', '<(out_dir)'],
479 ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', ' -o', '<(SHARED_INTERMEDIATE_DIR)/test_shell'], 479 'message': 'Generating resources from <(input_path)',
480 'message': 'Generating resources from <(RULE_INPUT_PATH)',
481 }, 480 },
482 ], 481 ],
483 'direct_dependent_settings': { 482 'direct_dependent_settings': {
484 'include_dirs': [ 483 'include_dirs': [
485 '<(SHARED_INTERMEDIATE_DIR)/test_shell', 484 '<(SHARED_INTERMEDIATE_DIR)/test_shell',
486 ], 485 ],
487 }, 486 },
488 }, 487 },
489 ], 488 ],
490 }], 489 }],
(...skipping 28 matching lines...) Expand all
519 'conditions': [ 518 'conditions': [
520 ['OS!="win"', { 519 ['OS!="win"', {
521 'sources!' : ['test_worker/test_worker.def'], 520 'sources!' : ['test_worker/test_worker.def'],
522 }], 521 }],
523 ], 522 ],
524 }, 523 },
525 ], 524 ],
526 }], 525 }],
527 ], 526 ],
528 } 527 }
OLDNEW
« no previous file with comments | « chrome/installer/util/util.gyp ('k') | webkit/webkit.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698