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

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

Issue 8589029: Start of mini_installer build config refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove packed_files.rc from mini_installer dependencies. It's used implicitly. Created 9 years, 1 month 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 | « no previous file | chrome/installer/mini_installer/mini_installer.rc » ('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 'includes': [ 10 'includes': [
11 '../../build/win_precompile.gypi', 11 '../../build/win_precompile.gypi',
12 ], 12 ],
13 'conditions': [ 13 'conditions': [
14 ['OS=="win"', { 14 ['OS=="win"', {
15 'target_defaults': { 15 'target_defaults': {
16 'dependencies': [ 16 'dependencies': [
17 '../chrome.gyp:chrome', 17 '../chrome.gyp:chrome',
18 '../chrome.gyp:chrome_nacl_win64', 18 '../chrome.gyp:chrome_nacl_win64',
19 '../chrome.gyp:chrome_dll', 19 '../chrome.gyp:chrome_dll',
20 '../chrome.gyp:default_extensions', 20 '../chrome.gyp:default_extensions',
21 '../chrome.gyp:setup', 21 '../chrome.gyp:setup',
22 ], 22 ],
23 'include_dirs': [ 23 'include_dirs': [
24 '../..', 24 '../..',
25 '<(PRODUCT_DIR)',
26 '<(INTERMEDIATE_DIR)', 25 '<(INTERMEDIATE_DIR)',
27 '<(SHARED_INTERMEDIATE_DIR)/chrome', 26 '<(SHARED_INTERMEDIATE_DIR)/chrome',
28 ], 27 ],
29 'sources': [ 28 'sources': [
30 'mini_installer/appid.h', 29 'mini_installer/appid.h',
31 'mini_installer/configuration.cc', 30 'mini_installer/configuration.cc',
32 'mini_installer/configuration.h', 31 'mini_installer/configuration.h',
33 'mini_installer/decompress.cc', 32 'mini_installer/decompress.cc',
34 'mini_installer/decompress.h', 33 'mini_installer/decompress.h',
35 'mini_installer/mini_installer.cc', 34 'mini_installer/mini_installer.cc',
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 201 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
203 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 202 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
204 '<(PRODUCT_DIR)/locales/en-US.pak', 203 '<(PRODUCT_DIR)/locales/en-US.pak',
205 '<(PRODUCT_DIR)/icudt.dll', 204 '<(PRODUCT_DIR)/icudt.dll',
206 ], 205 ],
207 'outputs': [ 206 'outputs': [
208 'xxx.out', 207 'xxx.out',
209 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', 208 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
210 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', 209 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
211 '<(PRODUCT_DIR)/setup.ex_', 210 '<(PRODUCT_DIR)/setup.ex_',
212 '<(PRODUCT_DIR)/packed_files.txt', 211 '<(INTERMEDIATE_DIR)/packed_files.rc',
213 ], 212 ],
214 'action': [ 213 'action': [
215 'python', 214 'python',
216 '<(create_installer_archive_py_path)', 215 '<(create_installer_archive_py_path)',
217 '--output_dir=<(PRODUCT_DIR)', 216 '--build_dir', '<(PRODUCT_DIR)',
218 '--input_file=<(RULE_INPUT_PATH)', 217 '--staging_dir', '<(INTERMEDIATE_DIR)',
218 '--input_file', '<(RULE_INPUT_PATH)',
219 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
219 # TODO(sgk): may just use environment variables 220 # TODO(sgk): may just use environment variables
220 #'--distribution=$(CHROMIUM_BUILD)', 221 #'--distribution=$(CHROMIUM_BUILD)',
221 '--distribution=_google_chrome', 222 '--distribution=_google_chrome',
222 # Optional arguments to generate diff installer 223 # Optional arguments to generate diff installer
223 #'--last_chrome_installer=C:/Temp/base', 224 #'--last_chrome_installer=C:/Temp/base',
224 #'--setup_exe_format=DIFF', 225 #'--setup_exe_format=DIFF',
225 #'--diff_algorithm=COURGETTE', 226 #'--diff_algorithm=COURGETTE',
226 ], 227 ],
227 'message': 'Create installer archive' 228 'message': 'Create installer archive'
228 }, 229 },
229 ], 230 ],
230 }, 231 },
231 ], 232 ],
232 }], 233 }],
233 [ 'branding == "Chrome"', { 234 [ 'branding == "Chrome"', {
234 'variables': { 235 'variables': {
235 'branding_dir': '../app/theme/google_chrome', 236 'branding_dir': '../app/theme/google_chrome',
236 }, 237 },
237 }, { # else branding!="Chrome" 238 }, { # else branding!="Chrome"
238 'variables': { 239 'variables': {
239 'branding_dir': '../app/theme/chromium', 240 'branding_dir': '../app/theme/chromium',
240 }, 241 },
241 }], 242 }],
242 ], 243 ],
243 } 244 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/mini_installer/mini_installer.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698