SCons renaming updates for base, net and googleurl:...

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')
 if p == 'spinner':
   Progress(['/\r', '|\r', '\\\r', '-\r'], interval=5, file=open('con', 'w'))
 elif p == 'name':
   Progress('$TARGET\r', overwrite=True, file=open('con', 'w'))
 
 
 default_warnings = ['no-missing-sconscript', 'no-no-parallel-support']
+default_warnings = ['no-no-parallel-support']
 SetOption('warn', default_warnings + GetOption('warn'))
 
 
 load = ARGUMENTS.get('LOAD')
 if load:
     load = load.split(',')
 else:
     load = []
 
 
 env = Environment(
     BUILD_TYPE = ARGUMENTS.get('BUILD_TYPE', 'Hammer'),
     TARGET_ROOT = '#/$BUILD_TYPE',
     OBJ_ROOT = '$TARGET_ROOT',
+    ROOT_DIR = '#/..',
 
     LIBS_DIR              = '$OBJ_ROOT/Libs',
 
     BASE_DIR              = '$OBJ_ROOT/base',
     BREAKPAD_DIR          = '$OBJ_ROOT/breakpad',
     CHROME_DIR            = '$OBJ_ROOT/chrome',
     GEARS_DIR             = '$OBJ_ROOT/gears',
     GOOGLE_UPDATE_DIR     = '$OBJ_ROOT/google_update',
-
-    # Work around a limitation (bug?) in SCons in that, when we build
-    # from a different directory, it forces the build targets defined
-    # the SConscript.googleurl file to be relative to that file (i.e.,
-    # here in the build/ directory with us), not relative to the
-    # the SConstruct directory from which SCons was launched.  When
-    # we roll forward to a version of SCons that fixes this, we'll
-    # need to revert to the $BUILD_TYPE definition of GOOGLEURL_DIR.
-    #GOOGLEURL_DIR         = '$OBJ_ROOT/googleurl',
-    GOOGLEURL_DIR         = '#/../build/googleurl',
-
+    GOOGLEURL_DIR         = '$OBJ_ROOT/googleurl',
     NET_DIR               = '$OBJ_ROOT/net',
     RLZ_DIR               = '$OBJ_ROOT/rlz',
     SANDBOX_DIR           = '$OBJ_ROOT/sandbox',
     SDCH_DIR              = '$OBJ_ROOT/sdch',
     SKIA_DIR              = '$OBJ_ROOT/skia',
     TESTING_DIR           = '$OBJ_ROOT/testing',
     THIRD_PARTY_DIR       = '$OBJ_ROOT/third_party',
     V8_DIR                = '$OBJ_ROOT/v8',
     WEBKIT_DIR            = '$OBJ_ROOT/webkit',
 
@@ skipping 396 matching lines @@
 if not os.path.exists(target_dir.abspath):
   Execute(Mkdir(target_dir))
 SConsignFile(target_dir.File('.sconsign').abspath)
 
 
 # Use timestamps change, followed by MD5 for speed
 env.Decider('MD5-timestamp')
 
 
 # Overlay things from a layer below.
-env.Dir('$TARGET_ROOT').addRepository(Dir('..'))
-
+env.Dir('$TARGET_ROOT').addRepository(Dir('#/..'))
+env.Dir('$TARGET_ROOT/googleurl').addRepository(env.Dir('$ROOT_DIR/build'))
 
 included = [c for c in load if not c.startswith('-')]
 excluded = [c[1:] for c in load if c.startswith('-')]
 if not included:
   included = ['all']
 
 components = ['all']
 
 def LoadComponent(c):
   components.append(c)
   return (not GetOption('help') and
           c in included or
           ('all' in included and not c in excluded))
 
 sconscripts = []
 
 if LoadComponent('base'):
-  sconscripts.append('$BASE_DIR/SConscript')
+  sconscripts.append('$BASE_DIR/base.scons')
 
 if LoadComponent('breakpad'):
   sconscripts.append('$BREAKPAD_DIR/SConscript')
 
 if LoadComponent('chrome'):
   sconscripts.append('$CHROME_DIR/SConscript')
 
 if LoadComponent('gears'):
   sconscripts.append('$GEARS_DIR/SConscript')
 
 if LoadComponent('google_update'):
   sconscripts.append('$GOOGLE_UPDATE_DIR/SConscript')
 
 if LoadComponent('googleurl'):
   # googleurl comes from a different repository so we provide the SConscript
   # file.
-  sconscripts.append('SConscript.googleurl')
+  sconscripts.append('$GOOGLEURL_DIR/googleurl.scons')
 
 if LoadComponent('net'):
-  sconscripts.append('$NET_DIR/SConscript')
+  sconscripts.append('$NET_DIR/net.scons')
 
 if LoadComponent('rlz'):
   sconscripts.append('$RLZ_DIR/SConscript')
 
 if LoadComponent('sandbox'):
   sconscripts.append('$SANDBOX_DIR/src/SConscript')
 
 if LoadComponent('sdch'):
   sconscripts.append('$SDCH_DIR/SConscript')
 
 if LoadComponent('skia'):
   sconscripts.append('$SKIA_DIR/SConscript')
 
 if LoadComponent('testing'):
   sconscripts.append('$TESTING_DIR/SConscript.gtest')
 
 if LoadComponent('third_party'):
   sconscripts.extend([
       '$BSDIFF_DIR/SConscript',
-      '$BZIP2_DIR/SConscript',
-      '$ICU38_DIR/SConscript',
-      '$LIBPNG_DIR/SConscript',
+      '$BZIP2_DIR/bzip2.scons',
+      '$ICU38_DIR/icu38.scons',
+      '$LIBPNG_DIR/libpng.scons',
       '$LZMA_SDK_DIR/SConscript',
-      '$MODP_B64_DIR/SConscript',
-      '$ZLIB_DIR/SConscript',
+      '$MODP_B64_DIR/modp_b64.scons',
+      '$ZLIB_DIR/zlib.scons',
   ])
   # Temporary until we get these building on Mac.
   if env['PLATFORM'] != 'darwin':
     sconscripts.extend([
       '$LIBJPEG_DIR/SConscript',
       '$LIBXML_DIR/SConscript',
       '$LIBXSLT_DIR/SConscript',
     ])
   if env['PLATFORM'] in ('posix', 'darwin'):
     sconscripts.extend([
-      '$LIBEVENT_DIR/SConscript',
+      '$LIBEVENT_DIR/libevent.scons',
     ])
   # This is temporary until we get this lib to build on other platforms.
   if env['PLATFORM'] == 'win32':
     sconscripts.extend([
         '$BSPATCH_DIR/SConscript',
     ])
 
 if LoadComponent('v8') and env.Dir('#/../v8').exists():
   env.SConscript('SConscript.v8',
                  exports=['env'])
@@ skipping 27 matching lines @@
     initial_indent = ' '*32,
     subsequent_indent = ' '*32,
   )
   components = tw.fill(', '.join(components))
 
   Help(help_fmt % components)
 
 
 Import('build_component')
 Default(build_component)