summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-18 23:26:29 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-18 23:26:29 +0000
commitb96fc5dc177d311db220dc4039e74a9c0d871558 (patch)
tree9bbc6ea3af7c0da75d4b6025d4b475dd62eec0b2 /third_party
parentdb8635032b1f83436a072be14e425076a7bd8164 (diff)
downloadchromium_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 'third_party')
-rw-r--r--third_party/bspatch/bspatch.scons4
-rw-r--r--third_party/bzip2/bzip2.scons2
-rw-r--r--third_party/libevent/libevent.scons8
-rw-r--r--third_party/libjpeg/libjpeg.scons4
-rw-r--r--third_party/libpng/libpng.scons2
-rw-r--r--third_party/libxml/libxml.scons8
-rw-r--r--third_party/libxslt/libxslt.scons6
-rw-r--r--third_party/lzma_sdk/lzma_sdk.scons2
-rw-r--r--third_party/sqlite/SConscript2
-rw-r--r--third_party/zlib/zlib.scons2
10 files changed, 20 insertions, 20 deletions
diff --git a/third_party/bspatch/bspatch.scons b/third_party/bspatch/bspatch.scons
index 6160e66..06db297 100644
--- a/third_party/bspatch/bspatch.scons
+++ b/third_party/bspatch/bspatch.scons
@@ -10,14 +10,14 @@ env.ApplySConscript([
'$LZMA_SDK_DIR/using_lzma_sdk.scons',
])
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TP',
'/wd4800',
],
)
-elif env['PLATFORM'] == 'posix':
+elif env.Bit('linux'):
# We're not responsible for bad warning hygiene in this third party code.
env.FilterOut(
CXXFLAGS = ['-Wall'],
diff --git a/third_party/bzip2/bzip2.scons b/third_party/bzip2/bzip2.scons
index 6089ea1..7b1a57a 100644
--- a/third_party/bzip2/bzip2.scons
+++ b/third_party/bzip2/bzip2.scons
@@ -19,7 +19,7 @@ env.Append(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TC',
diff --git a/third_party/libevent/libevent.scons b/third_party/libevent/libevent.scons
index 82e54ce..124f825 100644
--- a/third_party/libevent/libevent.scons
+++ b/third_party/libevent/libevent.scons
@@ -19,7 +19,7 @@ env.Append(
],
)
-if env['PLATFORM'] == 'darwin':
+if env.Bit('mac'):
env.Prepend(
CPPPATH = [
'$LIBEVENT_DIR/generated/',
@@ -31,7 +31,7 @@ if env['PLATFORM'] == 'darwin':
'sh ${SOURCES[0]} ${SOURCES[1]}')
-if env['PLATFORM'] == 'posix':
+if env.Bit('linux'):
env.Prepend(
CPPPATH = [
'$LIBEVENT_DIR/linux/',
@@ -61,13 +61,13 @@ input_files = [
'strlcpy.c',
]
-if env['PLATFORM'] == 'posix':
+if env.Bit('linux'):
input_files.extend([
'epoll.c',
'epoll_sub.c',
])
-if env['PLATFORM'] == 'darwin':
+if env.Bit('mac'):
input_files.extend([
'kqueue.c',
])
diff --git a/third_party/libjpeg/libjpeg.scons b/third_party/libjpeg/libjpeg.scons
index fdb2c2a..16b6bc3 100644
--- a/third_party/libjpeg/libjpeg.scons
+++ b/third_party/libjpeg/libjpeg.scons
@@ -41,14 +41,14 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TC',
'/wd4800',
],
)
-elif env['PLATFORM'] == 'posix':
+elif env.Bit('linux'):
if '-Wall' in env['CCFLAGS']:
# We're not responsible for bad warning hygiene in this third party code.
env['CCFLAGS'].remove('-Wall')
diff --git a/third_party/libpng/libpng.scons b/third_party/libpng/libpng.scons
index 01a932d..9187b5d 100644
--- a/third_party/libpng/libpng.scons
+++ b/third_party/libpng/libpng.scons
@@ -24,7 +24,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TP',
diff --git a/third_party/libxml/libxml.scons b/third_party/libxml/libxml.scons
index d403cd4..d8ba51f 100644
--- a/third_party/libxml/libxml.scons
+++ b/third_party/libxml/libxml.scons
@@ -49,14 +49,14 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TC',
'/wd4800',
],
)
-elif env['PLATFORM'] == 'posix':
+elif env.Bit('linux'):
env.Append(
CPPDEFINES = [
'_REENTRANT',
@@ -116,7 +116,7 @@ input_files = [
env.ChromeStaticLibrary('libxml', input_files)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
config_files = [
# The configure.js script must be first in this list; the
# env.Command() call below executes the first list element.
@@ -146,7 +146,7 @@ if env['PLATFORM'] == 'win32':
copied_files,
'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS',
CONFIG_OPTIONS='compiler=msvc iconv=no icu=yes')
-elif env['PLATFORM'] == 'posix':
+elif env.Bit('linux'):
config_files = [
'config.h',
'include/libxml/xmlversion.h',
diff --git a/third_party/libxslt/libxslt.scons b/third_party/libxslt/libxslt.scons
index 9a9ff71..6009d9f 100644
--- a/third_party/libxslt/libxslt.scons
+++ b/third_party/libxslt/libxslt.scons
@@ -55,7 +55,7 @@ env.Append(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TC',
@@ -88,7 +88,7 @@ input_files = [
env.ChromeStaticLibrary('libxslt', input_files)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
config_files = [
# The configure.js script must be first in this list; the
# env.Command() call below executes the first list element.
@@ -120,7 +120,7 @@ if env['PLATFORM'] == 'win32':
copied_sources,
'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS',
CONFIG_OPTIONS='compiler=msvc')
-elif env['PLATFORM'] == 'posix':
+elif env.Bit('linux'):
config_files = [
'config.h',
'xslt-config',
diff --git a/third_party/lzma_sdk/lzma_sdk.scons b/third_party/lzma_sdk/lzma_sdk.scons
index 86ea6aa..82da4b4 100644
--- a/third_party/lzma_sdk/lzma_sdk.scons
+++ b/third_party/lzma_sdk/lzma_sdk.scons
@@ -23,7 +23,7 @@ env.Append(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TC',
diff --git a/third_party/sqlite/SConscript b/third_party/sqlite/SConscript
index b348a54..a27c0fe 100644
--- a/third_party/sqlite/SConscript
+++ b/third_party/sqlite/SConscript
@@ -28,7 +28,7 @@ env.Append(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TC',
diff --git a/third_party/zlib/zlib.scons b/third_party/zlib/zlib.scons
index d37fafa..23809d4 100644
--- a/third_party/zlib/zlib.scons
+++ b/third_party/zlib/zlib.scons
@@ -18,7 +18,7 @@ env.Append(
ZLIB_LIB = ['zlib'],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TC',