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

Side by Side Diff: webkit/build/JavaScriptCore/SConscript

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/activex_shim_dll/SConscript ('k') | webkit/build/localized_strings/SConscript » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 Import('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 9
10 cygwin = Dir('#../third_party/cygwin/bin') 10 cygwin = Dir('#../third_party/cygwin/bin')
11 cygwin_posix = cygwin.abspath.replace('\\', '/') 11 cygwin_posix = cygwin.abspath.replace('\\', '/')
12 env.PrependENVPath('PATH', '../third_party/cygwin/bin') 12 env.PrependENVPath('PATH', '../third_party/cygwin/bin')
13 13
14 14
15 hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $T ARGET' 15 hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $T ARGET'
16 16
17 env.Replace( 17 env.Replace(
18 CREATE_HASH_TABLE_COM = hash_table_cmd, 18 CREATE_HASH_TABLE_COM = hash_table_cmd,
19 CREATE_HASH_TABLE = env.File('#/../third_party/WebKit/JavaScriptCo re/kjs/create_hash_table'), 19 CREATE_HASH_TABLE = env.File('$CHROME_SRC_DIR/third_party/WebKit/J avaScriptCore/kjs/create_hash_table'),
20 CREATE_HASH_TABLE_FLAGS = '-i', 20 CREATE_HASH_TABLE_FLAGS = '-i',
21 ) 21 )
22 22
23 # TODO(erg): Temporarily disabling JSC building since it's changed heavily 23 # TODO(erg): Temporarily disabling JSC building since it's changed heavily
24 # during the merge; I am also not sure we want/need to build it when building 24 # during the merge; I am also not sure we want/need to build it when building
25 # V8... 25 # V8...
26 # 26 #
27 # We still need to build the pieces of pcre so we can't just drop this 27 # We still need to build the pieces of pcre so we can't just drop this
28 # SConscript file though... <http://crbug.com/3043> 28 # SConscript file though... <http://crbug.com/3043>
29 """ 29 """
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 '$JAVASCRIPTCORE_DIR/API', 103 '$JAVASCRIPTCORE_DIR/API',
104 '$JAVASCRIPTCORE_DIR/bindings', 104 '$JAVASCRIPTCORE_DIR/bindings',
105 '$JAVASCRIPTCORE_DIR/bindings/c', 105 '$JAVASCRIPTCORE_DIR/bindings/c',
106 '$JAVASCRIPTCORE_DIR/bindings/jni', 106 '$JAVASCRIPTCORE_DIR/bindings/jni',
107 '$WEBKIT_DIR/pending', 107 '$WEBKIT_DIR/pending',
108 '$WEBKIT_DIR/pending/wtf', 108 '$WEBKIT_DIR/pending/wtf',
109 '$JAVASCRIPTCORE_DIR/wtf', 109 '$JAVASCRIPTCORE_DIR/wtf',
110 '$ICU38_DIR/public/common', 110 '$ICU38_DIR/public/common',
111 '$ICU38_DIR/public/i18n', 111 '$ICU38_DIR/public/i18n',
112 '$WEBKIT_DIR', 112 '$WEBKIT_DIR',
113 '#/..', 113 '$CHROME_SRC_DIR',
114 ], 114 ],
115 ) 115 )
116 116
117 env.Append( 117 env.Append(
118 CPPDEFINES = [ 118 CPPDEFINES = [
119 '__STD_C', 119 '__STD_C',
120 'U_STATIC_IMPLEMENTATION', 120 'U_STATIC_IMPLEMENTATION',
121 ], 121 ],
122 CPPPATH = [ 122 CPPPATH = [
123 '$WTF_DIR/unicode', 123 '$WTF_DIR/unicode',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 '$WTF_DIR/gtk/MainThreadGtk.cpp', 172 '$WTF_DIR/gtk/MainThreadGtk.cpp',
173 '$WTF_DIR/ThreadingPthreads.cpp', 173 '$WTF_DIR/ThreadingPthreads.cpp',
174 ]) 174 ])
175 175
176 # Re-add the include path for glib.h because it got lost when cloning the 176 # Re-add the include path for glib.h because it got lost when cloning the
177 # environment. 177 # environment.
178 env.ParseConfig('pkg-config --cflags --libs glib-2.0') 178 env.ParseConfig('pkg-config --cflags --libs glib-2.0')
179 179
180 180
181 env.ChromeStaticLibrary('WTF', wtf_inputs) 181 env.ChromeStaticLibrary('WTF', wtf_inputs)
OLDNEW
« no previous file with comments | « webkit/activex_shim_dll/SConscript ('k') | webkit/build/localized_strings/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698