Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: build/SConscript.main

Issue 7847: Using $CHROME_SRC_DIR in place of hash/..... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « breakpad/SConscript ('k') | build/SConscript.v8 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/SConscript.main
===================================================================
--- build/SConscript.main (revision 3721)
+++ build/SConscript.main (working copy)
@@ -28,9 +28,9 @@
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 @@
# 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 @@
'$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'])
« no previous file with comments | « breakpad/SConscript ('k') | build/SConscript.v8 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698