| 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 '-f', '<(version_path)', | 139 '-f', '<(version_path)', |
| 140 '-f', '<(lastchange_path)', | 140 '-f', '<(lastchange_path)', |
| 141 '-f', '<(branding_dir)/BRANDING', | 141 '-f', '<(branding_dir)/BRANDING', |
| 142 '<(template_input_path)', | 142 '<(template_input_path)', |
| 143 '<@(_outputs)', | 143 '<@(_outputs)', |
| 144 ], | 144 ], |
| 145 'process_outputs_as_sources': 1, | 145 'process_outputs_as_sources': 1, |
| 146 'message': 'Generating version information' | 146 'message': 'Generating version information' |
| 147 }, | 147 }, |
| 148 ], | 148 ], |
| 149 # Copy the version file to a known location for FILES.cfg | |
| 150 # TODO(jschuh): crbug.com/262193 Remove this copy and output | |
| 151 # directly to PRODUCT_DIR when the official builders are | |
| 152 # verified to not need the intermediate location. | |
| 153 'copies': [ | |
| 154 { | |
| 155 'destination': '<(PRODUCT_DIR)', | |
| 156 'files': [ | |
| 157 '<(INTERMEDIATE_DIR)/mini_installer_exe_version.rc', | |
| 158 ], | |
| 159 }, | |
| 160 ], | |
| 161 # TODO(mark): <(branding_dir) should be defined by the | 149 # TODO(mark): <(branding_dir) should be defined by the |
| 162 # global condition block at the bottom of the file, but | 150 # global condition block at the bottom of the file, but |
| 163 # this doesn't work due to the following issue: | 151 # this doesn't work due to the following issue: |
| 164 # | 152 # |
| 165 # http://code.google.com/p/gyp/issues/detail?id=22 | 153 # http://code.google.com/p/gyp/issues/detail?id=22 |
| 166 # | 154 # |
| 167 # Remove this block once the above issue is fixed. | 155 # Remove this block once the above issue is fixed. |
| 168 'conditions': [ | 156 'conditions': [ |
| 169 [ 'branding == "Chrome"', { | 157 [ 'branding == "Chrome"', { |
| 170 'variables': { | 158 'variables': { |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 'variables': { | 293 'variables': { |
| 306 'branding_dir': '../app/theme/google_chrome', | 294 'branding_dir': '../app/theme/google_chrome', |
| 307 }, | 295 }, |
| 308 }, { # else branding!="Chrome" | 296 }, { # else branding!="Chrome" |
| 309 'variables': { | 297 'variables': { |
| 310 'branding_dir': '../app/theme/chromium', | 298 'branding_dir': '../app/theme/chromium', |
| 311 }, | 299 }, |
| 312 }], | 300 }], |
| 313 ], | 301 ], |
| 314 } | 302 } |
| OLD | NEW |