summaryrefslogtreecommitdiffstats
path: root/webkit/build/port
diff options
context:
space:
mode:
authormmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-04 00:04:38 +0000
committermmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-04 00:04:38 +0000
commit820e2fa87e89bfbc98495b8041894d8bacb7d919 (patch)
tree4a1fac05602d121a2fb3c25ff395dd77a7d3f33c /webkit/build/port
parent91bb6524cc24c8f5ee0ff3737a0ac0b381436f25 (diff)
downloadchromium_src-820e2fa87e89bfbc98495b8041894d8bacb7d919.zip
chromium_src-820e2fa87e89bfbc98495b8041894d8bacb7d919.tar.gz
chromium_src-820e2fa87e89bfbc98495b8041894d8bacb7d919.tar.bz2
[abridged bug report from keunwoo]
These commands directly use 'type', which is the Microsofty way of saying 'cat'. type is also a valid shell builtin on Bourne-style shells, including bash and dash, with completely different semantics and slightly different error behavior among shells. Whereas dash will silently echo the line foo is foo for any foo which is not recognized, bash dies with an error that looks like this: type: foo: not found Since the default /bin/sh on Ubuntu Hardy is dash, the above scons commands silently pass, happily producing bogus html4.css and quirks.css. Review URL: http://codereview.chromium.org/415 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/port')
-rw-r--r--webkit/build/port/SConscript11
1 files changed, 9 insertions, 2 deletions
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index 6c13f74..be6b813 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -521,16 +521,23 @@ env.Command(['$DERIVED_DIR/XLinkNames.cpp',
#WebCore.exp : WebCore.base.exp WebCore.SVG.exp
# cat $^ > $@
+def cat_files(target, source, env):
+ fout = open(str(target[0]), "w")
+ for src in source:
+ fin = open(str(src))
+ fout.writelines(fin.readlines())
+ fin.close()
+ fout.close()
env.Command('$DERIVED_DIR/html4.css',
['$WEBKIT_PORT_DIR/css/html4.css',
'$PORTROOT/css/html4-overrides.css'],
- 'type $SOURCES > $TARGETS')
+ cat_files)
env.Command('$DERIVED_DIR/quirks.css',
['$WEBKIT_PORT_DIR/css/quirks.css',
'$PORTROOT/css/quirks-overrides.css'],
- 'type $SOURCES > $TARGETS')
+ cat_files)
env.Command(['$DERIVED_DIR/UserAgentStyleSheets.h',
'$DERIVED_DIR/UserAgentStyleSheetsData.cpp'],