diff options
| -rw-r--r-- | build/SConscript.main | 4 | ||||
| -rw-r--r-- | build/SConscript.v8 | 6 | ||||
| -rw-r--r-- | third_party/bspatch/SConscript | 2 | ||||
| -rw-r--r-- | third_party/libjpeg/SConscript | 2 | ||||
| -rw-r--r-- | webkit/SConscript | 4 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 8 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 8 |
8 files changed, 19 insertions, 17 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) diff --git a/third_party/bspatch/SConscript b/third_party/bspatch/SConscript index 646e388..e88910c 100644 --- a/third_party/bspatch/SConscript +++ b/third_party/bspatch/SConscript @@ -35,7 +35,7 @@ env = env.Clone( env.Prepend( CPPPATH = [ - '#../third_party/lzma_sdk/', + '$CHROME_SRC_DIR/third_party/lzma_sdk/', ], ) diff --git a/third_party/libjpeg/SConscript b/third_party/libjpeg/SConscript index f25beb1..381d437 100644 --- a/third_party/libjpeg/SConscript +++ b/third_party/libjpeg/SConscript @@ -34,7 +34,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ - '#../', + '$CHROME_SRC_DIR', ], ) diff --git a/webkit/SConscript b/webkit/SConscript index f314da9..1952c93 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -257,9 +257,9 @@ env.SConscript(sconscript_dirs, exports=['env', 'env_res']) # directory tree as a huge content-signature string. # Instead we're going to let all the subsidiary SConscript files # add their own individual targets to the 'webkit' Alias. -#env.Alias('webkit', ['.', '../icudt38.dll']) +#env.Alias('webkit', ['.', '$OBJ_ROOT/icudt38.dll']) if env['PLATFORM'] == 'win32': - env.Alias('webkit', ['../icudt38.dll']) + env.Alias('webkit', ['$OBJ_ROOT/icudt38.dll']) version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', ['$WEBCORE_DIR/Configurations/Version.xcconfig', diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 103c032..08a684b 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -7,9 +7,9 @@ Import('env') env = env.Clone() -cygwin = Dir('#../third_party/cygwin/bin') +cygwin = env.Dir('$CHROME_SRC_DIR/third_party/cygwin/bin') cygwin_posix = cygwin.abspath.replace('\\', '/') -env.PrependENVPath('PATH', '../third_party/cygwin/bin') +env.PrependENVPath('PATH', cygwin_posix) hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $TARGET' @@ -50,7 +50,7 @@ env.Lookup_Table_h('lexer', '$KJS_DIR/keywords.table', # TODO(bradnelson): sucks, needs relative path env.Command('$WEBKIT_DIR/port/JavaScriptCore/chartables.c', '$PCRE_DIR/dftables', - '$PERL ../third_party/WebKit/JavaScriptCore/pcre/dftables ' + \ + '$PERL $CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/pcre/dftables ' + \ '${TARGET.posix}') # We'd like to do this as follows: @@ -75,6 +75,8 @@ copies = [ 'API/JSStringRefCF.h', 'API/JSStringRefBSTR.h', 'API/JavaScriptCore.h', + # NOTE: these work ok for now with relative paths because they are concated + # with JAVASCRIPT_CORE_DIR down below. '../WebCore/bridge/npruntime.h', '../WebCore/bridge/runtime.h', '../WebCore/bridge/NP_jsobject.h', diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 6a90652..748f24d 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -763,7 +763,7 @@ if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'win32': env_p = env.Clone() env_p.Append(CCFLAGS='/Ylwebcore') - pch, obj = env_p.PCH('../precompiled_webkit.cc') + pch, obj = env_p.PCH('$OBJ_ROOT/build/precompiled_webkit.cc') env['PCH'] = pch env['PCHSTOP'] = 'precompiled_webkit.h' env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h']) diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index cc9b462..53d3741 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -7,15 +7,15 @@ import re Import('env') -webcore = env.Dir('#../third_party/WebKit/WebCore') +webcore = env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore') webcore_posix = webcore.abspath.replace('\\', '/') cygwin = env.Dir('$CYGWIN_DIR/bin') cygwin_posix = cygwin.abspath.replace('\\', '/') -pending = env.Dir('#../webkit/pending') -portroot = env.Dir('#../webkit/port') -webkit_build = env.Dir('#../webkit/build') +pending = env.Dir('$CHROME_SRC_DIR/webkit/pending') +portroot = env.Dir('$CHROME_SRC_DIR/webkit/port') +webkit_build = env.Dir('$CHROME_SRC_DIR/webkit/build') def PosixIncludes(env, prefix, files, suffix): |