diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 05:03:39 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 05:03:39 +0000 |
| commit | d09e3de46fae6200b0cd1a79867dcbd147db938a (patch) | |
| tree | 2cd3b3aa632930e8d294ce5bb1b9e6423b06bbc9 /chrome/installer | |
| parent | 335ee05f3a724cead4c7fea90e1f1dbbdb9926fd (diff) | |
| download | chromium_src-d09e3de46fae6200b0cd1a79867dcbd147db938a.zip chromium_src-d09e3de46fae6200b0cd1a79867dcbd147db938a.tar.gz chromium_src-d09e3de46fae6200b0cd1a79867dcbd147db938a.tar.bz2 | |
Using $CHROME_SRC_DIR in place of hash/..
This will facilitate changing where the main sconstruct lives.
Review URL: http://codereview.chromium.org/7847
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer/SConscript | 6 | ||||
| -rw-r--r-- | chrome/installer/setup/SConscript | 4 | ||||
| -rw-r--r-- | chrome/installer/util/SConscript | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index f2a8269..e1dfe0c 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -17,7 +17,7 @@ env_res.Append( CPPPATH = [ "$TARGET_ROOT", ".", - "#/..", + "$CHROME_SRC_DIR", ], RCFLAGS = [ ["/l", "0x409"], @@ -31,7 +31,7 @@ env.Prepend( CPPPATH = [ '$GTEST_DIR/include', '$GTEST_DIR', - '#/..', + '$CHROME_SRC_DIR', ], CCFLAGS = [ '/TP', @@ -109,7 +109,7 @@ env_test.Prepend( CPPPATH = [ '$GTEST_DIR/include', '$GTEST_DIR', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'gtest', diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index a920f31..edd5a3e 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -12,7 +12,7 @@ env_res.Append( CPPPATH = [ "$TARGET_ROOT", ".", - "#/..", + "$CHROME_SRC_DIR", ], RCFLAGS = [ ["/l", "0x409"], @@ -30,7 +30,7 @@ env.Prepend( '../util', '$TARGET_ROOT', '.', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'base', diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript index 706cff9..fde62a7a 100644 --- a/chrome/installer/util/SConscript +++ b/chrome/installer/util/SConscript @@ -22,7 +22,7 @@ env.Prepend( '$LIBJPEG_DIR', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', - '#/..', + '$CHROME_SRC_DIR', '.', ], CPPDEFINES = [ @@ -66,7 +66,8 @@ x = env.ChromeStaticLibrary('util', input_files) # create_string_rc.py imports FP.py from the tools/grit/grit/extern # 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.AppendENVPath('PYTHONPATH', + [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath]) 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', |