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

Side by Side Diff: chrome/installer/util/SConscript

Issue 7847: Using $CHROME_SRC_DIR in place of hash/..... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 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 | « chrome/installer/setup/SConscript ('k') | chrome/plugin/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('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 9
10 env.Prepend( 10 env.Prepend(
11 CPPPATH = [ 11 CPPPATH = [
12 '$LZMA_SDK_DIR', 12 '$LZMA_SDK_DIR',
13 '$CHROME_DIR/third_party/wtl/include', 13 '$CHROME_DIR/third_party/wtl/include',
14 '$NPAPI_DIR', 14 '$NPAPI_DIR',
15 '$LIBXML_DIR/include', 15 '$LIBXML_DIR/include',
16 '$SKIA_DIR/include', 16 '$SKIA_DIR/include',
17 '$SKIA_DIR/include/corecg', 17 '$SKIA_DIR/include/corecg',
18 '$SKIA_DIR/platform', 18 '$SKIA_DIR/platform',
19 '$LIBPNG_DIR', 19 '$LIBPNG_DIR',
20 '$ZLIB_DIR', 20 '$ZLIB_DIR',
21 '$BREAKPAD_DIR/src', 21 '$BREAKPAD_DIR/src',
22 '$LIBJPEG_DIR', 22 '$LIBJPEG_DIR',
23 '$ICU38_DIR/public/common', 23 '$ICU38_DIR/public/common',
24 '$ICU38_DIR/public/i18n', 24 '$ICU38_DIR/public/i18n',
25 '#/..', 25 '$CHROME_SRC_DIR',
26 '.', 26 '.',
27 ], 27 ],
28 CPPDEFINES = [ 28 CPPDEFINES = [
29 "_LZMA_IN_CB", 29 "_LZMA_IN_CB",
30 "LIBXML_STATIC", 30 "LIBXML_STATIC",
31 "PNG_USER_CONFIG", 31 "PNG_USER_CONFIG",
32 "CHROME_PNG_WRITE_SUPPORT" 32 "CHROME_PNG_WRITE_SUPPORT"
33 "U_STATIC_IMPLEMENTATION", 33 "U_STATIC_IMPLEMENTATION",
34 ], 34 ],
35 CCFLAGS = [ 35 CCFLAGS = [
(...skipping 23 matching lines...) Expand all
59 'work_item.cc', 59 'work_item.cc',
60 'work_item_list.cc', 60 'work_item_list.cc',
61 ] 61 ]
62 62
63 x = env.ChromeStaticLibrary('util', input_files) 63 x = env.ChromeStaticLibrary('util', input_files)
64 64
65 65
66 # create_string_rc.py imports FP.py from the tools/grit/grit/extern 66 # create_string_rc.py imports FP.py from the tools/grit/grit/extern
67 # directory, so add that to PYTHONPATH for this command execution. 67 # directory, so add that to PYTHONPATH for this command execution.
68 env_x = env.Clone() 68 env_x = env.Clone()
69 env_x.AppendENVPath('PYTHONPATH', [Dir('#/../tools/grit/grit/extern').abspath]) 69 env_x.AppendENVPath('PYTHONPATH',
70 [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath])
70 env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', 71 env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc',
71 '$CHROME_DIR/installer/util/installer_util_strings.h'], 72 '$CHROME_DIR/installer/util/installer_util_strings.h'],
72 ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', 73 ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py',
73 '$CHROME_DIR/app/generated_resources.grd'] + 74 '$CHROME_DIR/app/generated_resources.grd'] +
74 env.Glob('$CHROME_DIR/app/resources/*.xtb'), 75 env.Glob('$CHROME_DIR/app/resources/*.xtb'),
75 "$PYTHON ${SOURCES[0]} ${TARGET.dir}") 76 "$PYTHON ${SOURCES[0]} ${TARGET.dir}")
76 77
OLDNEW
« no previous file with comments | « chrome/installer/setup/SConscript ('k') | chrome/plugin/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698