diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 06:24:37 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 06:24:37 +0000 |
| commit | 8c464dab9e5b08f9b90c1867cea113594dc0e26a (patch) | |
| tree | 4cb56a7951c75d2d6b17afe0c700b358ba5ef668 /webkit/SConscript | |
| parent | aa9be60bf5ddd299ea216b958097fc550242c013 (diff) | |
| download | chromium_src-8c464dab9e5b08f9b90c1867cea113594dc0e26a.zip chromium_src-8c464dab9e5b08f9b90c1867cea113594dc0e26a.tar.gz chromium_src-8c464dab9e5b08f9b90c1867cea113594dc0e26a.tar.bz2 | |
Pre-substitute webkit includes to avoid repeated subsitution. This causes my null build to go from 45s to 30s.
Review URL: http://codereview.chromium.org/12828
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index eca7cb8..b57da88 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -55,10 +55,26 @@ elif env['PLATFORM'] == 'posix': ], ) +env.Append( + WEBCORE_DIR = '$THIRD_PARTY_WEBKIT_DIR/WebCore', + PENDING_DIR = "$WEBKIT_DIR/pending", + PORT_DIR = "$WEBKIT_DIR/port", + + JAVASCRIPTCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore", + WTF_DIR = "$JAVASCRIPTCORE_DIR/wtf", + KJS_DIR = "$JAVASCRIPTCORE_DIR/kjs", + PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre", + + V8BINDINGS_DIR = "$WEBKIT_DIR/V8Bindings", + DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"), + SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"), + + WEBKIT_DIR_PORT_INC = env.Dir("$CHROME_SRC_DIR/webkit/port"), +) + env.Prepend( - WEBKIT_DIR_PORT_INC = "$CHROME_SRC_DIR/webkit/port", - CPPPATH = [ + CPPPATH = [env.Dir(x) for x in [ '$WEBKIT_DIR/build/localized_strings', '$WEBKIT_DIR/build/JSConfig/WebCore', @@ -137,23 +153,10 @@ env.Prepend( '$CHROME_SRC_DIR/third_party/WebKit/WebCore/xml', '$CHROME_SRC_DIR', - ], + ]], ) env.Append( - WEBCORE_DIR = '$THIRD_PARTY_WEBKIT_DIR/WebCore', - PENDING_DIR = "$WEBKIT_DIR/pending", - PORT_DIR = "$WEBKIT_DIR/port", - - JAVASCRIPTCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore", - WTF_DIR = "$JAVASCRIPTCORE_DIR/wtf", - KJS_DIR = "$JAVASCRIPTCORE_DIR/kjs", - PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre", - - V8BINDINGS_DIR = "$WEBKIT_DIR/V8Bindings", - DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"), - SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"), - CPPDEFINES = [ 'U_STATIC_IMPLEMENTATION', '_SCL_SECURE_NO_DEPRECATE', |