diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 23:00:46 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 23:00:46 +0000 |
| commit | 94f686369c158fe46a327849ccae9f31c423adef (patch) | |
| tree | 11a749e1cb4078790d6429e25a346a018cd03e1d /build/SConscript.main | |
| parent | b496c9e6770e4951eec84b17d5c84454815bf796 (diff) | |
| download | chromium_src-94f686369c158fe46a327849ccae9f31c423adef.zip chromium_src-94f686369c158fe46a327849ccae9f31c423adef.tar.gz chromium_src-94f686369c158fe46a327849ccae9f31c423adef.tar.bz2 | |
More *.scons renaming:
* Rename SConscript to *.scons in the following directories:
third_party\{bspatch,bsdiff,lzma_dsk}
chrome\installer\{setup,mini_installer,util}
* Split mini_installer and installer_unittests into separate *.scons files.
* Add using_bspatch.scons and using_lzma_sdk.scons "properties" files,
modifying other *.scons files to use them as appropriate.
Review URL: http://codereview.chromium.org/10952
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.main')
| -rw-r--r-- | build/SConscript.main | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index fd41d60..8ccac3b 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -245,18 +245,18 @@ if LoadComponent('third_party'): if not root_env.WantSystemLib('libxslt'): sconscripts.append('$LIBXSLT_DIR/SConscript') if not root_env.WantSystemLib('lzma_sdk'): - sconscripts.append('$LZMA_SDK_DIR/SConscript') + sconscripts.append('$LZMA_SDK_DIR/lzma_sdk.scons') if not root_env.WantSystemLib('zlib'): sconscripts.append('$ZLIB_DIR/zlib.scons') root_env.Append(ZLIB_LIB = ['zlib']) else: root_env.Append(ZLIB_LIB = ['z']) sconscripts.extend([ - '$BSDIFF_DIR/SConscript', + '$BSDIFF_DIR/bsdiff.scons', + '$BSPATCH_DIR/bspatch.scons', '$DMG_FP_DIR/dmg_fp.scons', '$ICU38_DIR/icu38.scons', '$MODP_B64_DIR/modp_b64.scons', - '$BSPATCH_DIR/SConscript', ]) if LoadComponent('v8') and root_env.Dir('$CHROME_SRC_DIR/v8').exists(): @@ -514,8 +514,8 @@ linux_env.Replace( linux_env.FilterOut( BUILD_SCONSCRIPTS = [ - '$BSPATCH_DIR/SConscript', - '$BSDIFF_DIR/SConscript', + '$BSPATCH_DIR/bspatch.scons', + '$BSDIFF_DIR/bsdiff.scons', '$GEARS_DIR/SConscript', '$GOOGLE_UPDATE_DIR/SConscript', '$RLZ_DIR/SConscript', @@ -605,8 +605,8 @@ mac_env.Replace( mac_env.FilterOut( BUILD_SCONSCRIPTS = [ - '$BSPATCH_DIR/SConscript', - '$BSDIFF_DIR/SConscript', + '$BSPATCH_DIR/bspatch.scons', + '$BSDIFF_DIR/bsdiff.scons', '$LIBJPEG_DIR/SConscript', '$LIBXML_DIR/SConscript', '$LIBXSLT_DIR/SConscript', |