diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
| commit | b96fc5dc177d311db220dc4039e74a9c0d871558 (patch) | |
| tree | 9bbc6ea3af7c0da75d4b6025d4b475dd62eec0b2 /webkit/SConscript | |
| parent | db8635032b1f83436a072be14e425076a7bd8164 (diff) | |
| download | chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.zip chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.gz chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.bz2 | |
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
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 5867657..2cb73e7 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -40,9 +40,9 @@ 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 = [ @@ -56,7 +56,7 @@ elif env['PLATFORM'] == 'darwin': '$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. @@ -64,7 +64,7 @@ elif env['PLATFORM'] == 'posix': ], ) -if env['PLATFORM'] in ('darwin', 'posix'): +if env.Bit('posix'): env.Append( CCFLAGS = [ '-Wno-parentheses', @@ -234,7 +234,7 @@ sconscript_dirs = env.ChromiumLoadComponentSConscripts( 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( @@ -272,7 +272,7 @@ env.SConscript(sconscript_dirs, exports=['env', 'env_res']) # 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', |