diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 19:44:27 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 19:44:27 +0000 |
| commit | 41d8536ad1861b61dd251eab5dad3445b876bd94 (patch) | |
| tree | 289cd30e8139c84fed36fba3fa38d2190a3d3b54 /build | |
| parent | b92ed9d2ae1bce0d5240fd7e30b2ba4dfdee299a (diff) | |
| download | chromium_src-41d8536ad1861b61dd251eab5dad3445b876bd94.zip chromium_src-41d8536ad1861b61dd251eab5dad3445b876bd94.tar.gz chromium_src-41d8536ad1861b61dd251eab5dad3445b876bd94.tar.bz2 | |
Removing more dependencies on the relative location of $CHROME_SRC_DIR.
Review URL: http://codereview.chromium.org/7860
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 4 | ||||
| -rw-r--r-- | build/SConscript.v8 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 1bc7548..d144c68 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -152,10 +152,10 @@ if env['PLATFORM'] == 'win32': CSCRIPT = 'c:\\Windows\\System32\\cscript', PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0', - PLATFORMSDK_VISTA = '#/$PLATFORMSDK_VISTA_REL', + PLATFORMSDK_VISTA = '$CHROME_SRC_DIR/$PLATFORMSDK_VISTA_REL', VISUAL_STUDIO = visual_studio_path, - CYGWIN_DIR = Dir('#../third_party/cygwin'), + CYGWIN_DIR = env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin', PERL = '$CYGWIN_BIN_DIR/perl.exe', diff --git a/build/SConscript.v8 b/build/SConscript.v8 index 2d24fcf..a3eb983 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -15,8 +15,8 @@ env = env.Clone( V8_MODE = 'release', 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', + V8_SCONS_COM = 'cd $CHROME_SRC_DIR/v8 && $PYTHON $SCONS $SCONSFLAGS mode=$V8_MODE', + SCONS='$CHROME_SRC_DIR/third_party/scons/scons.py', SCONSFLAGS = ('-Q ' '--warn=no-deprecated ' '--warn=no-no-parallel-support' + cpu_flag), @@ -55,7 +55,7 @@ if env['PLATFORM'] == 'win32': v8 = env.Command(v8_scons_targets_off + v8_scons_targets_on, [], ['$V8_SCONS_COM snapshot=off sample=shell', - '$V8_SCONS_COM snapshot=on ${TARGETS[-%d:]}' + '$V8_SCONS_COM snapshot=on ${TARGETS[-%d:].abspath}' % len(v8_scons_targets_on)]) env.AlwaysBuild(v8) |