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

Side by Side Diff: webkit/tools/test_shell/SConscript

Issue 11430: Fix use of LOAD= with WantSystemLib()... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month 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
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', 'env_res') 5 Import('env', 'env_res')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 env_res = env_res.Clone() 8 env_res = env_res.Clone()
9 9
10 env.SConscript([ 10 env.SConscript([
11 '$BZIP2_DIR/using_bzip2.scons',
12 '$LIBXML_DIR/using_libxml.scons',
11 '$CHROME_SRC_DIR/build/using_v8.scons', 13 '$CHROME_SRC_DIR/build/using_v8.scons',
12 ], {'env':env}) 14 ], {'env':env})
13 15
14 if env['PLATFORM'] == 'win32': 16 if env['PLATFORM'] == 'win32':
15 env_res.Append( 17 env_res.Append(
16 CPPPATH = [ 18 CPPPATH = [
17 '.', 19 '.',
18 '$CHROME_SRC_DIR', 20 '$CHROME_SRC_DIR',
19 '$NET_DIR', 21 '$NET_DIR',
20 ], 22 ],
(...skipping 13 matching lines...) Expand all
34 'glue', 36 'glue',
35 'port', 37 'port',
36 'base', 38 'base',
37 'base_gfx', 39 'base_gfx',
38 'breakpad_handler', 40 'breakpad_handler',
39 'googleurl', 41 'googleurl',
40 'net', 42 'net',
41 'sdch', 43 'sdch',
42 'skia', 44 'skia',
43 'gtest', 45 'gtest',
44 env['BZIP2_LIB'],
45 'V8Bindings', 46 'V8Bindings',
46 'WebCore', 47 'WebCore',
47 'WTF', 48 'WTF',
48 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 49 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed
49 'libjpeg', 50 'libjpeg',
50 'libpng', 51 'libpng',
51 env['XML_LIB'],
52 'libxslt', 52 'libxslt',
53 'modp_b64', 53 'modp_b64',
54 'zlib', 54 'zlib',
55 'sqlite', 55 'sqlite',
56 'JavaScriptCore_pcre', 56 'JavaScriptCore_pcre',
57 'default_plugin', 57 'default_plugin',
58 ], 58 ],
59 ) 59 )
60 60
61 if env['PLATFORM'] == 'win32': 61 if env['PLATFORM'] == 'win32':
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 '$WEBKIT_DIR/port/platform/graphics/skia/public/VectorCanvas_unittest.cpp' , 193 '$WEBKIT_DIR/port/platform/graphics/skia/public/VectorCanvas_unittest.cpp' ,
194 194
195 # TODO(brettw) this should also be compiled on Linux. 195 # TODO(brettw) this should also be compiled on Linux.
196 '$WEBKIT_DIR/port/platform/graphics/skia/public/PlatformCanvas_unittest.cp p', 196 '$WEBKIT_DIR/port/platform/graphics/skia/public/PlatformCanvas_unittest.cp p',
197 ]) 197 ])
198 198
199 test_shell_tests = env.ChromeTestProgram('test_shell_tests', 199 test_shell_tests = env.ChromeTestProgram('test_shell_tests',
200 resources + test_files) 200 resources + test_files)
201 i = env.Install('$TARGET_ROOT', test_shell_tests) 201 i = env.Install('$TARGET_ROOT', test_shell_tests)
202 env.Alias('webkit', i) 202 env.Alias('webkit', i)
OLDNEW
« site_scons/site_tools/chromium_builders.py ('K') | « webkit/SConscript ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698