diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 22:07:27 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 22:07:27 +0000 |
| commit | f8d434bd5be573b2954faa2ff4bfef37db6d194e (patch) | |
| tree | 0de372e9941087b7f1c6df83f6d758182de1158d /webkit/SConscript.javascriptcore_pcre | |
| parent | b096b26c613aa283549fbdc67cbb8e47321d53bd (diff) | |
| download | chromium_src-f8d434bd5be573b2954faa2ff4bfef37db6d194e.zip chromium_src-f8d434bd5be573b2954faa2ff4bfef37db6d194e.tar.gz chromium_src-f8d434bd5be573b2954faa2ff4bfef37db6d194e.tar.bz2 | |
Update the SCons build for the WebKit merge:
* Update relevant file lists.
* Modify CPPPATH directory lists to mirror the VS build.
* Add new command-line defines.
* Remove an incorrect /css/ subdirectory from the generated CSS*.in paths
so the DAG properly hooks them up with the right source files.
* Change the idiom when we exclude files that just haven't been ported
yet: keep all the to-be-ported files on the global list, and explicitly
remove them on the necessary platforms. (This should make it a little
easier to verify that we have all the right files, and the config
change when porting a file will be to just delete the relevant line.)
* Comment the use of addRepository().
Review URL: http://codereview.chromium.org/6323
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript.javascriptcore_pcre')
| -rw-r--r-- | webkit/SConscript.javascriptcore_pcre | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre index d13267c..2bd4aa0 100644 --- a/webkit/SConscript.javascriptcore_pcre +++ b/webkit/SConscript.javascriptcore_pcre @@ -39,7 +39,9 @@ input_files = [ '$PCRE_DIR/pcre_xclass.cpp', '$PCRE_DIR/pcre_ucp_searchfuncs.cpp', '$PCRE_DIR/pcre_tables.cpp', - '$PCRE_DIR/pcre_exec.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$PCRE_DIR/pcre_exec.cpp', + '$PENDING_DIR/pcre_exec.cpp', ] env.ChromeStaticLibrary('JavaScriptCore_pcre', input_files) |