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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 11147012: Generate version resources for Chrome Frame using the same machinery as Chrome itself. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': {
10 'version_py_path': '../tools/build/version.py',
11 'version_path': 'VERSION',
12 },
13 'version_py_path': '<(version_py_path) -f',
14 'version_path': '<(version_path)',
15
16 # Keep the archive builder happy. 9 # Keep the archive builder happy.
17 'chrome_personalization%': 1, 10 'chrome_personalization%': 1,
18 'use_syncapi_stub%': 0, 11 'use_syncapi_stub%': 0,
19 12
20 'conditions': [ 13 'conditions': [
21 ['OS=="win"', { 14 ['OS=="win"', {
22 'python': [ 15 'python': [
23 '<(DEPTH)\\third_party\\python_26\\setup_env.bat && python' 16 '<(DEPTH)\\third_party\\python_26\\setup_env.bat && python'
24 ], 17 ],
25 }, { # OS != win 18 }, { # OS != win
26 'python': [ 19 'python': [
27 'python' 20 'python'
28 ], 21 ],
29 }], 22 }],
30 ], 23 ],
31 }, 24 },
32 'includes': [ 25 'includes': [
33 '../build/win_precompile.gypi', 26 '../build/win_precompile.gypi',
27 '../chrome/version.gypi',
34 ], 28 ],
35 'target_defaults': { 29 'target_defaults': {
36 'dependencies': [ 30 'dependencies': [
37 '../chrome/chrome_resources.gyp:chrome_resources', 31 '../chrome/chrome_resources.gyp:chrome_resources',
38 '../chrome/chrome_resources.gyp:chrome_strings', 32 '../chrome/chrome_resources.gyp:chrome_strings',
39 '../chrome/chrome_resources.gyp:packed_resources', 33 '../chrome/chrome_resources.gyp:packed_resources',
40 '../chrome/chrome_resources.gyp:theme_resources', 34 '../chrome/chrome_resources.gyp:theme_resources',
41 '../skia/skia.gyp:skia', 35 '../skia/skia.gyp:skia',
42 ], 36 ],
43 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], 37 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ],
44 'include_dirs': [ 38 'include_dirs': [
45 # all our own includes are relative to src/ 39 # all our own includes are relative to src/
46 '..', 40 '..',
47 ], 41 ],
48 }, 42 },
49 'targets': [ 43 'targets': [
50 { 44 {
45 'target_name': 'chrome_frame_version_resources',
46 'type': 'none',
47 'conditions': [
48 ['branding == "Chrome"', {
49 'variables': {
50 'branding_path': '../chrome/app/theme/google_chrome/BRANDING',
51 },
52 }, { # else branding!="Chrome"
53 'variables': {
54 'branding_path': '../chrome/app/theme/chromium/BRANDING',
55 },
56 }],
57 ],
58 'variables': {
59 'output_dir': 'chrome_frame',
60 'template_input_path': 'npchrome_frame_version.rc.version',
61 'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
62 'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
63 },
64 'direct_dependent_settings': {
65 'include_dirs': [
66 '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)',
67 ],
68 },
69 'sources': [
70 'npchrome_frame_dll.ver',
71 ],
72 'includes': [
73 '../chrome/version_resource_rules.gypi',
74 ],
75 },
76 {
51 # Builds the crash tests in crash_reporting. 77 # Builds the crash tests in crash_reporting.
52 'target_name': 'chrome_frame_crash_tests', 78 'target_name': 'chrome_frame_crash_tests',
53 'type': 'none', 79 'type': 'none',
54 'dependencies': [ 80 'dependencies': [
55 'crash_reporting/crash_reporting.gyp:minidump_test', 81 'crash_reporting/crash_reporting.gyp:minidump_test',
56 'crash_reporting/crash_reporting.gyp:vectored_handler_tests', 82 'crash_reporting/crash_reporting.gyp:vectored_handler_tests',
57 ], 83 ],
58 }, 84 },
59 { 85 {
60 # Builds our IDL file to the shared intermediate directory. 86 # Builds our IDL file to the shared intermediate directory.
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 'test/test_server.h', 270 'test/test_server.h',
245 'test/test_server_test.cc', 271 'test/test_server_test.cc',
246 'test/test_with_web_server.cc', 272 'test/test_with_web_server.cc',
247 'test/test_with_web_server.h', 273 'test/test_with_web_server.h',
248 'test/ui_test.cc', 274 'test/ui_test.cc',
249 'test/urlmon_moniker_tests.h', 275 'test/urlmon_moniker_tests.h',
250 'test/urlmon_moniker_integration_test.cc', 276 'test/urlmon_moniker_integration_test.cc',
251 'test/url_request_test.cc', 277 'test/url_request_test.cc',
252 'test/win_event_receiver.cc', 278 'test/win_event_receiver.cc',
253 'test/win_event_receiver.h', 279 'test/win_event_receiver.h',
254 'chrome_launcher_version.rc', 280 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_launcher_exe_version.rc' ,
255 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', 281 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
256 'test_utils.cc', 282 'test_utils.cc',
257 'test_utils.h', 283 'test_utils.h',
258 ], 284 ],
259 'include_dirs': [ 285 'include_dirs': [
260 '<(DEPTH)/third_party/wtl/include', 286 '<(DEPTH)/third_party/wtl/include',
261 '<(DEPTH)/breakpad/src', 287 '<(DEPTH)/breakpad/src',
262 ], 288 ],
263 'resource_include_dirs': [ 289 'resource_include_dirs': [
264 '<(INTERMEDIATE_DIR)', 290 '<(INTERMEDIATE_DIR)',
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 ], 870 ],
845 }, 871 },
846 { 872 {
847 'target_name': 'npchrome_frame', 873 'target_name': 'npchrome_frame',
848 'type': 'shared_library', 874 'type': 'shared_library',
849 'dependencies': [ 875 'dependencies': [
850 '../base/base.gyp:base', 876 '../base/base.gyp:base',
851 'chrome_frame_ie', 877 'chrome_frame_ie',
852 'chrome_frame_strings', 878 'chrome_frame_strings',
853 'chrome_frame_utils', 879 'chrome_frame_utils',
880 'chrome_frame_version_resources',
854 'chrome_tab_idl', 881 'chrome_tab_idl',
855 'chrome_frame_launcher.gyp:chrome_launcher', 882 'chrome_frame_launcher.gyp:chrome_launcher',
856 'chrome_frame_launcher.gyp:chrome_frame_helper', 883 'chrome_frame_launcher.gyp:chrome_frame_helper',
857 'chrome_frame_launcher.gyp:chrome_frame_helper_dll', 884 'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
858 'locales/locales.gyp:*', 885 'locales/locales.gyp:*',
859 '../build/temp_gyp/googleurl.gyp:googleurl', 886 '../build/temp_gyp/googleurl.gyp:googleurl',
860 '../chrome/chrome.gyp:chrome', 887 '../chrome/chrome.gyp:chrome',
861 '../chrome/chrome.gyp:chrome_dll', 888 '../chrome/chrome.gyp:chrome_dll',
862 '../chrome/chrome.gyp:chrome_version_resources', 889 '../chrome/chrome.gyp:chrome_version_resources',
863 '../chrome/chrome.gyp:common', 890 '../chrome/chrome.gyp:common',
864 ], 891 ],
865 'sources': [ 892 'sources': [
866 'chrome_frame_elevation.rgs', 893 'chrome_frame_elevation.rgs',
867 'chrome_frame_reporting.cc', 894 'chrome_frame_reporting.cc',
868 'chrome_frame_reporting.h', 895 'chrome_frame_reporting.h',
869 'chrome_tab.cc', 896 'chrome_tab.cc',
870 'chrome_tab.def', 897 'chrome_tab.def',
871 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', 898 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
899 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/npchrome_frame_dll_version.rc',
872 # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can 900 # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
873 # figure out something more gyp-ish. 901 # figure out something more gyp-ish.
874 'resources/tlb_resource.rc', 902 'resources/tlb_resource.rc',
875 'chrome_tab.rgs', 903 'chrome_tab.rgs',
876 'chrome_tab_version.rc',
877 'resource.h', 904 'resource.h',
878 ], 905 ],
879 'conditions': [ 906 'conditions': [
880 ['OS=="win"', { 907 ['OS=="win"', {
881 # NOTE(slightlyoff): 908 # NOTE(slightlyoff):
882 # this is a fix for the include dirs length limit on the resource 909 # this is a fix for the include dirs length limit on the resource
883 # compiler, tickled by the xul_include_dirs variable 910 # compiler, tickled by the xul_include_dirs variable
884 'resource_include_dirs': [ 911 'resource_include_dirs': [
885 '<(INTERMEDIATE_DIR)' 912 '<(INTERMEDIATE_DIR)'
886 ], 913 ],
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 # Use outputs of this action as inputs for the main target build. 1077 # Use outputs of this action as inputs for the main target build.
1051 # Seems as a misnomer but makes this happy on Linux (scons). 1078 # Seems as a misnomer but makes this happy on Linux (scons).
1052 'process_outputs_as_sources': 1, 1079 'process_outputs_as_sources': 1,
1053 }, 1080 },
1054 ], 1081 ],
1055 }, 1082 },
1056 ], 1083 ],
1057 }, ], # 'coverage!=0' 1084 }, ], # 'coverage!=0'
1058 ], # 'conditions' 1085 ], # 'conditions'
1059 } 1086 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698