Start stitching GYP-generated files into the Linux build:...

base/base_main.scons

Index: base/base_main.scons
===================================================================
--- base/base_main.scons	(revision 10561)
+++ base/base_main.scons	(working copy)
@@ -3,44 +3,25 @@
 # found in the LICENSE file.
 
 __doc__ = """
-Configuration for building base.sln.
+Configuration for building the entire base "solution", including all
+the specific targets in various *.scons files, and a base.sln file
+on Windows.
 """
 
 Import('env')
 
-env = env.Clone()
+# Arrange for Hammer to add all programs to the 'base' Alias.
+env.Append(
+    COMPONENT_PROGRAM_GROUPS = ['base'],
+    COMPONENT_TEST_PROGRAM_GROUPS = ['base'],
+)
 
-env.Tool('MSVSNew')
+sconscript_files = [
+    'base.scons',
+    'base_gfx.scons',
+    'base_sln.scons',
+    'base_unittests.scons',
+    'debug_message.scons',
+]
 
-env.ChromeMSVSFolder('base dependencies',
-                     name='dependencies',
-                     entries = [
-                         '$ZLIB_DIR/zlib.vcproj',
-                         '$ICU38_DIR/build/icu.vcproj',
-                         '$ICU38_DIR/build/icudt.vcproj',
-                         '$TESTING_DIR/gtest.vcproj',
-                         '$LIBPNG_DIR/libpng.vcproj',
-                         '$SKIA_DIR/skia.vcproj',
-                     ],
-                     guid='{F216062D-F9C4-4883-A52C-2BE9ECADEEA0}')
-
-
-solution = env.ChromeMSVSSolution('base.sln',
-                                  dest='$CHROME_SRC_DIR/base/base.sln',
-                                  entries = [
-                                      '$BASE_DIR/build/base.vcproj',
-                                      '$BASE_DIR/build/base_unittests.vcproj',
-                                      '$BASE_DIR/build/debug_message.vcproj',
-                                      'base dependencies',
-                                      '$ICU38_DIR/build/icu.vcproj',
-                                      '$ICU38_DIR/build/icudt.vcproj',
-                                      '$BASE_DIR/build/base_gfx.vcproj',
-                                      '$SKIA_DIR/skia.vcproj',
-                                      '$LIBPNG_DIR/libpng.vcproj',
-                                      '$ZLIB_DIR/zlib.vcproj',
-                                      '$TESTING_DIR/gtest.vcproj',
-                                  ],
-                                  variants = [
-                                      'Debug|Win32',
-                                      'Release|Win32',
-                                  ])
+env.SConscript(sconscript_files, exports=['env'])
Property changes on: base/base_main.scons
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/base_sln.scons:r69-2775