diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 20:57:15 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 20:57:15 +0000 |
| commit | 25bb03dea120ab270321e0c34bf19181c2461175 (patch) | |
| tree | 130ef9b6007a77504166ab227946a61fd82d0fb9 /chrome/installer | |
| parent | a488d3d9f722b4fea22dfb726ef8b29b6e15861e (diff) | |
| download | chromium_src-25bb03dea120ab270321e0c34bf19181c2461175.zip chromium_src-25bb03dea120ab270321e0c34bf19181c2461175.tar.gz chromium_src-25bb03dea120ab270321e0c34bf19181c2461175.tar.bz2 | |
SCons build accommodation of change from generated setup_string.{rc,h}
to generated installer_util_strings.{rc,h}.
TBR: rahulk
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1056 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/SConscript | 2 | ||||
| -rw-r--r-- | chrome/installer/util/SConscript | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index a625d64..1d01a72 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -47,7 +47,7 @@ env_res.Append( resources = [ env_res.RES('setup.rc'), - env_res.RES('../util/setup_strings.rc'), + env_res.RES('../util/installer_util_strings.rc'), ] diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript index c826c63..4eb541c 100644 --- a/chrome/installer/util/SConscript +++ b/chrome/installer/util/SConscript @@ -91,8 +91,8 @@ x = env.ChromeStaticLibrary('util', input_files) # directory, so add that to PYTHONPATH for this command execution. env_x = env.Clone() env_x.AppendENVPath('PYTHONPATH', [Dir('#/../tools/grit/grit/extern').abspath]) -env_x.Command(['$CHROME_DIR/installer/util/setup_strings.rc', - '$CHROME_DIR/installer/util/setup_strings.h'], +env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', + '$CHROME_DIR/installer/util/installer_util_strings.h'], ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', '$CHROME_DIR/app/generated_resources.grd'] + env.Glob('$CHROME_DIR/app/resources/*.xtb'), |