Get rid of separate SConscript.main.linux:

* Set -j default to %NUMBER_OF_PROCESSORS% + 1 only on Windows.
* Initialize LOAD= modules up front, and let Linux override to the subset that are currently building.
* Initialize Linux CCFLAGS, LINKFLAGS and LIBS in a separate if-clause (like we do for Windows).
* Remove SCONSCRIPT_MAIN code in {base,chrome}/SConstruct in favor of just call ../build/SConscript.main.
* Merge in evanm's changes to base/SConscript for separate lists of platform-neutral and platform-specific source files and test files.
R=evanm,deanm

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@727 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 12 deletions

diff --git a/build/SConscript.main b/build/SConscript.main
index 1c5af2e..8816938 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -31,9 +31,6 @@ import os
 import shutil
 import sys
 
-#TODO(rspangler): extra imports for testing
-#from SCons.Script.__init__ import *
-
 
 p = ARGUMENTS.get('PROGRESS')
 if p == 'spinner':
@@ -44,8 +41,12 @@ elif p == 'name':
 
 SetOption('warn', ['no-missing-sconscript'] + GetOption('warn'))
 
-processors = int(os.environ.get('NUMBER_OF_PROCESSORS', 1))
-SetOption('num_jobs', processors + 1)
+
+load = ARGUMENTS.get('LOAD')
+if load:
+    load = load.split(',')
+else:
+    load = []
 
 
 env = Environment(
@@ -124,6 +125,9 @@ env.AddMethod(ChromeSharedLibrary, "ChromeSharedLibrary")
 
 if env['PLATFORM'] == 'win32':
 
+  processors = int(os.environ.get('NUMBER_OF_PROCESSORS', 1))
+  SetOption('num_jobs', processors + 1)
+
   msvs_env = Environment(tools=['msvc', 'mslink', 'msvs'])['ENV']
 
   env.Replace(
@@ -262,7 +266,14 @@ if env['PLATFORM'] == 'win32':
 
 elif env['PLATFORM'] == 'posix':
 
-  env.Replace()
+  # For now, linux only loads the components we know work on Linux, by default.
+  load = ['base', 'testing', 'third_party']
+
+  env.Replace(
+      # TODO(linux): we should also compile with -Werror, but not yet.
+      CCFLAGS = ['-m32', '-g'],
+      LINKFLAGS = ['-m32'],
+  )
 
 else:
 
@@ -299,12 +310,6 @@ env.Decider('MD5-timestamp')
 env.Dir('$TARGET_ROOT').addRepository(Dir('..'))
 
 
-load = ARGUMENTS.get('LOAD')
-if load:
-    load = load.split(',')
-else:
-    load = []
-
 included = [c for c in load if not c.startswith('-')]
 excluded = [c[1:] for c in load if c.startswith('-')]
 if not included: