More *.scons renaming:...

build/SConscript.main

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import shutil
 import sys
 
 
 p = ARGUMENTS.get('PROGRESS')
@@ skipping 223 matching lines @@
   if not root_env.WantSystemLib('libjpeg'):
     sconscripts.append('$LIBJPEG_DIR/SConscript')
   if not root_env.WantSystemLib('libxml'):
     sconscripts.append('$LIBXML_DIR/SConscript')
     root_env.Append(XML_LIB = ['libxml'])
   else:
     root_env.Append(XML_LIB = ['xml2'])
   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():
   sconscripts.append('$OBJ_ROOT/build/SConscript.v8')
 
 if LoadComponent('webkit'):
   sconscripts.append('$WEBKIT_DIR/SConscript')
 
 
 # Add the final list into the root environment to be build in BuildComponents.
@@ skipping 237 matching lines @@
     PERL_INCLUDE_FLAG = '-I ',
     PERL_INCLUDE_SUFFIX = '',
     _PERL_INCLUDE_FLAGS = ('${_concat(PERL_INCLUDE_FLAG, '
                            'PERL_INCLUDE_PATH, '
                            'PERL_INCLUDE_SUFFIX,'
                            '__env__, RDirs, TARGET, SOURCE)}'),
 )
 
 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',
         '$SANDBOX_DIR/sandbox.scons',
     ],
 )
 
 linux_env.Append(
     # We need rt for clock_gettime.
     LIBS = ['rt'],
@@ skipping 69 matching lines @@
 mac_env.Replace(
     # Reproduce XCode's behavior of using gcc even to link C++,
     # and distinguishing it the -x c++ option.
     CC = 'gcc-4.2',
     CXX = 'g++-4.2',
     LINK = '$CXX',
 )
 
 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',
         '$BREAKPAD_DIR/SConscript',
         '$CHROME_DIR/SConscript',
         '$GEARS_DIR/SConscript',
         '$GOOGLE_UPDATE_DIR/SConscript',
         '$RLZ_DIR/SConscript',
         '$SANDBOX_DIR/sandbox.scons',
         'build/SConscript.v8',
@@ skipping 171 matching lines @@
         'all_libraries',
         'all_languages',
         'all_programs',
         'all_test_programs',
     ], projects = [p],
     COMPONENT_VS_PROJECT_SCRIPT_PATH=(
         'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
 )
 
 # -------------------------------------------------------------------------