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

Side by Side Diff: chrome_frame/chrome_frame_launcher.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: removed a few more stale dependencies on the version header 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 # Keep the archive builder happy. 9 # Keep the archive builder happy.
10 'chrome_personalization%': 1, 10 'chrome_personalization%': 1,
(...skipping 11 matching lines...) Expand all
22 'python': [ 22 'python': [
23 '<(DEPTH)\\third_party\\python_26\\setup_env.bat && python' 23 '<(DEPTH)\\third_party\\python_26\\setup_env.bat && python'
24 ], 24 ],
25 }, { # OS != win 25 }, { # OS != win
26 'python': [ 26 'python': [
27 'python' 27 'python'
28 ], 28 ],
29 }], 29 }],
30 ], 30 ],
31 }, 31 },
32 'includes': [
33 '../chrome/version.gypi',
34 ],
32 'target_defaults': { 35 'target_defaults': {
33 'include_dirs': [ 36 'include_dirs': [
34 # all our own includes are relative to src/ 37 # all our own includes are relative to src/
35 '..', 38 '..',
36 ], 39 ],
37 'configurations': { 40 'configurations': {
38 'Release_Base': { 41 'Release_Base': {
39 # Set flags to unconditionally optimize chrome_frame_launcher.exe 42 # Set flags to unconditionally optimize chrome_frame_launcher.exe
40 # for release builds. 43 # for release builds.
41 'msvs_settings': { 44 'msvs_settings': {
(...skipping 11 matching lines...) Expand all
53 }, 56 },
54 'VCLibrarianTool': { 57 'VCLibrarianTool': {
55 'AdditionalOptions': ['/ltcg', '/expectedoutputsize:120000000'], 58 'AdditionalOptions': ['/ltcg', '/expectedoutputsize:120000000'],
56 }, 59 },
57 }, 60 },
58 }, 61 },
59 }, 62 },
60 }, 63 },
61 'targets': [ 64 'targets': [
62 { 65 {
66 'target_name': 'chrome_frame_launcher_version_resources',
67 'type': 'none',
68 'conditions': [
69 ['branding == "Chrome"', {
70 'variables': {
71 'branding_path': '../chrome/app/theme/google_chrome/BRANDING',
72 },
73 }, { # else branding!="Chrome"
74 'variables': {
75 'branding_path': '../chrome/app/theme/chromium/BRANDING',
76 },
77 }],
78 ],
79 'variables': {
80 'output_dir': 'chrome_frame',
81 'template_input_path': 'chrome_frame_version.rc.version',
82 'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
83 'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
84 },
85 'direct_dependent_settings': {
86 'include_dirs': [
87 '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)',
88 ],
89 },
90 'sources': [
91 'chrome_frame_helper_dll.ver',
92 'chrome_frame_helper_exe.ver',
93 'chrome_launcher_exe.ver',
94 ],
95 'includes': [
96 '../chrome/version_resource_rules.gypi',
97 ],
98 },
99 {
63 'target_name': 'chrome_launcher', 100 'target_name': 'chrome_launcher',
64 'type': 'executable', 101 'type': 'executable',
65 'dependencies': [ 102 'dependencies': [
66 '../breakpad/breakpad.gyp:breakpad_handler', 103 '../breakpad/breakpad.gyp:breakpad_handler',
67 '../chrome/app/policy/cloud_policy_codegen.gyp:policy', 104 '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
68 '../chrome/chrome.gyp:chrome_version_header',
69 '../google_update/google_update.gyp:google_update', 105 '../google_update/google_update.gyp:google_update',
70 'chrome_frame.gyp:chrome_frame_utils', 106 'chrome_frame.gyp:chrome_frame_utils',
107 'chrome_frame_launcher_version_resources',
71 ], 108 ],
72 'sources': [ 109 'sources': [
110 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_launcher_exe_version.rc' ,
73 'chrome_launcher_main.cc', 111 'chrome_launcher_main.cc',
74 'chrome_launcher_version.rc',
75 'chrome_launcher.cc', 112 'chrome_launcher.cc',
76 'chrome_launcher.h', 113 'chrome_launcher.h',
77 'update_launcher.cc', 114 'update_launcher.cc',
78 'update_launcher.h' 115 'update_launcher.h'
79 ], 116 ],
80 'msvs_settings': { 117 'msvs_settings': {
81 'VCLinkerTool': { 118 'VCLinkerTool': {
82 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 119 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program.
83 'SubSystem': '2', 120 'SubSystem': '2',
84 'AdditionalDependencies': [ 121 'AdditionalDependencies': [
85 'shlwapi.lib', 122 'shlwapi.lib',
86 ], 123 ],
87 }, 124 },
88 }, 125 },
89 }, 126 },
90 { 127 {
91 'target_name': 'chrome_frame_helper', 128 'target_name': 'chrome_frame_helper',
92 'type': 'executable', 129 'type': 'executable',
93 'dependencies': [ 130 'dependencies': [
94 '../breakpad/breakpad.gyp:breakpad_handler', 131 '../breakpad/breakpad.gyp:breakpad_handler',
95 '../chrome/chrome.gyp:chrome_version_header',
96 'chrome_frame.gyp:chrome_frame_utils', 132 'chrome_frame.gyp:chrome_frame_utils',
97 'chrome_frame_helper_dll', 133 'chrome_frame_helper_dll',
98 'chrome_frame_helper_lib', 134 'chrome_frame_helper_lib',
135 'chrome_frame_launcher_version_resources',
99 ], 136 ],
100 'sources': [ 137 'sources': [
101 'chrome_frame_helper_main.cc', 138 'chrome_frame_helper_main.cc',
102 'chrome_frame_helper_version.rc', 139 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_helper_exe_version .rc',
103 ], 140 ],
104 'msvs_settings': { 141 'msvs_settings': {
105 'VCLinkerTool': { 142 'VCLinkerTool': {
106 'OutputFile': 143 'OutputFile':
107 '$(OutDir)\\$(ProjectName).exe', 144 '$(OutDir)\\$(ProjectName).exe',
108 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 145 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program.
109 'SubSystem': '2', 146 'SubSystem': '2',
110 }, 147 },
111 }, 148 },
112 }, 149 },
113 { 150 {
114 'target_name': 'chrome_frame_helper_dll', 151 'target_name': 'chrome_frame_helper_dll',
115 'type': 'shared_library', 152 'type': 'shared_library',
116 'dependencies': [ 153 'dependencies': [
117 '../chrome/chrome.gyp:chrome_version_header',
118 'chrome_frame.gyp:chrome_tab_idl', 154 'chrome_frame.gyp:chrome_tab_idl',
119 'chrome_frame_helper_lib', 155 'chrome_frame_helper_lib',
156 'chrome_frame_launcher_version_resources',
120 ], 157 ],
121 'sources': [ 158 'sources': [
122 'bho_loader.cc', 159 'bho_loader.cc',
123 'bho_loader.h', 160 'bho_loader.h',
124 'chrome_frame_helper_dll.cc', 161 'chrome_frame_helper_dll.cc',
125 'chrome_frame_helper_dll.def', 162 'chrome_frame_helper_dll.def',
126 'chrome_frame_helper_version.rc', 163 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_helper_dll_version .rc',
127 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', 164 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
128 'event_hooker.cc', 165 'event_hooker.cc',
129 'event_hooker.h', 166 'event_hooker.h',
130 'iids.cc', 167 'iids.cc',
131 ], 168 ],
132 'msvs_settings': { 169 'msvs_settings': {
133 'VCLinkerTool': { 170 'VCLinkerTool': {
134 'OutputFile': '$(OutDir)\\chrome_frame_helper.dll', 171 'OutputFile': '$(OutDir)\\chrome_frame_helper.dll',
135 'ProgramDatabaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb', 172 'ProgramDatabaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb',
136 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 173 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program.
137 'SubSystem': '2', 174 'SubSystem': '2',
138 }, 175 },
139 }, 176 },
140 }, 177 },
141 { 178 {
142 'target_name': 'chrome_frame_helper_lib', 179 'target_name': 'chrome_frame_helper_lib',
143 'type': 'static_library', 180 'type': 'static_library',
144 'dependencies': [ 181 'dependencies': [
145 '../chrome/chrome.gyp:chrome_version_header',
146 'chrome_frame.gyp:chrome_tab_idl', 182 'chrome_frame.gyp:chrome_tab_idl',
147 ], 183 ],
148 'sources': [ 184 'sources': [
149 'chrome_frame_helper_util.cc', 185 'chrome_frame_helper_util.cc',
150 'chrome_frame_helper_util.h', 186 'chrome_frame_helper_util.h',
151 'registry_watcher.cc', 187 'registry_watcher.cc',
152 'registry_watcher.h', 188 'registry_watcher.h',
153 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', 189 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
154 'iids.cc', 190 'iids.cc',
155 ], 191 ],
156 'msvs_settings': { 192 'msvs_settings': {
157 'VCLinkerTool': { 193 'VCLinkerTool': {
158 'AdditionalDependencies': [ 194 'AdditionalDependencies': [
159 'shlwapi.lib', 195 'shlwapi.lib',
160 ], 196 ],
161 }, 197 },
162 }, 198 },
163 }, 199 },
164 ], 200 ],
165 } 201 }
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_helper_version.rc ('k') | chrome_frame/chrome_frame_version.rc.version » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698