| 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, |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 '<(target_arch_flag)', | 254 '<(target_arch_flag)', |
| 255 # TODO(sgk): may just use environment variables | 255 # TODO(sgk): may just use environment variables |
| 256 #'--distribution=$(CHROMIUM_BUILD)', | 256 #'--distribution=$(CHROMIUM_BUILD)', |
| 257 '--distribution=_google_chrome', | 257 '--distribution=_google_chrome', |
| 258 # Optional arguments to generate diff installer | 258 # Optional arguments to generate diff installer |
| 259 #'--last_chrome_installer=C:/Temp/base', | 259 #'--last_chrome_installer=C:/Temp/base', |
| 260 #'--setup_exe_format=DIFF', | 260 #'--setup_exe_format=DIFF', |
| 261 #'--diff_algorithm=COURGETTE', | 261 #'--diff_algorithm=COURGETTE', |
| 262 ], | 262 ], |
| 263 'message': 'Create installer archive', | 263 'message': 'Create installer archive', |
| 264 'msvs_cygwin_shell': 1, | |
| 265 }, | 264 }, |
| 266 ], | 265 ], |
| 267 # TODO(mark): <(branding_dir) should be defined by the | 266 # TODO(mark): <(branding_dir) should be defined by the |
| 268 # global condition block at the bottom of the file, but | 267 # global condition block at the bottom of the file, but |
| 269 # this doesn't work due to the following issue: | 268 # this doesn't work due to the following issue: |
| 270 # | 269 # |
| 271 # http://code.google.com/p/gyp/issues/detail?id=22 | 270 # http://code.google.com/p/gyp/issues/detail?id=22 |
| 272 # | 271 # |
| 273 # Remove this block once the above issue is fixed. | 272 # Remove this block once the above issue is fixed. |
| 274 'conditions': [ | 273 'conditions': [ |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 'variables': { | 308 'variables': { |
| 310 'branding_dir': '../app/theme/google_chrome', | 309 'branding_dir': '../app/theme/google_chrome', |
| 311 }, | 310 }, |
| 312 }, { # else branding!="Chrome" | 311 }, { # else branding!="Chrome" |
| 313 'variables': { | 312 'variables': { |
| 314 'branding_dir': '../app/theme/chromium', | 313 'branding_dir': '../app/theme/chromium', |
| 315 }, | 314 }, |
| 316 }], | 315 }], |
| 317 ], | 316 ], |
| 318 } | 317 } |
| OLD | NEW |