Convert from using env['PLATFORM'] directly to using the more flexible

and better-thought-out Hammer env.Bits() idioms:
* env['PLATFORM'] == 'win32' => env.Bit('windows')
* env['PLATFORM'] == 'posix' => env.Bit('linux')
* env['PLATFORM'] == 'darwin' => env.Bit('mac')
New idioms:
* env.Bit('posix') => really does mean "any POSIX platform"
* env.AnyBits('mac', 'linux') => specifically mac or linux, excluding
  other POSIX platforms
Where we were using compound conditionals (e.g., "env['PLATFORM'] in
('posix', 'darwin')") I tried to take my best shot at translating
the intent (i.e., "env.Bits('posix')" for something POSIX, "not
env.Bits('mac')" for something not yet ported to Mac, etc.)
Review URL: http://codereview.chromium.org/15051

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

5 files changed, 13 insertions, 13 deletions

diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index b4f3596..9a3f119 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -120,7 +120,7 @@ env.Append(
     ],
 )
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
     env.Append(
         CPPPATH = [
                 # Windows workarounds to not having pthread.h and sched.h
@@ -157,11 +157,11 @@ wtf_inputs = [
     '$WTF_DIR/unicode/icu/CollatorICU.cpp',
 ]
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   wtf_inputs.extend([
       '$WTF_DIR/ThreadingWin.cpp',
   ])
-elif env['PLATFORM'] == 'posix':
+elif env.Bit('linux'):
   wtf_inputs.extend([
       '$WTF_DIR/gtk/MainThreadGtk.cpp',
       '$WTF_DIR/ThreadingPthreads.cpp',
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 8f3aa71..60e38aa 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -6,7 +6,7 @@ Import('env')
 
 env = env.Clone()
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
     env.Prepend(
         CPPDEFINES = [
                 'NOGDI',
@@ -344,7 +344,7 @@ inputs = [
     '$PORT_DIR/page/inspector/InspectorController.cpp',
 ]
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   inputs.append('precompiled_v8bindings.cpp')
 
 env.ChromeStaticLibrary('V8Bindings', inputs)
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index fdab0a5..869f493 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -6,7 +6,7 @@ Import('env')
 
 env = env.Clone()
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env.Append(
     CCFLAGS = [
       '/TP',
@@ -24,7 +24,7 @@ if env['PLATFORM'] == 'win32':
     ],
   )
 
-if env['PLATFORM'] in ('darwin', 'posix'):
+if env.Bit('posix'):
   if '-Wall' in env['CXXFLAGS'] and '-Werror' in env['CXXFLAGS']:
     # It'd be nice to fix these warnings upstream, but we're not going to
     # block on it.
@@ -803,7 +803,7 @@ input_files = [
 ]
 
 # These files don't compile yet on linux or mac.
-if env['PLATFORM'] in ('darwin'):
+if env.Bit('mac'):
   remove_files = [
     # includes platform specific FontCustomPlatformData.h
     '$WEBCORE_DIR/css/CSSFontFaceSource.cpp',
@@ -813,7 +813,7 @@ if env['PLATFORM'] in ('darwin'):
     input_files.remove(remove)
 
 # These files don't compile on the mac
-if env['PLATFORM'] in ('darwin'):
+if env.Bit('mac'):
   remove_files = [
     # Missing WebCore::FrameView::printPanScrollIcon
     '$WEBCORE_DIR/page/EventHandler.cpp',
@@ -822,7 +822,7 @@ if env['PLATFORM'] in ('darwin'):
     input_files.remove(remove)
 
 # Precompiled headers only work under MSVC in scons.
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env_p = env.Clone()
   env_p.Append(CCFLAGS='/Ylwebcore')
   pch, obj = env_p.PCH('$OBJ_ROOT/webkit/build/precompiled_webkit.cc')
diff --git a/webkit/build/localized_strings/SConscript b/webkit/build/localized_strings/SConscript
index 5d7cef2..7e99dc7 100644
--- a/webkit/build/localized_strings/SConscript
+++ b/webkit/build/localized_strings/SConscript
@@ -16,7 +16,7 @@ env_res.Append(
     ],
 )
 
-if env_res['PLATFORM'] == 'win32':
+if env_res.Bit('windows'):
   env_res.Append(
       RCFLAGS = [
           ["/l", "0x409"],
@@ -34,6 +34,6 @@ generated = env_grd.GRIT(
     '$TARGET_ROOT/grit_derived_sources/fake_generated_target',
     '$CHROME_SRC_DIR/webkit/glue/webkit_strings.grd')
 
-if env_res['PLATFORM'] == 'win32':
+if env_res.Bit('windows'):
   for g in [g for g in generated if str(g).endswith('.rc')]:
     env_res.RES(g)
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index 6b63e84..f374253 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -125,7 +125,7 @@ env.Replace(
                   '${SOURCES[0].posix}',
 )
 
-if env['PLATFORM'] == 'mac':  # Mac OS X
+if env.Bit('mac'):  # Mac OS X
   env['BINDINGSPREFIX'] = 'DOM'
   env['BINDINGS_GENERATOR_ARG'] = 'ObjC'
   env['BINDINGS_LANGUAGE'] = 'LANGUAGE_OBJECTIVE_C'