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

Side by Side Diff: build/SConscript.main

Issue 42650: Update Linux gyp build to import and propagate external environment... (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 | « DEPS ('k') | build/common.gypi » ('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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 tools = tool_list, 79 tools = tool_list,
80 variables = clvars, 80 variables = clvars,
81 81
82 # Requested list of system (shared) libraries, from the comma separated 82 # Requested list of system (shared) libraries, from the comma separated
83 # SYSTEM_LIBS command-line argument 83 # SYSTEM_LIBS command-line argument
84 req_system_libs = [], 84 req_system_libs = [],
85 # All supported system libraries, for the help message 85 # All supported system libraries, for the help message
86 all_system_libs = [], 86 all_system_libs = [],
87 87
88 CHROME_SRC_DIR = '$MAIN_DIR/..', 88 CHROME_SRC_DIR = '$MAIN_DIR/..',
89 SRC_DIR = '$MAIN_DIR/..',
89 DESTINATION_ROOT = '$MAIN_DIR/$BUILD_TARGET_DIR', 90 DESTINATION_ROOT = '$MAIN_DIR/$BUILD_TARGET_DIR',
90 91
91 # Where ComponentTestProgram() will build test executables. 92 # Where ComponentTestProgram() will build test executables.
92 TESTS_DIR = '$DESTINATION_ROOT', 93 TESTS_DIR = '$DESTINATION_ROOT',
93 94
94 # Where ComponentProgram() will build program executables. 95 # Where ComponentProgram() will build program executables.
95 STAGING_DIR = '$DESTINATION_ROOT', 96 STAGING_DIR = '$DESTINATION_ROOT',
96 97
97 # TODO(hammer): when Hammer supports this... 98 # TODO(hammer): when Hammer supports this...
98 # Have Hammer prefix all Library aliases with lib_ (to avoid 99 # Have Hammer prefix all Library aliases with lib_ (to avoid
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 769
769 # Overlay things from a layer below. 770 # Overlay things from a layer below.
770 for env in environment_list: 771 for env in environment_list:
771 env.Dir('$OBJ_ROOT').addRepository(env.Dir('$CHROME_SRC_DIR')) 772 env.Dir('$OBJ_ROOT').addRepository(env.Dir('$CHROME_SRC_DIR'))
772 env.Dir('$OBJ_ROOT/googleurl').addRepository(env.Dir('$CHROME_SRC_DIR/build')) 773 env.Dir('$OBJ_ROOT/googleurl').addRepository(env.Dir('$CHROME_SRC_DIR/build'))
773 774
774 # We pre-resolve some common targets. We end up spending lots of time 775 # We pre-resolve some common targets. We end up spending lots of time
775 # resolving these over and over again. 776 # resolving these over and over again.
776 env.Replace( 777 env.Replace(
777 CHROME_SRC_DIR = str(env.Dir('$CHROME_SRC_DIR')), 778 CHROME_SRC_DIR = str(env.Dir('$CHROME_SRC_DIR')),
779 SRC_DIR = str(env.Dir('$SRC_DIR')),
778 DESTINATION_ROOT = str(env.Dir('$DESTINATION_ROOT')), 780 DESTINATION_ROOT = str(env.Dir('$DESTINATION_ROOT')),
779 TARGET_ROOT = str(env.Dir('$TARGET_ROOT')), 781 TARGET_ROOT = str(env.Dir('$TARGET_ROOT')),
780 OBJ_ROOT = str(env.Dir('$OBJ_ROOT')), 782 OBJ_ROOT = str(env.Dir('$OBJ_ROOT')),
781 WEBKIT_DIR = str(env.Dir('$WEBKIT_DIR')), 783 WEBKIT_DIR = str(env.Dir('$WEBKIT_DIR')),
782 ) 784 )
783 785
784 786
785 help_fmt = """ 787 help_fmt = """
786 Usage: hammer [SCONS_OPTIONS] [VARIABLES] [TARGET] ... 788 Usage: hammer [SCONS_OPTIONS] [VARIABLES] [TARGET] ...
787 789
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 'all_libraries', 891 'all_libraries',
890 'all_languages', 892 'all_languages',
891 'all_programs', 893 'all_programs',
892 'all_test_programs', 894 'all_test_programs',
893 ], projects = [p], 895 ], projects = [p],
894 COMPONENT_VS_PROJECT_SCRIPT_PATH=( 896 COMPONENT_VS_PROJECT_SCRIPT_PATH=(
895 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), 897 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
896 ) 898 )
897 899
898 # ------------------------------------------------------------------------- 900 # -------------------------------------------------------------------------
OLDNEW
« no previous file with comments | « DEPS ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698