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

Side by Side Diff: build/SConscript.main

Issue 10769: Move dmg_fp in scons build to compile from (Closed)
Patch Set: linux too 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
« no previous file with comments | « base/using_base.scons ('k') | build/googleurl_unittests.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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 TESTING_DIR = '$OBJ_ROOT/testing', 70 TESTING_DIR = '$OBJ_ROOT/testing',
71 THIRD_PARTY_DIR = '$OBJ_ROOT/third_party', 71 THIRD_PARTY_DIR = '$OBJ_ROOT/third_party',
72 V8_DIR = '$OBJ_ROOT/v8', 72 V8_DIR = '$OBJ_ROOT/v8',
73 WEBKIT_DIR = '$OBJ_ROOT/webkit', 73 WEBKIT_DIR = '$OBJ_ROOT/webkit',
74 74
75 GTEST_DIR = '$TESTING_DIR/gtest', 75 GTEST_DIR = '$TESTING_DIR/gtest',
76 76
77 BSDIFF_DIR = '$THIRD_PARTY_DIR/bsdiff', 77 BSDIFF_DIR = '$THIRD_PARTY_DIR/bsdiff',
78 BSPATCH_DIR = '$THIRD_PARTY_DIR/bspatch', 78 BSPATCH_DIR = '$THIRD_PARTY_DIR/bspatch',
79 BZIP2_DIR = '$THIRD_PARTY_DIR/bzip2', 79 BZIP2_DIR = '$THIRD_PARTY_DIR/bzip2',
80 DMG_FP_DIR = '$THIRD_PARTY_DIR/dmg_fp',
81 ICU38_DIR = '$THIRD_PARTY_DIR/icu38', 80 ICU38_DIR = '$THIRD_PARTY_DIR/icu38',
82 LIBEVENT_DIR = '$THIRD_PARTY_DIR/libevent', 81 LIBEVENT_DIR = '$THIRD_PARTY_DIR/libevent',
83 LIBJPEG_DIR = '$THIRD_PARTY_DIR/libjpeg', 82 LIBJPEG_DIR = '$THIRD_PARTY_DIR/libjpeg',
84 LIBPNG_DIR = '$THIRD_PARTY_DIR/libpng', 83 LIBPNG_DIR = '$THIRD_PARTY_DIR/libpng',
85 LIBXML_DIR = '$THIRD_PARTY_DIR/libxml', 84 LIBXML_DIR = '$THIRD_PARTY_DIR/libxml',
86 LIBXSLT_DIR = '$THIRD_PARTY_DIR/libxslt', 85 LIBXSLT_DIR = '$THIRD_PARTY_DIR/libxslt',
87 LZMA_SDK_DIR = '$THIRD_PARTY_DIR/lzma_sdk', 86 LZMA_SDK_DIR = '$THIRD_PARTY_DIR/lzma_sdk',
88 MODP_B64_DIR = '$THIRD_PARTY_DIR/modp_b64', 87 MODP_B64_DIR = '$THIRD_PARTY_DIR/modp_b64',
89 NPAPI_DIR = '$THIRD_PARTY_DIR/npapi', 88 NPAPI_DIR = '$THIRD_PARTY_DIR/npapi',
90 ZLIB_DIR = '$THIRD_PARTY_DIR/zlib', 89 ZLIB_DIR = '$THIRD_PARTY_DIR/zlib',
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 if not root_env.WantSystemLib('lzma_sdk'): 246 if not root_env.WantSystemLib('lzma_sdk'):
248 sconscripts.append('$LZMA_SDK_DIR/lzma_sdk.scons') 247 sconscripts.append('$LZMA_SDK_DIR/lzma_sdk.scons')
249 if not root_env.WantSystemLib('zlib'): 248 if not root_env.WantSystemLib('zlib'):
250 sconscripts.append('$ZLIB_DIR/zlib.scons') 249 sconscripts.append('$ZLIB_DIR/zlib.scons')
251 root_env.Append(ZLIB_LIB = ['zlib']) 250 root_env.Append(ZLIB_LIB = ['zlib'])
252 else: 251 else:
253 root_env.Append(ZLIB_LIB = ['z']) 252 root_env.Append(ZLIB_LIB = ['z'])
254 sconscripts.extend([ 253 sconscripts.extend([
255 '$BSDIFF_DIR/bsdiff.scons', 254 '$BSDIFF_DIR/bsdiff.scons',
256 '$BSPATCH_DIR/bspatch.scons', 255 '$BSPATCH_DIR/bspatch.scons',
257 '$DMG_FP_DIR/dmg_fp.scons',
258 '$ICU38_DIR/icu38.scons', 256 '$ICU38_DIR/icu38.scons',
259 '$MODP_B64_DIR/modp_b64.scons', 257 '$MODP_B64_DIR/modp_b64.scons',
260 ]) 258 ])
261 259
262 if LoadComponent('v8') and root_env.Dir('$CHROME_SRC_DIR/v8').exists(): 260 if LoadComponent('v8') and root_env.Dir('$CHROME_SRC_DIR/v8').exists():
263 sconscripts.append('$OBJ_ROOT/build/SConscript.v8') 261 sconscripts.append('$OBJ_ROOT/build/SConscript.v8')
264 262
265 if LoadComponent('webkit'): 263 if LoadComponent('webkit'):
266 sconscripts.append('$WEBKIT_DIR/webkit.scons') 264 sconscripts.append('$WEBKIT_DIR/webkit.scons')
267 265
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 'all_libraries', 789 'all_libraries',
792 'all_languages', 790 'all_languages',
793 'all_programs', 791 'all_programs',
794 'all_test_programs', 792 'all_test_programs',
795 ], projects = [p], 793 ], projects = [p],
796 COMPONENT_VS_PROJECT_SCRIPT_PATH=( 794 COMPONENT_VS_PROJECT_SCRIPT_PATH=(
797 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), 795 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
798 ) 796 )
799 797
800 # ------------------------------------------------------------------------- 798 # -------------------------------------------------------------------------
OLDNEW
« no previous file with comments | « base/using_base.scons ('k') | build/googleurl_unittests.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698