diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 13:39:33 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 13:39:33 +0000 |
| commit | d4ae33bd4278e7fc279695319d9454141740191e (patch) | |
| tree | 76814682d5a76d6d48368ea6f8f97706e4ba5d51 /chrome/chrome_installer.gypi | |
| parent | f33c522f5bbcb2defe6a446404a7f269780953a3 (diff) | |
| download | chromium_src-d4ae33bd4278e7fc279695319d9454141740191e.zip chromium_src-d4ae33bd4278e7fc279695319d9454141740191e.tar.gz chromium_src-d4ae33bd4278e7fc279695319d9454141740191e.tar.bz2 | |
Fix sorting of the installer strings .h and .rc files. Resources that were substrings of others (IDS_INSTALL_HIGHER_VERSION and IDS_INSTALL_HIGHER_VERSION_CF, for example) were being sorted incorrectly. Now they aren't.
As a bonus, installer_util_strings now depends on create_string_py, so changes to the scipt no longer require a clobber. Yay
BUG=73884
TEST=build installer_util_strings then look at the generated .h and .rc files and notice that they are sorted properly
Review URL: http://codereview.chromium.org/6594108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index d566ef9..573d209d 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -123,7 +123,11 @@ { 'rule_name': 'installer_util_strings', 'extension': 'grd', + 'variables': { + 'create_string_rc_py' : 'installer/util/prebuild/create_string_rc.py', + }, 'inputs': [ + '<(create_string_rc_py)', '<(RULE_INPUT_PATH)', ], 'outputs': [ @@ -134,7 +138,7 @@ '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h', ], 'action': ['python', - 'installer/util/prebuild/create_string_rc.py', + '<(create_string_rc_py)', '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', '<(branding)',], 'message': 'Generating resources from <(RULE_INPUT_PATH)', |