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

Side by Side Diff: chrome/installer/mini_installer.gyp

Issue 2839009: Include the Chrome Frame binary in Chrome installers. Note that it will only ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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
« no previous file with comments | « build/all.gyp ('k') | chrome/installer/mini_installer/appid.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 '--distribution=_google_chrome', 194 '--distribution=_google_chrome',
195 # Optional arguments to generate diff installer 195 # Optional arguments to generate diff installer
196 #'--last_chrome_installer=C:/Temp/base', 196 #'--last_chrome_installer=C:/Temp/base',
197 #'--setup_exe_format=DIFF', 197 #'--setup_exe_format=DIFF',
198 #'--diff_algorithm=COURGETTE', 198 #'--diff_algorithm=COURGETTE',
199 ], 199 ],
200 'message': 'Create installer archive' 200 'message': 'Create installer archive'
201 }, 201 },
202 ], 202 ],
203 }, 203 },
204 {
205 'target_name': 'chrome_frame_mini_installer',
206 'type': 'executable',
207 'msvs_guid': '2F3651F5-4662-4565-A4F6-AD15B0E893AA',
208 'sources': [
209 'mini_installer/chrome_frame.release',
210 'mini_installer/chrome_frame_appid.cc',
211 ],
212 'dependencies': [
213 # Artificially make this depend on the other to avoid
214 # problems with parallel packaging scripts being run.
215 'mini_installer',
216 ],
217 'rules': [
218 {
219 'rule_name': 'installer_archive',
220 'extension': 'release',
221 'variables': {
222 'create_installer_archive_py_path':
223 '../tools/build/win/create_installer_archive.py',
224 },
225 'inputs': [
226 '<(create_installer_archive_py_path)',
227 '<(PRODUCT_DIR)/chrome.exe',
228 '<(PRODUCT_DIR)/chrome.dll',
229 '<(PRODUCT_DIR)/nacl64.exe',
230 '<(PRODUCT_DIR)/nacl64.dll',
231 '<(PRODUCT_DIR)/locales/en-US.dll',
232 '<(PRODUCT_DIR)/icudt42.dll',
233 ],
234 'outputs': [
235 'xxx.out',
236 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
237 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
238 '<(PRODUCT_DIR)/setup.ex_',
239 '<(PRODUCT_DIR)/packed_files.txt',
240 ],
241 'action': [
242 'python',
243 '<(create_installer_archive_py_path)',
244 '--output_dir=<(PRODUCT_DIR)',
245 '--input_file=<(RULE_INPUT_PATH)',
246 # TODO(sgk): may just use environment variables
247 #'--distribution=$(CHROMIUM_BUILD)',
248 '--distribution=_google_chrome',
249 '--archive_prefix=cf',
250 '--output_name=chrome_frame',
251 # Optional arguments to generate diff installer
252 #'--last_chrome_installer=C:/Temp/base',
253 #'--setup_exe_format=DIFF',
254 #'--diff_algorithm=COURGETTE',
255 ],
256 'message': 'Create Chrome Frame installer archive'
257 },
258 ],
259 },
260 ], 204 ],
261 }], 205 }],
262 [ 'branding == "Chrome"', { 206 [ 'branding == "Chrome"', {
263 'variables': { 207 'variables': {
264 'branding_dir': '../app/theme/google_chrome', 208 'branding_dir': '../app/theme/google_chrome',
265 }, 209 },
266 }, { # else branding!="Chrome" 210 }, { # else branding!="Chrome"
267 'variables': { 211 'variables': {
268 'branding_dir': '../app/theme/chromium', 212 'branding_dir': '../app/theme/chromium',
269 }, 213 },
270 }], 214 }],
271 ], 215 ],
272 } 216 }
273 217
274 # Local Variables: 218 # Local Variables:
275 # tab-width:2 219 # tab-width:2
276 # indent-tabs-mode:nil 220 # indent-tabs-mode:nil
277 # End: 221 # End:
278 # vim: set expandtab tabstop=2 shiftwidth=2: 222 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/installer/mini_installer/appid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698