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

Side by Side Diff: webkit/SConscript

Issue 1661: port some parts of webkit/glue/plugins/test to Linux... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 3 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 | « base/string_util_win.h ('k') | webkit/glue/plugins/test/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 os 5 import os
6 6
7 Import(['env']) 7 Import(['env'])
8 8
9 env = env.Clone() 9 env = env.Clone()
10 env_res = env.Clone() 10 env_res = env.Clone()
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 # This list is the SConscripts that work on Windows and Linux. 146 # This list is the SConscripts that work on Windows and Linux.
147 sconscript_dirs = [ 147 sconscript_dirs = [
148 'SConscript.port', 148 'SConscript.port',
149 'SConscript.javascriptcore_pcre', 149 'SConscript.javascriptcore_pcre',
150 'build/JSConfig/SConscript', 150 'build/JSConfig/SConscript',
151 'build/JavaScriptCore/SConscript', 151 'build/JavaScriptCore/SConscript',
152 'build/port/SConscript', 152 'build/port/SConscript',
153 'build/V8Bindings/SConscript', 153 'build/V8Bindings/SConscript',
154 'default_plugin/SConscript', 154 'default_plugin/SConscript',
155 'glue/SConscript', 155 'glue/SConscript',
156 'glue/plugins/test/SConscript',
156 ] 157 ]
157 if env['PLATFORM'] == 'win32': 158 if env['PLATFORM'] == 'win32':
158 # These extra dirs aren't win32-specific, they're just the dirs that 159 # These extra dirs aren't win32-specific, they're just the dirs that
159 # haven't yet been made portable. 160 # haven't yet been made portable.
160 sconscript_dirs.extend([ 161 sconscript_dirs.extend([
161 'activex_shim/SConscript', 162 'activex_shim/SConscript',
162 'activex_shim_dll/SConscript', 163 'activex_shim_dll/SConscript',
163 'build/localized_strings/SConscript', 164 'build/localized_strings/SConscript',
164 'build/WebCore/SConscript', # This almost works on linux. It requires 165 'build/WebCore/SConscript', # This almost works on linux. It requires
165 # some changes to WebKit that we'll get 166 # some changes to WebKit that we'll get
166 # in the merge. 167 # in the merge.
167 'glue/plugins/test/SConscript',
168 'tools/npapi_layout_test_plugin/SConscript', 168 'tools/npapi_layout_test_plugin/SConscript',
169 'tools/test_shell/SConscript', 169 'tools/test_shell/SConscript',
170 'tools/test_shell/resources/fonts/SConscript', 170 'tools/test_shell/resources/fonts/SConscript',
171 ]) 171 ])
172 172
173 env.Append( 173 env.Append(
174 CPPDEFINES = [ 174 CPPDEFINES = [
175 '_CRT_SECURE_NO_DEPRECATE', 175 '_CRT_SECURE_NO_DEPRECATE',
176 '_CRT_NONSTDC_NO_WARNINGS', 176 '_CRT_NONSTDC_NO_WARNINGS',
177 '_CRT_NONSTDC_NO_DEPRECATE', 177 '_CRT_NONSTDC_NO_DEPRECATE',
(...skipping 20 matching lines...) Expand all
198 #env.Alias('webkit', ['.', '../icudt38.dll']) 198 #env.Alias('webkit', ['.', '../icudt38.dll'])
199 env.Alias('webkit', ['../icudt38.dll']) 199 env.Alias('webkit', ['../icudt38.dll'])
200 200
201 201
202 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', 202 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
203 ['$WEBCORE_DIR/Configurations/Version.xcconfig', 203 ['$WEBCORE_DIR/Configurations/Version.xcconfig',
204 '#/../webkit/build/webkit_version.py'], 204 '#/../webkit/build/webkit_version.py'],
205 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") 205 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}")
206 env.AlwaysBuild(version) 206 env.AlwaysBuild(version)
207 207
OLDNEW
« no previous file with comments | « base/string_util_win.h ('k') | webkit/glue/plugins/test/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698