[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 14:34:10 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 85b5a2e1214f3a4d8ea45a80b3a2e2c8fafbee7b
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 13 13:09:29 2010 +0000
2010-10-13 Csaba Osztrogonác <ossy at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Simplify code generation in WebKit2/DerivedSources.pro
https://bugs.webkit.org/show_bug.cgi?id=47543
* DerivedSources.pro: General generator rules added instead of copy/paste code to converge Makefile.DerivedSources.
* WebKit2.pro: PluginProcess' headers and sources added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69653 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ccdec75..b4393c8 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-13 Csaba Osztrogonác <ossy at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Simplify code generation in WebKit2/DerivedSources.pro
+ https://bugs.webkit.org/show_bug.cgi?id=47543
+
+ * DerivedSources.pro: General generator rules added instead of copy/paste code to converge Makefile.DerivedSources.
+ * WebKit2.pro: PluginProcess' headers and sources added.
+
2010-10-13 Andreas Kling <kling at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 157089c..4ae71a6 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -41,41 +41,71 @@ QMAKE_EXTRA_TARGETS += createdirs
SRC_ROOT_DIR = $$replace(PWD, /WebKit2, /)
-messageheader_generator.commands = python $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-messages-header.py $${SRC_ROOT_DIR}/WebKit2/WebProcess/WebPage/WebPage.messages.in > $$OUTPUT_DIR/WebKit2/generated/WebPageMessages.h
-messageheader_generator.depends = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-messages-header.py $${SRC_ROOT_DIR}/WebKit2/Scripts/webkit2/messages.py $${SRC_ROOT_DIR}/WebKit2/WebProcess/WebPage/WebPage.messages.in
-messageheader_generator.target = $${OUTPUT_DIR}/WebKit2/generated/WebPageMessages.h
-generated_files.depends += messageheader_generator
-QMAKE_EXTRA_TARGETS += messageheader_generator
-
-messagereceiver_generator.commands = python $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-message-receiver.py $${SRC_ROOT_DIR}/WebKit2/WebProcess/WebPage/WebPage.messages.in > $$OUTPUT_DIR/WebKit2/generated/WebPageMessageReceiver.cpp
-messagereceiver_generator.depends = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-message-receiver.py $${SRC_ROOT_DIR}/WebKit2/Scripts/webkit2/messages.py $${SRC_ROOT_DIR}/WebKit2/WebProcess/WebPage/WebPage.messages.in
-messagereceiver_generator.target = $${OUTPUT_DIR}/WebKit2/generated/WebPageMessageReceiver.cpp
-generated_files.depends += messagereceiver_generator
-QMAKE_EXTRA_TARGETS += messagereceiver_generator
-
-pageproxymessageheader_generator.commands = python $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-messages-header.py $${SRC_ROOT_DIR}/WebKit2/UIProcess/WebPageProxy.messages.in > $$OUTPUT_DIR/WebKit2/generated/WebPageProxyMessages.h
-pageproxymessageheader_generator.depends = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-messages-header.py $${SRC_ROOT_DIR}/WebKit2/Scripts/webkit2/messages.py $${SRC_ROOT_DIR}/WebKit2/UIProcess/WebPageProxy.messages.in
-pageproxymessageheader_generator.target = $${OUTPUT_DIR}/WebKit2/generated/WebPageProxyMessages.h
-generated_files.depends += pageproxymessageheader_generator
-QMAKE_EXTRA_TARGETS += pageproxymessageheader_generator
-
-pageproxymessagereceiver_generator.commands = python $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-message-receiver.py $${SRC_ROOT_DIR}/WebKit2/UIProcess/WebPageProxy.messages.in > $$OUTPUT_DIR/WebKit2/generated/WebPageProxyMessageReceiver.cpp
-pageproxymessagereceiver_generator.depends = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-message-receiver.py $${SRC_ROOT_DIR}/WebKit2/Scripts/webkit2/messages.py $${SRC_ROOT_DIR}/WebKit2/UIProcess/WebPageProxy.messages.in
-pageproxymessagereceiver_generator.target = $${OUTPUT_DIR}/WebKit2/generated/WebPageProxyMessageReceiver.cpp
-generated_files.depends += pageproxymessagereceiver_generator
-QMAKE_EXTRA_TARGETS += pageproxymessagereceiver_generator
-
-processmessageheader_generator.commands = python $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-messages-header.py $${SRC_ROOT_DIR}/WebKit2/WebProcess/WebProcess.messages.in > $$OUTPUT_DIR/WebKit2/generated/WebProcessMessages.h
-processmessageheader_generator.depends = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-messages-header.py $${SRC_ROOT_DIR}/WebKit2/Scripts/webkit2/messages.py $${SRC_ROOT_DIR}/WebKit2/WebProcess/WebProcess.messages.in
-processmessageheader_generator.target = $${OUTPUT_DIR}/WebKit2/generated/WebProcessMessages.h
-generated_files.depends += processmessageheader_generator
-QMAKE_EXTRA_TARGETS += processmessageheader_generator
-
-processmessagereceiver_generator.commands = python $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-message-receiver.py $${SRC_ROOT_DIR}/WebKit2/WebProcess/WebProcess.messages.in > $$OUTPUT_DIR/WebKit2/generated/WebProcessMessageReceiver.cpp
-processmessagereceiver_generator.depends = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-message-receiver.py $${SRC_ROOT_DIR}/WebKit2/Scripts/webkit2/messages.py $${SRC_ROOT_DIR}/WebKit2/WebProcess/WebProcess.messages.in
-processmessagereceiver_generator.target = $${OUTPUT_DIR}/WebKit2/generated/WebProcessMessageReceiver.cpp
-generated_files.depends += processmessagereceiver_generator
-QMAKE_EXTRA_TARGETS += processmessagereceiver_generator
+defineTest(addExtraCompiler) {
+ eval($${1}.CONFIG = target_predeps no_link)
+ eval($${1}.variable_out =)
+ eval($${1}.dependency_type = TYPE_C)
+
+ wkScript = $$eval($${1}.wkScript)
+ eval($${1}.depends += $$wkScript)
+
+ export($${1}.CONFIG)
+ export($${1}.variable_out)
+ export($${1}.dependency_type)
+ export($${1}.depends)
+
+ QMAKE_EXTRA_COMPILERS += $$1
+ generated_files.depends += compiler_$${1}_make_all
+ export(QMAKE_EXTRA_COMPILERS)
+ export(generated_files.depends)
+ return(true)
+}
+
+defineReplace(message_header_generator_output) {
+ FILENAME=$$basename(1)
+ return($$OUTPUT_DIR/WebKit2/generated/$$replace(FILENAME, ".messages.in","Messages.h"))
+}
+
+defineReplace(message_receiver_generator_output) {
+ FILENAME=$$basename(1)
+ return($$OUTPUT_DIR/WebKit2/generated/$$replace(FILENAME, ".messages.in","MessageReceiver.cpp"))
+}
+
+VPATH = \
+ PluginProcess \
+ WebProcess/Plugins \
+ WebProcess/WebPage \
+ WebProcess \
+ UIProcess \
+ UIProcess/Plugins
+
+MESSAGE_RECEIVERS = \
+ PluginControllerProxy.messages.in \
+ PluginProcess.messages.in \
+ PluginProcessProxy.messages.in \
+ PluginProxy.messages.in \
+ WebPage/WebPage.messages.in \
+ WebPageProxy.messages.in \
+ WebProcess.messages.in \
+ WebProcessConnection.messages.in
+
+SCRIPTS = \
+ $$PWD/Scripts/generate-message-receiver.py \
+ $$PWD/Scripts/generate-messages-header.py \
+ $$PWD/Scripts/webkit2/__init__.py \
+ $$PWD/Scripts/webkit2/messages.py
+
+message_header_generator.commands = python $${SRC_ROOT_DIR}WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+message_header_generator.input = MESSAGE_RECEIVERS
+message_header_generator.depends = $$SCRIPTS
+message_header_generator.output_function = message_header_generator_output
+addExtraCompiler(message_header_generator)
+
+message_receiver_generator.commands = python $${SRC_ROOT_DIR}WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+message_receiver_generator.input = MESSAGE_RECEIVERS
+message_receiver_generator.depends = $$SCRIPTS
+message_receiver_generator.output_function = message_receiver_generator_output
+addExtraCompiler(message_receiver_generator)
fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKit2 $${OUTPUT_DIR}/include qt
fwheader_generator.depends = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 4a532a5..a8ea6d1 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -141,13 +141,23 @@ QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
DEFINES += BUILDING_QT__
WEBKIT2_GENERATED_HEADERS = \
+ $$OUTPUT_DIR/WebKit2/generated/PluginControllerProxyMessages.h \
+ $$OUTPUT_DIR/WebKit2/generated/PluginProcessMessages.h \
+ $$OUTPUT_DIR/WebKit2/generated/PluginProcessProxyMessages.h \
+ $$OUTPUT_DIR/WebKit2/generated/PluginProxyMessages.h \
$$OUTPUT_DIR/WebKit2/generated/WebPageMessages.h \
$$OUTPUT_DIR/WebKit2/generated/WebPageProxyMessages.h \
+ $$OUTPUT_DIR/WebKit2/generated/WebProcessConnectionMessages.h \
$$OUTPUT_DIR/WebKit2/generated/WebProcessMessages.h
WEBKIT2_GENERATED_SOURCES = \
+ $$OUTPUT_DIR/WebKit2/generated/PluginControllerProxyMessageReceiver.cpp \
+ $$OUTPUT_DIR/WebKit2/generated/PluginProcessMessageReceiver.cpp \
+ $$OUTPUT_DIR/WebKit2/generated/PluginProcessProxyMessageReceiver.cpp \
+ $$OUTPUT_DIR/WebKit2/generated/PluginProxyMessageReceiver.cpp \
$$OUTPUT_DIR/WebKit2/generated/WebPageMessageReceiver.cpp \
$$OUTPUT_DIR/WebKit2/generated/WebPageProxyMessageReceiver.cpp \
+ $$OUTPUT_DIR/WebKit2/generated/WebProcessConnectionMessageReceiver.cpp \
$$OUTPUT_DIR/WebKit2/generated/WebProcessMessageReceiver.cpp
HEADERS += \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list