Commit 81b14262 authored by hausmann@webkit.org's avatar hausmann@webkit.org
Browse files

[Qt] Fix include paths for forwarding headers in standalone builds.

Patch by Jocelyn Turcotte <jocelyn.turcotte@nokia.com> on 2010-02-16
Reviewed by Simon Hausman.

* Api/DerivedSources.pro: Use relative paths for package builds and added some
documentation.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54814 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1ad8a3d4
......@@ -31,6 +31,8 @@ WEBKIT_CLASS_HEADERS = $${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${
regex = ".*\sclass\sQWEBKIT_EXPORT\s(\w+)\s(.*)"
for(HEADER, WEBKIT_API_HEADERS) {
# 1. Append to QtWebKit header that includes all other header files
qtheader_module.depends += $$HEADER
# Quotes need to be escaped once more when placed in eval()
eval(qtheader_module.commands += echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$basename(HEADER)\\\"$${DOUBLE_ESCAPED_QUOTE} >> $${qtheader_module.target} &&)
......@@ -39,12 +41,22 @@ for(HEADER, WEBKIT_API_HEADERS) {
HEADER_TARGET = $$replace(HEADER_NAME, [^a-zA-Z0-9_], -)
HEADER_TARGET = "qtheader-$${HEADER_TARGET}"
# 2. Create forwarding header files for qwebframe.h, etc.
# Normally they contain absolute paths, for package builds we make the path relative so that
# the package sources are relocatable.
PATH_TO_HEADER = $$HEADER
CONFIG(standalone_package): PATH_TO_HEADER = ../../WebKit/qt/Api/$$basename(HEADER)
eval($${HEADER_TARGET}.target = $${DESTDIR}/$${HEADER_NAME})
eval($${HEADER_TARGET}.depends = $$HEADER)
eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$HEADER\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$PATH_TO_HEADER\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
QMAKE_EXTRA_TARGETS += $$HEADER_TARGET
# 3. Extract class names of exported classes from the headers and generate
# the class name header files
src_words = $$cat($$HEADER)
# Really make sure we're dealing with words
src_words = $$split(src_words, " ")
......
2010-02-16 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Simon Hausman.
[Qt] Fix include paths for forwarding headers in standalone builds.
* Api/DerivedSources.pro: Use relative paths for package builds and added some
documentation.
2010-02-15 Noam Rosenthal <noam.rosenthal@nokia.com>
 
Reviewed by Simon Hausmann.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment