[Qt] Build files for the WTR's InjectedBundle
authorkbalazs@webkit.org <kbalazs@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Oct 2010 17:12:33 +0000 (17:12 +0000)
committerkbalazs@webkit.org <kbalazs@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Oct 2010 17:12:33 +0000 (17:12 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@69315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
DerivedSources.pro
WebKit2/ChangeLog
WebKit2/WebKit2.pro
WebKitTools/ChangeLog
WebKitTools/Scripts/webkitdirs.pm
WebKitTools/WebKitTestRunner/qt/DerivedSources.pro [deleted file]

index 4921d6ce039d190292753c7db869f7ef1e803bf9..5348992bb183f3785969565651996a063bf674ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>, Andras Becsi  <abecsi@webkit.org>, Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add WTR's InjectedBundle build files.
+        https://bugs.webkit.org/show_bug.cgi?id=47333
+
+        * DerivedSources.pro:
+        * WebKit.pro:
+
 2010-10-07  Balazs Kelemen  <kbalazs@webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
index 0015af6eb79dd014f01e2c911d3a31d52044f150..76cb37e6cb86e0338fa1483116529c87ad53ac5f 100644 (file)
@@ -8,7 +8,9 @@ SUBDIRS += \
 
 webkit2 {
     SUBDIRS += WebKit2/DerivedSources.pro
-    SUBDIRS += WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
+
+    # Uncomment when WTR is ready upstream
+    #SUBDIRS += WebKitTools/WebKitTestRunner/DerivedSources.pro
 }
 
 for(subpro, SUBDIRS) {
index 64e5ecb80e253a866e995c35b2f79e6910eacabc..5d5a85291650a9bebd56ddea9cded683d6b34701 100644 (file)
@@ -1,3 +1,12 @@
+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>, Andras Becsi  <abecsi@webkit.org>, Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add WTR's InjectedBundle build files.
+        https://bugs.webkit.org/show_bug.cgi?id=47333
+
+        * WebKit2.pro:
+
 2010-10-07  Luiz Agostini  <luiz.agostini@openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.
index 021356d4d477611500e764dd4fc6590a30a31e02..02a8d863becb2d993ae45a3c92524ec001f8efa9 100644 (file)
@@ -103,6 +103,7 @@ INCLUDEPATH = \
     $$INCLUDEPATH
 
 INCLUDEPATH = \
+    $$PWD \
     Platform \
     Platform/CoreIPC \
     Shared \
@@ -306,6 +307,7 @@ SOURCES += \
     Platform/qt/RunLoopQt.cpp \
     Platform/qt/SharedMemoryQt.cpp \
     Platform/qt/WorkQueueQt.cpp \
+    Shared/API/c/WKArray.cpp \
     Shared/API/c/WKCertificateInfo.cpp \
     Shared/API/c/WKNumber.cpp \
     Shared/API/c/WKSerializedScriptValue.cpp \
@@ -376,7 +378,12 @@ SOURCES += \
     UIProcess/WebProcessManager.cpp \
     UIProcess/WebProcessProxy.cpp \
     UIProcess/WebUIClient.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundle.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp \
     WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundlePage.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp \
     WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp \
     WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp \
     WebProcess/InjectedBundle/InjectedBundle.cpp \
index b9b9a7dafea0698e58a0130112ff87fa2e90f771..58e71cd0b2e5968ff74058a233ecf2491de61085 100644 (file)
@@ -1,3 +1,17 @@
+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>, Andras Becsi  <abecsi@webkit.org>, Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add WTR's InjectedBundle build files.
+        https://bugs.webkit.org/show_bug.cgi?id=47333
+
+        * Scripts/webkitdirs.pm:
+        * WebKitTestRunner/DerivedSources.pro: Added.
+        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro: Added.
+        * WebKitTestRunner/WebKitTestRunner.pro: Added.
+        * WebKitTestRunner/qt/DerivedSources.pro: Removed.
+        Content merged in ../DerivedSources.pro
+
 2010-10-07  Balazs Kelemen  <kbalazs@webkit.org>
 
         Unreviewed. Do a renaming that was recommended by the reviewer
index 0218e1fbbc996e94aa7b1ff74f87d0dd5aa94d6e..2dfdae23367561ac7d1e641eb2e53e1596ca1d68 100644 (file)
@@ -1530,7 +1530,9 @@ sub buildQMakeProject($@)
     my @subdirs = ("JavaScriptCore", "WebCore", "WebKit/qt/Api");
     if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
         push @subdirs, "WebKit2";
-        push @subdirs, "WebKitTools/WebKitTestRunner/qt";
+
+        # Uncomment when WTR is ready upstream
+        #push @subdirs, "WebKitTools/WebKitTestRunner";
     }
 
     for my $subdir (@subdirs) {
diff --git a/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro b/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
deleted file mode 100644 (file)
index 6cd716e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = lib
-TARGET = dummy
-
-CONFIG -= debug_and_release
-
-SRC_ROOT_DIR = $$replace(PWD, /WebKitTools/WebKitTestRunner/qt, /)
-
-wtr_fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKitTools/WebKitTestRunner $${OUTPUT_DIR}/include qt
-wtr_fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
-generated_files.depends     += wtr_fwheader_generator
-QMAKE_EXTRA_TARGETS         += wtr_fwheader_generator
-
-jsc_fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/JavaScriptCore/API $${OUTPUT_DIR}/include qt
-jsc_fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
-generated_files.depends     += jsc_fwheader_generator
-QMAKE_EXTRA_TARGETS         += jsc_fwheader_generator
-
-QMAKE_EXTRA_TARGETS        += generated_files