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

Side by Side Diff: chrome/chrome.gyp

Issue 155015: Make workers functional on OSX and Linux. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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
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 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
11 # Linux or Mac, and into chrome.dll on Windows. 11 # Linux or Mac, and into chrome.dll on Windows.
12 'chromium_dependencies': [ 12 'chromium_dependencies': [
13 'common', 13 'common',
14 'browser', 14 'browser',
15 'debugger', 15 'debugger',
16 'renderer', 16 'renderer',
17 'utility', 17 'utility',
18 'worker',
18 '../printing/printing.gyp:printing', 19 '../printing/printing.gyp:printing',
19 '../webkit/webkit.gyp:inspector_resources', 20 '../webkit/webkit.gyp:inspector_resources',
20 ], 21 ],
21 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 22 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
22 'browser_tests_sources': [ 23 'browser_tests_sources': [
23 'browser/browser_browsertest.cc', 24 'browser/browser_browsertest.cc',
24 'browser/crash_recovery_browsertest.cc', 25 'browser/crash_recovery_browsertest.cc',
25 'browser/ssl/ssl_browser_tests.cc', 26 'browser/ssl/ssl_browser_tests.cc',
26 ], 27 ],
27 'browser_tests_sources_win_specific': [ 28 'browser_tests_sources_win_specific': [
(...skipping 2394 matching lines...) Expand 10 before | Expand all | Expand 10 after
2422 'dependencies': [ 2423 'dependencies': [
2423 '../build/linux/system.gyp:gtk', 2424 '../build/linux/system.gyp:gtk',
2424 ], 2425 ],
2425 }], 2426 }],
2426 # Windows-specific rules. 2427 # Windows-specific rules.
2427 ['OS=="win"', { 2428 ['OS=="win"', {
2428 'include_dirs': [ 2429 'include_dirs': [
2429 'third_party/wtl/include', 2430 'third_party/wtl/include',
2430 ], 2431 ],
2431 },], 2432 },],
2432 # As of yet unported-from-Windows code.
2433 ['OS!="win"', {
2434 'sources!': [
2435 'renderer/webworker_proxy.cc',
2436 'renderer/webworker_proxy.h',
2437 ],
2438 },],
2439 ], 2433 ],
2440 }, 2434 },
2441 { 2435 {
2442 'target_name': 'utility', 2436 'target_name': 'utility',
2443 'type': '<(library)', 2437 'type': '<(library)',
2444 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7', 2438 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7',
2445 'dependencies': [ 2439 'dependencies': [
2446 '../base/base.gyp:base', 2440 '../base/base.gyp:base',
2447 '../skia/skia.gyp:skia', 2441 '../skia/skia.gyp:skia',
2448 ], 2442 ],
(...skipping 15 matching lines...) Expand all
2464 }, 2458 },
2465 }, 2459 },
2466 'conditions': [ 2460 'conditions': [
2467 ['OS=="linux"', { 2461 ['OS=="linux"', {
2468 'dependencies': [ 2462 'dependencies': [
2469 '../build/linux/system.gyp:gtk', 2463 '../build/linux/system.gyp:gtk',
2470 ], 2464 ],
2471 }], 2465 }],
2472 ], 2466 ],
2473 }, 2467 },
2468 {
2469 'target_name': 'worker',
2470 'type': '<(library)',
2471 'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18',
2472 'dependencies': [
2473 '../base/base.gyp:base',
2474 '../webkit/webkit.gyp:webkit',
2475 ],
2476 'sources': [
2477 'tools/build/win/precompiled.cc',
2478 'tools/build/win/precompiled.h',
2479
2480 'worker/nativewebworker_impl.cc',
2481 'worker/nativewebworker_impl.h',
2482 'worker/nativewebworker_stub.cc',
2483 'worker/nativewebworker_stub.h',
2484 'worker/webworkerclient_proxy.cc',
2485 'worker/webworkerclient_proxy.h',
2486 'worker/worker_main.cc',
2487 'worker/worker_thread.cc',
2488 'worker/worker_thread.h',
2489 'worker/worker_webkitclient_impl.cc',
2490 'worker/worker_webkitclient_impl.h',
2491 ],
2492 'include_dirs': [
2493 '..',
2494 ],
2495 'configurations': {
2496 'Debug': {
2497 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
2498 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
2499 },
2500 },
2501 },
2474 { 2502 {
2475 'target_name': 'chrome', 2503 'target_name': 'chrome',
2476 'type': 'executable', 2504 'type': 'executable',
2477 'mac_bundle': 1, 2505 'mac_bundle': 1,
2478 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC', 2506 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC',
2479 'sources': [ 2507 'sources': [
2480 # All .cc, .h, .m, and .mm files under app except for tests. 2508 # All .cc, .h, .m, and .mm files under app except for tests.
2481 'app/breakpad_win.cc', 2509 'app/breakpad_win.cc',
2482 'app/breakpad_win.h', 2510 'app/breakpad_win.h',
2483 'app/chrome_exe_main.cc', 2511 'app/chrome_exe_main.cc',
(...skipping 2422 matching lines...) Expand 10 before | Expand all | Expand 10 after
4906 'configurations': { 4934 'configurations': {
4907 'Debug': { 4935 'Debug': {
4908 'msvs_settings': { 4936 'msvs_settings': {
4909 'VCLinkerTool': { 4937 'VCLinkerTool': {
4910 'LinkIncremental': '1', # /INCREMENTAL:NO 4938 'LinkIncremental': '1', # /INCREMENTAL:NO
4911 }, 4939 },
4912 }, 4940 },
4913 }, 4941 },
4914 }, 4942 },
4915 }, 4943 },
4916 {
4917 'target_name': 'worker',
4918 'type': '<(library)',
4919 'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18',
4920 'dependencies': [
4921 '../base/base.gyp:base',
4922 '../webkit/webkit.gyp:webkit',
4923 ],
4924 'sources': [
4925 'tools/build/win/precompiled.cc',
4926 'tools/build/win/precompiled.h',
4927
4928 'worker/nativewebworker_impl.cc',
4929 'worker/nativewebworker_impl.h',
4930 'worker/nativewebworker_stub.cc',
4931 'worker/nativewebworker_stub.h',
4932 'worker/webworkerclient_proxy.cc',
4933 'worker/webworkerclient_proxy.h',
4934 'worker/worker_main.cc',
4935 'worker/worker_thread.cc',
4936 'worker/worker_thread.h',
4937 'worker/worker_webkitclient_impl.cc',
4938 'worker/worker_webkitclient_impl.h',
4939 ],
4940 'include_dirs': [
4941 '..',
4942 ],
4943 'configurations': {
4944 'Debug': {
4945 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
4946 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
4947 },
4948 },
4949 },
4950 ]}, # 'targets' 4944 ]}, # 'targets'
4951 ], # OS=="win" 4945 ], # OS=="win"
4952 # TODO(jrg): add in Windows code coverage targets. 4946 # TODO(jrg): add in Windows code coverage targets.
4953 ['coverage!=0', 4947 ['coverage!=0',
4954 { 'targets': [ 4948 { 'targets': [
4955 { 4949 {
4956 'target_name': 'coverage', 4950 'target_name': 'coverage',
4957 # do NOT place this in the 'all' list; most won't want it. 4951 # do NOT place this in the 'all' list; most won't want it.
4958 # In gyp, booleans are 0/1 not True/False. 4952 # In gyp, booleans are 0/1 not True/False.
4959 'suppress_wildcard': 1, 4953 'suppress_wildcard': 1,
(...skipping 28 matching lines...) Expand all
4988 # Use outputs of this action as inputs for the main target build. 4982 # Use outputs of this action as inputs for the main target build.
4989 # Seems as a misnomer but makes this happy on Linux (scons). 4983 # Seems as a misnomer but makes this happy on Linux (scons).
4990 'process_outputs_as_sources': 1, 4984 'process_outputs_as_sources': 1,
4991 }, 4985 },
4992 ], # 'actions' 4986 ], # 'actions'
4993 }, 4987 },
4994 ] 4988 ]
4995 }], 4989 }],
4996 ], # 'conditions' 4990 ], # 'conditions'
4997 } 4991 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698