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, |
| (...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 builders are in sync. | |
|
Michael Moss
2013/07/19 21:04:24
nit: "sync" on the builders has (unfortunately) se
jschuh
2013/07/19 21:43:50
Done.
| |
| 152 'copies': [ | |
| 153 { | |
| 154 'destination': '<(PRODUCT_DIR)', | |
| 155 'files': [ | |
| 156 '<(INTERMEDIATE_DIR)/mini_installer_exe_version.rc', | |
| 157 ], | |
| 158 }, | |
| 159 ], | |
| 149 # TODO(mark): <(branding_dir) should be defined by the | 160 # TODO(mark): <(branding_dir) should be defined by the |
| 150 # global condition block at the bottom of the file, but | 161 # global condition block at the bottom of the file, but |
| 151 # this doesn't work due to the following issue: | 162 # this doesn't work due to the following issue: |
| 152 # | 163 # |
| 153 # http://code.google.com/p/gyp/issues/detail?id=22 | 164 # http://code.google.com/p/gyp/issues/detail?id=22 |
| 154 # | 165 # |
| 155 # Remove this block once the above issue is fixed. | 166 # Remove this block once the above issue is fixed. |
| 156 'conditions': [ | 167 'conditions': [ |
| 157 [ 'branding == "Chrome"', { | 168 [ 'branding == "Chrome"', { |
| 158 'variables': { | 169 'variables': { |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 293 'variables': { | 304 'variables': { |
| 294 'branding_dir': '../app/theme/google_chrome', | 305 'branding_dir': '../app/theme/google_chrome', |
| 295 }, | 306 }, |
| 296 }, { # else branding!="Chrome" | 307 }, { # else branding!="Chrome" |
| 297 'variables': { | 308 'variables': { |
| 298 'branding_dir': '../app/theme/chromium', | 309 'branding_dir': '../app/theme/chromium', |
| 299 }, | 310 }, |
| 300 }], | 311 }], |
| 301 ], | 312 ], |
| 302 } | 313 } |
| OLD | NEW |