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

3 files changed, 9 insertions, 9 deletions

diff --git a/chrome/installer/mini_installer/installer_unittests.scons b/chrome/installer/mini_installer/installer_unittests.scons
index 13119b9..9dd31f2 100644
--- a/chrome/installer/mini_installer/installer_unittests.scons
+++ b/chrome/installer/mini_installer/installer_unittests.scons
@@ -22,7 +22,7 @@ env.Prepend(
     ],
 )
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env.FilterOut(
       LIBS = ['DelayImp.lib'],
   )
diff --git a/chrome/installer/mini_installer/mini_installer.scons b/chrome/installer/mini_installer/mini_installer.scons
index f9d0dd2..89c0d62 100644
--- a/chrome/installer/mini_installer/mini_installer.scons
+++ b/chrome/installer/mini_installer/mini_installer.scons
@@ -12,11 +12,11 @@ env.ApplySConscript([
 
 
 # TODO(port):  Don't be too fooled by the presence of all the
-# if env['PLATFORM'] == 'win32' tests in this file into thinking
+# if env.Bit('windows') tests in this file into thinking
 # this is necessarily portable.  They're just there to wall off the
 # obviously windows-specific things
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env_res = env.Clone()
 
   env_res.Append(
@@ -42,7 +42,7 @@ env.Prepend(
     ],
 )
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env.FilterOut(
       LIBS = ['DelayImp.lib'],
       CCFLAGS = ['/RTC1'],
@@ -80,7 +80,7 @@ input_files = [
     "pe_resource.cc",
 ]
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   input_files.extend([
       "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj",
       "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj",
@@ -109,6 +109,6 @@ exe_version_rc = env.ChromeVersionRC('mini_installer_exe_version.rc',
                                      'mini_installer_exe_version.rc.version',
                                      PWD=Dir('.'))
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   # TODO(sgk):  implicit dependency should be picked up automatically
   env_res.Depends(resources, exe_version_rc)
diff --git a/chrome/installer/setup/setup.scons b/chrome/installer/setup/setup.scons
index 1a73359..b0ef23b 100644
--- a/chrome/installer/setup/setup.scons
+++ b/chrome/installer/setup/setup.scons
@@ -13,7 +13,7 @@ env.ApplySConscript([
     '$LZMA_SDK_DIR/using_lzma_sdk.scons',
 ])
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env_res = env.Clone()
 
   env_res.Append(
@@ -46,7 +46,7 @@ env.Prepend(
     ],
 )
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env.Prepend(
       LINKFLAGS = [
           '/INCREMENTAL',
@@ -87,6 +87,6 @@ exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc',
                                      'setup_exe_version.rc.version',
                                      PWD = env.Dir('.'))
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   # TODO(sgk):  implicit dependency should be picked up automatically
   env_res.Depends(resources, exe_version_rc)