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

Side by Side Diff: build/SConscript.main

Issue 10768: Add a webkit.scons file in between build\SConscript.main and... (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
« no previous file with comments | « no previous file | chrome/chrome.scons » ('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 p = ARGUMENTS.get('PROGRESS') 10 p = ARGUMENTS.get('PROGRESS')
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 '$BSPATCH_DIR/bspatch.scons', 256 '$BSPATCH_DIR/bspatch.scons',
257 '$DMG_FP_DIR/dmg_fp.scons', 257 '$DMG_FP_DIR/dmg_fp.scons',
258 '$ICU38_DIR/icu38.scons', 258 '$ICU38_DIR/icu38.scons',
259 '$MODP_B64_DIR/modp_b64.scons', 259 '$MODP_B64_DIR/modp_b64.scons',
260 ]) 260 ])
261 261
262 if LoadComponent('v8') and root_env.Dir('$CHROME_SRC_DIR/v8').exists(): 262 if LoadComponent('v8') and root_env.Dir('$CHROME_SRC_DIR/v8').exists():
263 sconscripts.append('$OBJ_ROOT/build/SConscript.v8') 263 sconscripts.append('$OBJ_ROOT/build/SConscript.v8')
264 264
265 if LoadComponent('webkit'): 265 if LoadComponent('webkit'):
266 sconscripts.append('$WEBKIT_DIR/SConscript') 266 sconscripts.append('$WEBKIT_DIR/webkit.scons')
267 267
268 268
269 # Add the final list into the root environment to be build in BuildComponents. 269 # Add the final list into the root environment to be build in BuildComponents.
270 root_env.Append(BUILD_SCONSCRIPTS = sconscripts) 270 root_env.Append(BUILD_SCONSCRIPTS = sconscripts)
271 271
272 272
273 273
274 # -------------------------------------------------------------------------- 274 # --------------------------------------------------------------------------
275 # Windows specific 275 # Windows specific
276 276
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 'all_libraries', 791 'all_libraries',
792 'all_languages', 792 'all_languages',
793 'all_programs', 793 'all_programs',
794 'all_test_programs', 794 'all_test_programs',
795 ], projects = [p], 795 ], projects = [p],
796 COMPONENT_VS_PROJECT_SCRIPT_PATH=( 796 COMPONENT_VS_PROJECT_SCRIPT_PATH=(
797 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), 797 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
798 ) 798 )
799 799
800 # ------------------------------------------------------------------------- 800 # -------------------------------------------------------------------------
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698