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 /build | |
| 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 'build')
| -rw-r--r-- | build/SConscript.main | 10 | ||||
| -rw-r--r-- | build/SConscript.v8 | 4 | ||||
| -rw-r--r-- | build/googleurl_lib.scons | 2 | ||||
| -rw-r--r-- | build/googleurl_unittests.scons | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index f8e6882..1bc7548 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -28,9 +28,9 @@ else: env = Environment( BUILD_TYPE = ARGUMENTS.get('BUILD_TYPE', 'Hammer'), - TARGET_ROOT = '#/$BUILD_TYPE', + CHROME_SRC_DIR = Dir('#/..').abspath, + TARGET_ROOT = Dir('#/$BUILD_TYPE').abspath, OBJ_ROOT = '$TARGET_ROOT', - ROOT_DIR = '#/..', LIBS_DIR = '$OBJ_ROOT/Libs', @@ -456,8 +456,8 @@ env.Decider('MD5-timestamp') # Overlay things from a layer below. -env.Dir('$TARGET_ROOT').addRepository(Dir('#/..')) -env.Dir('$TARGET_ROOT/googleurl').addRepository(env.Dir('$ROOT_DIR/build')) +env.Dir('$TARGET_ROOT').addRepository(env.Dir('$CHROME_SRC_DIR')) +env.Dir('$TARGET_ROOT/googleurl').addRepository(env.Dir('$CHROME_SRC_DIR/build')) included = [c for c in load if not c.startswith('-')] excluded = [c[1:] for c in load if c.startswith('-')] @@ -539,7 +539,7 @@ if LoadComponent('third_party'): '$BSPATCH_DIR/SConscript', ]) -if LoadComponent('v8') and env.Dir('#/../v8').exists(): +if LoadComponent('v8') and env.Dir('$CHROME_SRC_DIR/v8').exists(): env.SConscript('SConscript.v8', exports=['env']) diff --git a/build/SConscript.v8 b/build/SConscript.v8 index 8eeef09..2d24fcf 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -13,7 +13,7 @@ except AttributeError: env = env.Clone( V8_MODE = 'release', - V8_SRC_DIR = '#/../v8', + V8_SRC_DIR = '$CHROME_SRC_DIR/v8', V8_MODE_DIR = '$V8_SRC_DIR/obj/$V8_MODE', V8_SCONS_COM = 'cd ../v8 && $PYTHON $SCONS $SCONSFLAGS mode=$V8_MODE', SCONS='../third_party/scons/scons.py', @@ -49,7 +49,7 @@ v8_scons_targets_on = [ if env['PLATFORM'] == 'win32': v8_scons_targets_off.extend([ - env.File('#/../v8/vc80.pdb') + env.File('$CHROME_SRC_DIR/v8/vc80.pdb') ]) v8 = env.Command(v8_scons_targets_off + v8_scons_targets_on, diff --git a/build/googleurl_lib.scons b/build/googleurl_lib.scons index cbb403f..6738fea 100644 --- a/build/googleurl_lib.scons +++ b/build/googleurl_lib.scons @@ -16,7 +16,7 @@ env.SConscript([ env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/build/googleurl_unittests.scons b/build/googleurl_unittests.scons index 2da2e47..851f85a 100644 --- a/build/googleurl_unittests.scons +++ b/build/googleurl_unittests.scons @@ -14,12 +14,12 @@ env.SConscript([ '$BASE_DIR/using_base.scons', '$ICU38_DIR/using_icu38.scons', '$GTEST_DIR/../using_gtest.scons', - '#/../build/using_googleurl.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', ], {'env':env}) env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) |