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

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

Issue 9701050: Make setup.exe compatible with the component build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment nits Created 8 years, 7 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 { 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': '<(DEPTH)/build/util/LASTCHANGE', 5 'lastchange_path': '<(DEPTH)/build/util/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 'mini_installer_internal_deps%': 0, 9 'mini_installer_internal_deps%': 0,
10 }, 10 },
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 }], 206 }],
207 ['enable_metro == 1', { 207 ['enable_metro == 1', {
208 'variables': { 208 'variables': {
209 'enable_metro_flag': '--enable_metro=1', 209 'enable_metro_flag': '--enable_metro=1',
210 }, 210 },
211 }, { 211 }, {
212 'variables': { 212 'variables': {
213 'enable_metro_flag': '', 213 'enable_metro_flag': '',
214 }, 214 },
215 }], 215 }],
216 ['component == "shared_library"', {
217 'variables': {
218 'component_build_flag': '--component_build=1',
219 },
220 }, {
221 'variables': {
222 'component_build_flag': '',
223 },
224 }],
216 ], 225 ],
217 'inputs': [ 226 'inputs': [
218 '<(create_installer_archive_py_path)', 227 '<(create_installer_archive_py_path)',
219 '<(PRODUCT_DIR)/chrome.exe', 228 '<(PRODUCT_DIR)/chrome.exe',
220 '<(PRODUCT_DIR)/chrome.dll', 229 '<(PRODUCT_DIR)/chrome.dll',
221 '<(PRODUCT_DIR)/nacl64.exe', 230 '<(PRODUCT_DIR)/nacl64.exe',
222 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 231 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
223 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 232 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
224 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 233 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
225 '<(PRODUCT_DIR)/locales/en-US.pak', 234 '<(PRODUCT_DIR)/locales/en-US.pak',
226 '<(PRODUCT_DIR)/icudt.dll', 235 '<(PRODUCT_DIR)/icudt.dll',
227 ], 236 ],
228 'outputs': [ 237 'outputs': [
229 'xxx2.out', 238 'xxx2.out',
230 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', 239 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
231 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', 240 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
232 '<(PRODUCT_DIR)/setup.ex_', 241 '<(PRODUCT_DIR)/setup.ex_',
233 '<(INTERMEDIATE_DIR)/packed_files.rc', 242 '<(INTERMEDIATE_DIR)/packed_files.rc',
234 ], 243 ],
235 'action': [ 244 'action': [
236 'python', 245 'python',
237 '<(create_installer_archive_py_path)', 246 '<(create_installer_archive_py_path)',
238 '--build_dir', '<(PRODUCT_DIR)', 247 '--build_dir', '<(PRODUCT_DIR)',
239 '--staging_dir', '<(INTERMEDIATE_DIR)', 248 '--staging_dir', '<(INTERMEDIATE_DIR)',
240 '--input_file', '<(RULE_INPUT_PATH)', 249 '--input_file', '<(RULE_INPUT_PATH)',
241 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', 250 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
242 '<(enable_hidpi_flag)', 251 '<(enable_hidpi_flag)',
243 '<(enable_metro_flag)', 252 '<(enable_metro_flag)',
253 '<(component_build_flag)',
244 # TODO(sgk): may just use environment variables 254 # TODO(sgk): may just use environment variables
245 #'--distribution=$(CHROMIUM_BUILD)', 255 #'--distribution=$(CHROMIUM_BUILD)',
246 '--distribution=_google_chrome', 256 '--distribution=_google_chrome',
247 # Optional arguments to generate diff installer 257 # Optional arguments to generate diff installer
248 #'--last_chrome_installer=C:/Temp/base', 258 #'--last_chrome_installer=C:/Temp/base',
249 #'--setup_exe_format=DIFF', 259 #'--setup_exe_format=DIFF',
250 #'--diff_algorithm=COURGETTE', 260 #'--diff_algorithm=COURGETTE',
251 ], 261 ],
252 'message': 'Create installer archive' 262 'message': 'Create installer archive'
253 }, 263 },
(...skipping 12 matching lines...) Expand all
266 'variables': { 276 'variables': {
267 'branding_dir': '../app/theme/google_chrome', 277 'branding_dir': '../app/theme/google_chrome',
268 }, 278 },
269 }, { # else branding!="Chrome" 279 }, { # else branding!="Chrome"
270 'variables': { 280 'variables': {
271 'branding_dir': '../app/theme/chromium', 281 'branding_dir': '../app/theme/chromium',
272 }, 282 },
273 }], 283 }],
274 ], 284 ],
275 } 285 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698