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 /chrome/browser/browser.scons | |
| 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 'chrome/browser/browser.scons')
| -rw-r--r-- | chrome/browser/browser.scons | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 840013f..587da3c 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -30,7 +30,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', @@ -39,7 +39,7 @@ if env['PLATFORM'] == 'win32': input_files = [] -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO: Port to Mac. input_files.extend([ 'autocomplete/keyword_provider.cc', @@ -117,7 +117,7 @@ if env['PLATFORM'] in ('posix', 'win32'): 'webdata/web_database.cc', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # TODO: Port these. input_files.extend([ 'autofill_manager.cc', @@ -300,11 +300,11 @@ if env['PLATFORM'] == 'win32': 'web_contents_view_win.cc', ]) -if env['PLATFORM'] in ('darwin', 'posix'): +if env.Bit('posix'): input_files.extend([ 'importer/firefox_profile_lock_posix.cc', ]) -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO: This should work for all platforms. env.ChromeStaticLibrary('browser', input_files) |