Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '<(DEPTH)/build/util/version.py', | 3 'version_py': '<(DEPTH)/build/util/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 'mini_installer_official_deps%': 0, | 10 'mini_installer_official_deps%': 0, |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 185 }], | 185 }], |
| 186 ['component == "shared_library"', { | 186 ['component == "shared_library"', { |
| 187 'variables': { | 187 'variables': { |
| 188 'component_build_flag': '--component_build=1', | 188 'component_build_flag': '--component_build=1', |
| 189 }, | 189 }, |
| 190 }, { | 190 }, { |
| 191 'variables': { | 191 'variables': { |
| 192 'component_build_flag': '', | 192 'component_build_flag': '', |
| 193 }, | 193 }, |
| 194 'outputs': [ | 194 'outputs': [ |
| 195 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', | 195 '<(PRODUCT_DIR)/chrome.packed.7z', |
|
scottmg
2015/01/29 23:32:41
this expanded to "chrome.release.packed.7z" which
| |
| 196 ], | 196 ], |
| 197 }], | 197 }], |
| 198 ['disable_nacl==1', { | 198 ['disable_nacl==1', { |
| 199 'inputs!': [ | 199 'inputs!': [ |
| 200 '<(PRODUCT_DIR)/nacl64.exe', | 200 '<(PRODUCT_DIR)/nacl64.exe', |
| 201 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 201 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 202 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 202 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 203 ], | 203 ], |
| 204 }], | 204 }], |
| 205 ['target_arch=="x64"', { | 205 ['target_arch=="x64"', { |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 236 '<(PRODUCT_DIR)/chrome.exe', | 236 '<(PRODUCT_DIR)/chrome.exe', |
| 237 '<(PRODUCT_DIR)/chrome.dll', | 237 '<(PRODUCT_DIR)/chrome.dll', |
| 238 '<(PRODUCT_DIR)/nacl64.exe', | 238 '<(PRODUCT_DIR)/nacl64.exe', |
| 239 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 239 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 240 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 240 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 241 '<(PRODUCT_DIR)/locales/en-US.pak', | 241 '<(PRODUCT_DIR)/locales/en-US.pak', |
| 242 ], | 242 ], |
| 243 'outputs': [ | 243 'outputs': [ |
| 244 # Also note that chrome.packed.7z is defined as an output in a | 244 # Also note that chrome.packed.7z is defined as an output in a |
| 245 # conditional above. | 245 # conditional above. |
| 246 'xxx2.out', | 246 '<(PRODUCT_DIR)/chrome.7z', |
|
scottmg
2015/01/29 23:32:41
this was to force an always-build which we're tryi
| |
| 247 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', | |
|
scottmg
2015/01/29 23:32:41
same as .packed.7z above
| |
| 248 '<(PRODUCT_DIR)/setup.ex_', | 247 '<(PRODUCT_DIR)/setup.ex_', |
| 249 '<(INTERMEDIATE_DIR)/packed_files.rc', | 248 '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 250 ], | 249 ], |
| 250 'depfile': [ | |
| 251 '<(INTERMEDIATE_DIR)/installer_archive.d', | |
|
scottmg
2015/01/29 23:32:41
this doesn't work yet (gyp only supports it on act
| |
| 252 ], | |
| 251 'action': [ | 253 'action': [ |
| 252 'python', | 254 'python', |
| 253 '<(create_installer_archive_py_path)', | 255 '<(create_installer_archive_py_path)', |
| 254 '--build_dir', '<(PRODUCT_DIR)', | 256 '--build_dir', '<(PRODUCT_DIR)', |
| 255 '--staging_dir', '<(INTERMEDIATE_DIR)', | 257 '--staging_dir', '<(INTERMEDIATE_DIR)', |
| 256 '--input_file', '<(RULE_INPUT_PATH)', | 258 '--input_file', '<(RULE_INPUT_PATH)', |
| 257 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', | 259 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 260 '--depfile', '<(INTERMEDIATE_DIR)/installer_archive.d', | |
| 258 '<(enable_hidpi_flag)', | 261 '<(enable_hidpi_flag)', |
| 259 '<(component_build_flag)', | 262 '<(component_build_flag)', |
| 260 '<(target_arch_flag)', | 263 '<(target_arch_flag)', |
| 261 # TODO(sgk): may just use environment variables | 264 # TODO(sgk): may just use environment variables |
| 262 #'--distribution=$(CHROMIUM_BUILD)', | 265 #'--distribution=$(CHROMIUM_BUILD)', |
| 263 '--distribution=_google_chrome', | 266 '--distribution=_google_chrome', |
| 264 # Optional arguments to generate diff installer | 267 # Optional arguments to generate diff installer |
| 265 #'--last_chrome_installer=C:/Temp/base', | 268 #'--last_chrome_installer=C:/Temp/base', |
| 266 #'--setup_exe_format=DIFF', | 269 #'--setup_exe_format=DIFF', |
| 267 #'--diff_algorithm=COURGETTE', | 270 #'--diff_algorithm=COURGETTE', |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 313 'variables': { | 316 'variables': { |
| 314 'branding_dir': '../app/theme/google_chrome', | 317 'branding_dir': '../app/theme/google_chrome', |
| 315 }, | 318 }, |
| 316 }, { # else branding!="Chrome" | 319 }, { # else branding!="Chrome" |
| 317 'variables': { | 320 'variables': { |
| 318 'branding_dir': '../app/theme/chromium', | 321 'branding_dir': '../app/theme/chromium', |
| 319 }, | 322 }, |
| 320 }], | 323 }], |
| 321 ], | 324 ], |
| 322 } | 325 } |
| OLD | NEW |