[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kbalazs at webkit.org
kbalazs at webkit.org
Wed Dec 22 14:23:33 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 52e63c74dc78b7793d08f5b70d2619d171a89e6f
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 7 17:56:58 2010 +0000
2010-10-07 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r69315.
http://trac.webkit.org/changeset/69315
https://bugs.webkit.org/show_bug.cgi?id=47363
Forgot to add the new files (Requested by kbalazs on #webkit).
* DerivedSources.pro:
2010-10-07 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r69315.
http://trac.webkit.org/changeset/69315
https://bugs.webkit.org/show_bug.cgi?id=47363
Forgot to add the new files (Requested by kbalazs on #webkit).
* Scripts/webkitdirs.pm:
* WebKitTestRunner/qt/DerivedSources.pro: Added.
2010-10-07 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r69315.
http://trac.webkit.org/changeset/69315
https://bugs.webkit.org/show_bug.cgi?id=47363
Forgot to add the new files (Requested by kbalazs on #webkit).
* WebKit2.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69322 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 5348992..727e8b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-07 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r69315.
+ http://trac.webkit.org/changeset/69315
+ https://bugs.webkit.org/show_bug.cgi?id=47363
+
+ Forgot to add the new files (Requested by kbalazs on #webkit).
+
+ * DerivedSources.pro:
+
2010-10-07 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>, Andras Becsi <abecsi at webkit.org>, Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/DerivedSources.pro b/DerivedSources.pro
index 76cb37e..0015af6 100644
--- a/DerivedSources.pro
+++ b/DerivedSources.pro
@@ -8,9 +8,7 @@ SUBDIRS += \
webkit2 {
SUBDIRS += WebKit2/DerivedSources.pro
-
- # Uncomment when WTR is ready upstream
- #SUBDIRS += WebKitTools/WebKitTestRunner/DerivedSources.pro
+ SUBDIRS += WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
}
for(subpro, SUBDIRS) {
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2e2594c..7f22726 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-07 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r69315.
+ http://trac.webkit.org/changeset/69315
+ https://bugs.webkit.org/show_bug.cgi?id=47363
+
+ Forgot to add the new files (Requested by kbalazs on #webkit).
+
+ * WebKit2.pro:
+
2010-10-07 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 02a8d86..021356d 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -103,7 +103,6 @@ INCLUDEPATH = \
$$INCLUDEPATH
INCLUDEPATH = \
- $$PWD \
Platform \
Platform/CoreIPC \
Shared \
@@ -307,7 +306,6 @@ 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 \
@@ -378,12 +376,7 @@ 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 \
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c9cc356..a9535b6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-07 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r69315.
+ http://trac.webkit.org/changeset/69315
+ https://bugs.webkit.org/show_bug.cgi?id=47363
+
+ Forgot to add the new files (Requested by kbalazs on #webkit).
+
+ * Scripts/webkitdirs.pm:
+ * WebKitTestRunner/qt/DerivedSources.pro: Added.
+
2010-10-07 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 48dadcb..2df26f7 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1530,9 +1530,7 @@ sub buildQMakeProject($@)
my @subdirs = ("JavaScriptCore", "WebCore", "WebKit/qt/Api");
if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
push @subdirs, "WebKit2";
-
- # Uncomment when WTR is ready upstream
- #push @subdirs, "WebKitTools/WebKitTestRunner";
+ push @subdirs, "WebKitTools/WebKitTestRunner/qt";
}
for my $subdir (@subdirs) {
diff --git a/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro b/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
new file mode 100644
index 0000000..6cd716e
--- /dev/null
+++ b/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
@@ -0,0 +1,18 @@
+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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list