Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 'mini_installer_official_deps%': 0, | 10 'mini_installer_official_deps%': 0, |
| 11 'skip_compress_archive%': 0, | |
| 11 }, | 12 }, |
| 12 'includes': [ | 13 'includes': [ |
| 13 '../../build/win_precompile.gypi', | 14 '../../build/win_precompile.gypi', |
| 14 ], | 15 ], |
| 15 'conditions': [ | 16 'conditions': [ |
| 16 ['OS=="win"', { | 17 ['OS=="win"', { |
| 17 'target_defaults': { | 18 'target_defaults': { |
| 18 'dependencies': [ | 19 'dependencies': [ |
| 19 '../chrome.gyp:app_host', | 20 '../chrome.gyp:app_host', |
| 20 '../chrome.gyp:chrome', | 21 '../chrome.gyp:chrome', |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 217 }], | 218 }], |
| 218 ['component == "shared_library"', { | 219 ['component == "shared_library"', { |
| 219 'variables': { | 220 'variables': { |
| 220 'component_build_flag': '--component_build=1', | 221 'component_build_flag': '--component_build=1', |
| 221 }, | 222 }, |
| 222 }, { | 223 }, { |
| 223 'variables': { | 224 'variables': { |
| 224 'component_build_flag': '', | 225 'component_build_flag': '', |
| 225 }, | 226 }, |
| 226 }], | 227 }], |
| 228 ['skip_compress_archive == 1', { | |
| 229 'variables': { | |
| 230 'skip_compress_archive_flag': '--skip_compress_archive=1', | |
| 231 }, | |
| 232 }, { | |
| 233 'variables': { | |
| 234 'skip_compress_archive_flag': '', | |
| 235 }, | |
| 236 }], | |
| 227 ['disable_nacl==1', { | 237 ['disable_nacl==1', { |
| 228 'inputs!': [ | 238 'inputs!': [ |
| 229 '<(PRODUCT_DIR)/nacl64.exe', | 239 '<(PRODUCT_DIR)/nacl64.exe', |
| 230 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 240 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
| 231 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 241 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 232 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 242 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 233 ], | 243 ], |
| 234 }], | 244 }], |
| 235 ], | 245 ], |
| 236 'inputs': [ | 246 'inputs': [ |
| 237 '<(create_installer_archive_py_path)', | 247 '<(create_installer_archive_py_path)', |
| 238 '<(PRODUCT_DIR)/app_host.exe', | 248 '<(PRODUCT_DIR)/app_host.exe', |
| 239 '<(PRODUCT_DIR)/chrome.exe', | 249 '<(PRODUCT_DIR)/chrome.exe', |
| 240 '<(PRODUCT_DIR)/chrome.dll', | 250 '<(PRODUCT_DIR)/chrome.dll', |
| 241 '<(PRODUCT_DIR)/nacl64.exe', | 251 '<(PRODUCT_DIR)/nacl64.exe', |
| 242 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 252 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
| 243 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 253 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 244 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 254 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 245 '<(PRODUCT_DIR)/locales/en-US.pak', | 255 '<(PRODUCT_DIR)/locales/en-US.pak', |
| 246 '<(PRODUCT_DIR)/icudt.dll', | 256 '<(PRODUCT_DIR)/icudt.dll', |
| 247 ], | 257 ], |
| 248 'outputs': [ | 258 'outputs': [ |
| 249 'xxx2.out', | 259 'xxx2.out', |
| 250 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', | 260 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', |
| 251 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', | 261 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', |
|
robertshield
2012/08/14 16:45:28
this still specifies the packed.7z as an output, w
gab
2012/08/14 19:15:37
no, I think outputs only matter for targets that d
| |
| 252 '<(PRODUCT_DIR)/setup.ex_', | 262 '<(PRODUCT_DIR)/setup.ex_', |
| 253 '<(INTERMEDIATE_DIR)/packed_files.rc', | 263 '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 254 ], | 264 ], |
| 255 'action': [ | 265 'action': [ |
| 256 'python', | 266 'python', |
| 257 '<(create_installer_archive_py_path)', | 267 '<(create_installer_archive_py_path)', |
| 258 '--build_dir', '<(PRODUCT_DIR)', | 268 '--build_dir', '<(PRODUCT_DIR)', |
| 259 '--staging_dir', '<(INTERMEDIATE_DIR)', | 269 '--staging_dir', '<(INTERMEDIATE_DIR)', |
| 260 '--input_file', '<(RULE_INPUT_PATH)', | 270 '--input_file', '<(RULE_INPUT_PATH)', |
| 261 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', | 271 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 262 '<(enable_hidpi_flag)', | 272 '<(enable_hidpi_flag)', |
| 263 '<(enable_touch_ui_flag)', | 273 '<(enable_touch_ui_flag)', |
| 264 '<(component_build_flag)', | 274 '<(component_build_flag)', |
| 275 '<(skip_compress_archive_flag)', | |
| 265 # TODO(sgk): may just use environment variables | 276 # TODO(sgk): may just use environment variables |
| 266 #'--distribution=$(CHROMIUM_BUILD)', | 277 #'--distribution=$(CHROMIUM_BUILD)', |
| 267 '--distribution=_google_chrome', | 278 '--distribution=_google_chrome', |
| 268 # Optional arguments to generate diff installer | 279 # Optional arguments to generate diff installer |
| 269 #'--last_chrome_installer=C:/Temp/base', | 280 #'--last_chrome_installer=C:/Temp/base', |
| 270 #'--setup_exe_format=DIFF', | 281 #'--setup_exe_format=DIFF', |
| 271 #'--diff_algorithm=COURGETTE', | 282 #'--diff_algorithm=COURGETTE', |
| 272 ], | 283 ], |
| 273 'message': 'Create installer archive' | 284 'message': 'Create installer archive' |
| 274 }, | 285 }, |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 287 'variables': { | 298 'variables': { |
| 288 'branding_dir': '../app/theme/google_chrome', | 299 'branding_dir': '../app/theme/google_chrome', |
| 289 }, | 300 }, |
| 290 }, { # else branding!="Chrome" | 301 }, { # else branding!="Chrome" |
| 291 'variables': { | 302 'variables': { |
| 292 'branding_dir': '../app/theme/chromium', | 303 'branding_dir': '../app/theme/chromium', |
| 293 }, | 304 }, |
| 294 }], | 305 }], |
| 295 ], | 306 ], |
| 296 } | 307 } |
| OLD | NEW |