[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 314324df5578fd340469f8c1dbe005b29817ebcd
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 23:20:28 2010 +0000

    2010-09-22  Andras Becsi  <abecsi at webkit.org>
    
            Unreviewed build fix after r68079.
    
            [Qt] Also generate WebPage's message-receiving code and message types
            for the Qt port of WebKit2.
    
            * DerivedSources.pro:
            * WebKit2.pro:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68097 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1051e40..5e12081 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-22  Andras Becsi  <abecsi at webkit.org>
+
+        Unreviewed build fix after r68079.
+
+        [Qt] Also generate WebPage's message-receiving code and message types
+        for the Qt port of WebKit2.
+
+        * DerivedSources.pro:
+        * WebKit2.pro:
+
 2010-09-22  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index e5b941f..5a8a7cd 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -29,7 +29,8 @@ win32-msvc*|symbian {
 DIRS = \
     $$OUTPUT_DIR/include/JavaScriptCore \
     $$OUTPUT_DIR/include/WebCore \
-    $$OUTPUT_DIR/include/WebKit2
+    $$OUTPUT_DIR/include/WebKit2 \
+    $$OUTPUT_DIR/WebKit2/generated
 
 for(DIR, DIRS) {
     !exists($$DIR): system($$QMAKE_MKDIR $$DIR)
@@ -39,6 +40,16 @@ 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/WebProcess/WebPage/WebPage.messages.in
+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/WebProcess/WebPage/WebPage.messages.in
+generated_files.depends            += messagereceiver_generator
+QMAKE_EXTRA_TARGETS                += messagereceiver_generator
+
 fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKit2/generate-forwarding-headers.pl $${OUTPUT_DIR}/include qt
 fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKit2/generate-forwarding-headers.pl
 generated_files.depends     += fwheader_generator
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index fc8f6a5..c4dce39 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -129,7 +129,8 @@ INCLUDEPATH = \
 
 INCLUDEPATH += \
     $$OUTPUT_DIR/include \
-    $$OUTPUT_DIR/WebCore/generated
+    $$OUTPUT_DIR/WebCore/generated \
+    $$OUTPUT_DIR/WebKit2/generated
 
 
 PREFIX_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
@@ -137,6 +138,12 @@ QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
 
 DEFINES += BUILDING_QT__
 
+WEBKIT2_GENERATED_HEADERS = \
+    $$OUTPUT_DIR/WebKit2/generated/WebPageMessages.h
+
+WEBKIT2_GENERATED_SOURCES = \
+    $$OUTPUT_DIR/WebKit2/generated/WebPageMessageReceiver.cpp
+
 HEADERS += \
     Platform/CoreIPC/ArgumentDecoder.h \
     Platform/CoreIPC/ArgumentEncoder.h \
@@ -144,6 +151,7 @@ HEADERS += \
     Platform/CoreIPC/Attachment.h \
     Platform/CoreIPC/Connection.h \
     Platform/CoreIPC/CoreIPCMessageKinds.h \
+    Platform/CoreIPC/HandleMessage.h \
     Platform/CoreIPC/MessageID.h \
     Platform/Module.h \
     Platform/PlatformProcessIdentifier.h \
@@ -153,7 +161,6 @@ HEADERS += \
     Platform/WorkQueue.h \
     Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
     Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
-    Shared/CoreIPCSupport/WebPageMessageKinds.h \
     Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \
     Shared/CoreIPCSupport/WebProcessMessageKinds.h \
     Shared/DrawingAreaBase.h \
@@ -270,6 +277,7 @@ HEADERS += \
     WebProcess/WebPage/WebFrame.h \
     WebProcess/WebPage/WebPage.h \
     WebProcess/WebProcess.h \
+    $$WEBKIT2_GENERATED_HEADERS
 
 SOURCES += \
     Platform/CoreIPC/ArgumentDecoder.cpp \
@@ -395,3 +403,4 @@ SOURCES += \
     UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp \
     UIProcess/qt/WebContextQt.cpp \
     WebProcess/qt/WebProcessMainQt.cpp \
+    $$WEBKIT2_GENERATED_SOURCES

-- 
WebKit Debian packaging