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

webkit/SConscript

 # 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(['env'])
 
 env = env.Clone()
 env_res = env.Clone()
@@ skipping 22 matching lines @@
 # addRepository() for the entire $OBJ_ROOT tree, that adds an
 # extra -I or -L option for the webkit/port/ subdirectory, after the
 # third_party/WebKit/WebCore/ in the above list.  We'd like to
 # eliminate that in the future, but that will require some
 # deeper magic, and maybe a SCons modification.)
 
 port_dir = env.Dir('$WEBKIT_DIR/port')
 port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port'))
 port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore'))
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env['WEBKIT_PLATFORM_SUBDIR'] = 'win'
-elif env['PLATFORM'] == 'darwin':
+elif env.Bit('mac'):
   env['WEBKIT_PLATFORM_SUBDIR'] = 'mac'
   env.Append(
       CCFLAGS = [
           '-Wno-reorder',
           '-Wno-unused',
       ],
   )
   env.Prepend(
       CPPPATH = [env.subst(x) for x in [
           '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/cg',
           '$CHROME_SRC_DIR/third_party/WebKit/WebCore/loader/archive/cf',
       ]]
   )
-elif env['PLATFORM'] == 'posix':
+elif env.Bit('linux'):
   env.Append(
       CPPDEFINES = [
         # We want webkit to use pthreads rather than gthread.
         'WTF_USE_PTHREADS=1',
       ],
   )
 
-if env['PLATFORM'] in ('darwin', 'posix'):
+if env.Bit('posix'):
   env.Append(
       CCFLAGS = [
           '-Wno-parentheses',
       ],
   )
 
 env.Append(
     WEBCORE_DIR = '$THIRD_PARTY_WEBKIT_DIR/WebCore',
     PENDING_DIR = "$WEBKIT_DIR/pending",
     PORT_DIR = "$WEBKIT_DIR/port",
@@ skipping 149 matching lines @@
   bindings = 'build/port/SConscript',
   V8Bindings = 'build/V8Bindings/SConscript',
   WebCore = 'build/WebCore/SConscript',
   default_plugin = 'default_plugin/SConscript',
   glue = 'glue/SConscript',
   npapi_test_plugin = 'glue/plugins/test/SConscript',
   npapi_layout_test_plugin = 'tools/npapi_layout_test_plugin/SConscript',
   test_shell = 'tools/test_shell/SConscript',
 )
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   # These extra dirs aren't win32-specific, they're just the dirs that
   # haven't yet been made portable.
   sconscript_dirs.extend(env.ChromiumLoadComponentSConscripts(
     LOAD_NAMES = ['webkit'],
     activex_shim = 'activex_shim/SConscript',
     npaxshim = 'activex_shim_dll/SConscript',
   ))
 
   env.Append(
     CPPDEFINES = [
@@ skipping 17 matching lines @@
 
 env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
 
 # Setup alias for all webkit related targets.
 # We'd like to do this as follows, but it leads to out-of-memory
 # errors when SCons tries to use the entire contents of the
 # directory tree as a huge content-signature string.
 # Instead we're going to let all the subsidiary SConscript files
 # add their own individual targets to the 'webkit' Alias.
 #env.Alias('webkit', ['.', '$DESTINATION_ROOT/icudt38.dll'])
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env.Alias('webkit', ['$DESTINATION_ROOT/icudt38.dll'])
 
 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
                       ['$WEBCORE_DIR/Configurations/Version.xcconfig',
                        '$CHROME_SRC_DIR/webkit/build/webkit_version.py'],
                       "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}")
 env.AlwaysBuild(version)