From 41d8536ad1861b61dd251eab5dad3445b876bd94 Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Thu, 23 Oct 2008 19:44:27 +0000 Subject: 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 --- webkit/build/JavaScriptCore/SConscript | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'webkit/build/JavaScriptCore/SConscript') 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', -- cgit v1.1