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

Side by Side Diff: build/SConscript.main

Issue 39219: test_shell and test_shell_tests on Linux from gyp-generated scons files: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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/base.gyp ('k') | webkit/tools/test_shell/test_shell.gyp » ('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 import shutil 6 import shutil
7 import sys 7 import sys
8 8
9 9
10 if sys.platform == 'win32': 10 if sys.platform == 'win32':
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 root_env.ApplySConscript(['$CHROME_SRC_DIR/build/common.scons']) 182 root_env.ApplySConscript(['$CHROME_SRC_DIR/build/common.scons'])
183 183
184 # The list of all leaf (fully described) environments. 184 # The list of all leaf (fully described) environments.
185 environment_list = [] 185 environment_list = []
186 components = [] 186 components = []
187 187
188 # Figure out what SConscript files to load based on the user's request. 188 # Figure out what SConscript files to load based on the user's request.
189 # Default is to load all SConscript files for a full-tree build. 189 # Default is to load all SConscript files for a full-tree build.
190 # The keyword arguments in the call below (base, breakpad, etc.) can be 190 # The keyword arguments in the call below (base, breakpad, etc.) can be
191 # specified in the LOAD= argument to cut down on the build. 191 # specified in the LOAD= argument to cut down on the build.
192
193 if root_env.get('_GYP'):
194 webkit_sconscript = '$WEBKIT_DIR/tools/test_shell/test_shell_main${_GYP}.sco ns'
195 else:
196 webkit_sconscript = '$WEBKIT_DIR/webkit_main${_GYP}.scons'
197
192 sconscript_map = dict( 198 sconscript_map = dict(
193 base = '$BASE_DIR/base_main${_GYP}.scons', 199 base = '$BASE_DIR/base_main${_GYP}.scons',
194 breakpad = '$BREAKPAD_DIR/SConscript', 200 breakpad = '$BREAKPAD_DIR/SConscript',
195 chrome = '$CHROME_DIR/chrome_main${_GYP}.scons', 201 chrome = '$CHROME_DIR/chrome_main${_GYP}.scons',
196 gears = '$GEARS_DIR/SConscript', 202 gears = '$GEARS_DIR/SConscript',
197 google_update = '$GOOGLE_UPDATE_DIR/SConscript', 203 google_update = '$GOOGLE_UPDATE_DIR/SConscript',
198 googleurl = '$GOOGLEURL_DIR/googleurl.scons', 204 googleurl = '$GOOGLEURL_DIR/googleurl.scons',
199 media = '$MEDIA_DIR/media.scons', 205 media = '$MEDIA_DIR/media.scons',
200 net = '$NET_DIR/net_main${_GYP}.scons', 206 net = '$NET_DIR/net_main${_GYP}.scons',
201 printing = '$PRINTING_DIR/printing.scons', 207 printing = '$PRINTING_DIR/printing.scons',
(...skipping 10 matching lines...) Expand all
212 '$LIBJPEG_DIR/libjpeg${_GYP}.scons', 218 '$LIBJPEG_DIR/libjpeg${_GYP}.scons',
213 '$LIBPNG_DIR/libpng${_GYP}.scons', 219 '$LIBPNG_DIR/libpng${_GYP}.scons',
214 '$LIBXML_DIR/libxml.scons', 220 '$LIBXML_DIR/libxml.scons',
215 '$LIBXSLT_DIR/libxslt.scons', 221 '$LIBXSLT_DIR/libxslt.scons',
216 '$LZMA_SDK_DIR/lzma_sdk.scons', 222 '$LZMA_SDK_DIR/lzma_sdk.scons',
217 '$MODP_B64_DIR/modp_b64.scons', 223 '$MODP_B64_DIR/modp_b64.scons',
218 '$ZLIB_DIR/zlib${_GYP}.scons', 224 '$ZLIB_DIR/zlib${_GYP}.scons',
219 ], 225 ],
220 tools = '$GTK_CLIP_DUMP_DIR/gcd.scons', 226 tools = '$GTK_CLIP_DUMP_DIR/gcd.scons',
221 v8 = '$OBJ_ROOT/build/SConscript.v8', 227 v8 = '$OBJ_ROOT/build/SConscript.v8',
222 webkit = '$WEBKIT_DIR/webkit_main${_GYP}.scons', 228 webkit = webkit_sconscript,
223 ) 229 )
224 230
225 if root_env.get('_GYP'): 231 if root_env.get('_GYP'):
226 Import('build_component') 232 Import('build_component')
227 sconscripts = [sconscript_map[build_component]] 233 sconscripts = [sconscript_map[build_component]]
228 components = [build_component] 234 components = [build_component]
229 else: 235 else:
230 sconscripts = root_env.ChromiumLoadComponentSConscripts(**sconscript_map) 236 sconscripts = root_env.ChromiumLoadComponentSConscripts(**sconscript_map)
231 237
232 # Add the final list into the root environment to be build in BuildComponents. 238 # Add the final list into the root environment to be build in BuildComponents.
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 'all_libraries', 859 'all_libraries',
854 'all_languages', 860 'all_languages',
855 'all_programs', 861 'all_programs',
856 'all_test_programs', 862 'all_test_programs',
857 ], projects = [p], 863 ], projects = [p],
858 COMPONENT_VS_PROJECT_SCRIPT_PATH=( 864 COMPONENT_VS_PROJECT_SCRIPT_PATH=(
859 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), 865 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
860 ) 866 )
861 867
862 # ------------------------------------------------------------------------- 868 # -------------------------------------------------------------------------
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | webkit/tools/test_shell/test_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698