summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authorbenl@chromium.org <benl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-07 16:39:46 +0000
committerbenl@chromium.org <benl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-07 16:39:46 +0000
commitfb66f9deac79dfe9e0eedc184705e824ae9144c3 (patch)
tree019f94cbb5f93009383182cffe8184009adcb6e6 /webkit/build
parentccf440ed5cf9f0a3368457c73a7496a900e03c06 (diff)
downloadchromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.zip
chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.tar.gz
chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.tar.bz2
Added USE_GDK, set when either TOOLKIT_GTK or TOOLKIT_VIEWS is set but
not OS_WIN. Added USE_X11. Set when OS_LINUX or OS_FREEBSD is set. Added USE_BASE_DATA_PACK for base::DataPack usage, set for OS_MACOSX, OS_LINUX or OS_FREEBSD. Added USE_NSS for ... nss (for crypto). Windows and MacOS use platform-specific libraries. All of the above cause slightly odd formulations like: #if defined(OS_WIN) ... #elif defined(USE_BASE_DATA_PACK) ... #endif Possibly should also define USE_DLL_FOR_DATA, etc? Or something? Wrapped various references to struct stat64 and stat64() to use struct stat and stat() for FreeBSD - but a "man stat64" on Linux suggests that we could do the same thing for at least Linux, too, and perhaps eliminate the wrapper? git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rwxr-xr-xwebkit/build/rule_gperf.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/build/rule_gperf.py b/webkit/build/rule_gperf.py
index 873eff8..ef24b40 100755
--- a/webkit/build/rule_gperf.py
+++ b/webkit/build/rule_gperf.py
@@ -41,13 +41,16 @@ assert input_name in gperf_commands
(input_root, input_ext) = posixpath.splitext(input_name)
output_cpp = posixpath.join(output_dir, input_root + '.cpp')
-command = ['gperf', '--output-file', output_cpp]
+#command = ['gperf', '--output-file', output_cpp]
+command = ['gperf']
command.extend(gperf_commands[input_name])
command.append(input_file)
+ofile = open(output_cpp, 'w')
+
# Do it. check_call is new in 2.5, so simulate its behavior with call and
# assert.
-return_code = subprocess.call(command)
+return_code = subprocess.call(command, stdout=ofile.fileno())
assert return_code == 0
output_c = posixpath.join(output_dir, input_root + '.c')