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': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/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 }, | 7 }, |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../../build/common.gypi', | 9 '../../build/common.gypi', |
| 10 ], | 10 ], |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 168 'util/version_unittest.cc', | 168 'util/version_unittest.cc', |
| 169 ], | 169 ], |
| 170 'msvs_settings': { | 170 'msvs_settings': { |
| 171 'VCManifestTool': { | 171 'VCManifestTool': { |
| 172 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\mini_in staller.exe.manifest', | 172 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\mini_in staller.exe.manifest', |
| 173 }, | 173 }, |
| 174 }, | 174 }, |
| 175 }, | 175 }, |
| 176 { | 176 { |
| 177 'target_name': 'installer_util_strings', | 177 'target_name': 'installer_util_strings', |
| 178 'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013', | |
| 179 # See hack in chrome.gyp:chrome_strings | |
| 178 'type': 'dummy_executable', | 180 'type': 'dummy_executable', |
|
bradn
2009/09/08 21:14:37
Can this turn into 'none' after this change?
| |
| 179 'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013', | 181 'rules': [ |
| 180 'actions': [ | |
| 181 { | 182 { |
| 182 # TODO(sgk): Clean this up so that we pass in the | 183 'rule_name': 'installer_util_strings', |
| 183 # file names to the script instead of having it hard-code | 184 'extension': 'grd', |
| 184 # matching path names internally. | |
| 185 'action_name': 'installer_util_strings', | |
| 186 'inputs': [ | 185 'inputs': [ |
| 187 'util/prebuild/create_string_rc.py', | 186 # Hardcoded for now. |
| 188 '../app/generated_resources.grd', | 187 '../app/generated_resources.grd', |
| 189 ], | 188 ], |
| 190 'outputs': [ | 189 'outputs': [ |
| 191 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti l_strings.rc', | 190 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/<(RULE_INPUT_ ROOT).h', |
| 192 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti l_strings.h', | |
| 193 ], | 191 ], |
| 194 'action': [ | 192 'action': ['../../third_party/python_24/python.exe', |
|
bradn
2009/09/08 21:14:37
without msvs_cygwin_shell:0, you should be able to
| |
| 195 # The create_string_rc.py script requires the checked-in | 193 'util/prebuild/create_string_rc.py', |
| 196 # python.exe that has google modules installed, and | 194 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings'], |
| 197 # a PYTHONPATH pointing to grit so it can import FP. | 195 'message': 'Generating resources from <(RULE_INPUT_PATH)', |
| 198 # TODO: clean this up | |
| 199 'set PYTHONPATH=../../tools/grit/grit/extern', '&&', | |
| 200 '../../third_party/python_24/python.exe', | |
| 201 'util/prebuild/create_string_rc.py', | |
| 202 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings' | |
| 203 ], | |
| 204 'msvs_cygwin_shell': 0, | |
| 205 }, | 196 }, |
| 206 ], | 197 ], |
| 198 'sources': [ | |
| 199 '../app/generated_resources.grd', | |
| 200 ], | |
| 207 'direct_dependent_settings': { | 201 'direct_dependent_settings': { |
| 208 'include_dirs': [ | 202 'include_dirs': [ |
| 209 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', | 203 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', |
| 210 ], | 204 ], |
| 211 }, | 205 }, |
| 212 }, | 206 }, |
| 213 { | 207 { |
| 214 'target_name': 'mini_installer_test', | 208 'target_name': 'mini_installer_test', |
| 215 'type': 'executable', | 209 'type': 'executable', |
| 216 'msvs_guid': '4B6E199A-034A-49BD-AB93-458DD37E45B1', | 210 'msvs_guid': '4B6E199A-034A-49BD-AB93-458DD37E45B1', |
| 217 'dependencies': [ | 211 'dependencies': [ |
| 218 'installer_util', | 212 'installer_util', |
| 219 '../../base/base.gyp:base', | 213 '../../base/base.gyp:base', |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 626 'variables': { | 620 'variables': { |
| 627 'branding_dir': '../app/theme/google_chrome', | 621 'branding_dir': '../app/theme/google_chrome', |
| 628 }, | 622 }, |
| 629 }, { # else branding!="Chrome" | 623 }, { # else branding!="Chrome" |
| 630 'variables': { | 624 'variables': { |
| 631 'branding_dir': '../app/theme/chromium', | 625 'branding_dir': '../app/theme/chromium', |
| 632 }, | 626 }, |
| 633 }], | 627 }], |
| 634 ], | 628 ], |
| 635 } | 629 } |
| OLD | NEW |