[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Wed Dec 22 16:37:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e3841fc1f8f800435f1174c4152597a4fb9e5c2c
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 29 13:28:51 2010 +0000
2010-11-29 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Allow pre-generation for package builds for WebKit2
https://bugs.webkit.org/show_bug.cgi?id=50139
Use a build variable for the generated directory path and set the
value based on CONFIG just like for WebKit1.
For non-package builds use a relative base path for the
genrated directory just like for WebKit1.
* DerivedSources.pro:
* WebKit2.pro:
2010-11-29 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Allow pre-generation for package builds for WebKit2
https://bugs.webkit.org/show_bug.cgi?id=50139
Use a build variable for the generated directory path and set the
value based on CONFIG just like for WebKit1.
For non-package builds use a relative base path for the
genrated directory just like for WebKit1.
* WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
* WebKitTestRunner/qt/WebKitTestRunner.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72792 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c203d18..acb4533 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-29 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Allow pre-generation for package builds for WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=50139
+
+ Use a build variable for the generated directory path and set the
+ value based on CONFIG just like for WebKit1.
+
+ For non-package builds use a relative base path for the
+ genrated directory just like for WebKit1.
+
+ * DerivedSources.pro:
+ * WebKit2.pro:
+
2010-11-28 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 2b6a09d..618d790 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -3,15 +3,22 @@ TARGET = dummy
CONFIG -= debug_and_release
-WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \
- $$OUTPUT_DIR/WebCore/generated/HTMLNames.h \
- $$OUTPUT_DIR/WebCore/generated/JSCSSStyleDeclaration.h \
- $$OUTPUT_DIR/WebCore/generated/JSDOMWindow.h \
- $$OUTPUT_DIR/WebCore/generated/JSElement.h \
- $$OUTPUT_DIR/WebCore/generated/JSHTMLElement.h \
- $$OUTPUT_DIR/WebCore/generated/JSNode.h \
- $$OUTPUT_DIR/WebCore/generated/JSRange.h \
+CONFIG(standalone_package) {
+ isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
+} else {
+ isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
+}
+WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \
+ $$WC_GENERATED_SOURCES_DIR/HTMLNames.h \
+ $$WC_GENERATED_SOURCES_DIR/JSCSSStyleDeclaration.h \
+ $$WC_GENERATED_SOURCES_DIR/JSDOMWindow.h \
+ $$WC_GENERATED_SOURCES_DIR/JSElement.h \
+ $$WC_GENERATED_SOURCES_DIR/JSHTMLElement.h \
+ $$WC_GENERATED_SOURCES_DIR/JSNode.h \
+ $$WC_GENERATED_SOURCES_DIR/JSRange.h \
QUOTE = ""
DOUBLE_ESCAPED_QUOTE = ""
@@ -68,12 +75,12 @@ defineTest(addExtraCompiler) {
defineReplace(message_header_generator_output) {
FILENAME=$$basename(1)
- return($$OUTPUT_DIR/WebKit2/generated/$$replace(FILENAME, ".messages.in","Messages.h"))
+ return($$WEBKIT2_GENERATED_SOURCES_DIR/$$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"))
+ return($$WEBKIT2_GENERATED_SOURCES_DIR/$$replace(FILENAME, ".messages.in","MessageReceiver.cpp"))
}
VPATH = \
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 956362e..aa4c1d6 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -5,6 +5,14 @@ CONFIG += depend_includepath
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
+CONFIG(standalone_package) {
+ isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
+} else {
+ isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
+}
+
include($$PWD/../WebKit.pri)
include($$PWD/../common.pri)
include($$PWD/../WebCore/features.pri)
@@ -141,8 +149,8 @@ INCLUDEPATH = \
INCLUDEPATH += \
$$OUTPUT_DIR/include \
- $$OUTPUT_DIR/WebCore/generated \
- $$OUTPUT_DIR/WebKit2/generated
+ $$WC_GENERATED_SOURCES_DIR \
+ $$WEBKIT2_GENERATED_SOURCES_DIR
PREFIX_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
@@ -151,34 +159,34 @@ QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
DEFINES += BUILDING_QT__
WEBKIT2_GENERATED_HEADERS = \
- $$OUTPUT_DIR/WebKit2/generated/DownloadProxyMessages.h \
- $$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/WebContextMessages.h \
- $$OUTPUT_DIR/WebKit2/generated/WebInspectorMessages.h \
- $$OUTPUT_DIR/WebKit2/generated/WebInspectorProxyMessages.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 \
- $$OUTPUT_DIR/WebKit2/generated/WebProcessProxyMessages.h
+ $$WEBKIT2_GENERATED_SOURCES_DIR/DownloadProxyMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/PluginControllerProxyMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/PluginProcessMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/PluginProcessProxyMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/PluginProxyMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebContextMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebInspectorMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebInspectorProxyMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebPageMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebPageProxyMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebProcessConnectionMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebProcessMessages.h \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebProcessProxyMessages.h
WEBKIT2_GENERATED_SOURCES = \
- $$OUTPUT_DIR/WebKit2/generated/DownloadProxyMessageReceiver.cpp \
- $$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/WebContextMessageReceiver.cpp \
- $$OUTPUT_DIR/WebKit2/generated/WebInspectorMessageReceiver.cpp \
- $$OUTPUT_DIR/WebKit2/generated/WebInspectorProxyMessageReceiver.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 \
- $$OUTPUT_DIR/WebKit2/generated/WebProcessProxyMessageReceiver.cpp
+ $$WEBKIT2_GENERATED_SOURCES_DIR/DownloadProxyMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/PluginControllerProxyMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/PluginProcessMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/PluginProcessProxyMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/PluginProxyMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebContextMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebInspectorMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebInspectorProxyMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebPageMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebPageProxyMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebProcessConnectionMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebProcessMessageReceiver.cpp \
+ $$WEBKIT2_GENERATED_SOURCES_DIR/WebProcessProxyMessageReceiver.cpp
HEADERS += \
Platform/CoreIPC/ArgumentDecoder.h \
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e4828ae..9a409fd 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-29 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Allow pre-generation for package builds for WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=50139
+
+ Use a build variable for the generated directory path and set the
+ value based on CONFIG just like for WebKit1.
+
+ For non-package builds use a relative base path for the
+ genrated directory just like for WebKit1.
+
+ * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
+ * WebKitTestRunner/qt/WebKitTestRunner.pro:
+
2010-11-28 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro b/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
index d596f33..2b3cbaf 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
@@ -2,6 +2,14 @@ TEMPLATE = lib
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
+CONFIG(standalone_package) {
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../../../../WebCore/generated
+} else {
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../../../WebCore/generated
+}
+
+GENERATED_SOURCES_DIR = ../../generated
+
SOURCES += \
../InjectedBundle.cpp \
../InjectedBundle.h \
@@ -17,9 +25,9 @@ SOURCES += \
../Bindings/JSWrapper.cpp \
ActivateFontsQt.cpp \
LayoutTestControllerQt.cpp \
- $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated/JSEventSendingController.cpp \
- $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated/JSGCController.cpp \
- $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated/JSLayoutTestController.cpp \
+ $$GENERATED_SOURCES_DIR/JSEventSendingController.cpp \
+ $$GENERATED_SOURCES_DIR/JSGCController.cpp \
+ $$GENERATED_SOURCES_DIR/JSLayoutTestController.cpp \
HEADERS += \
../ActivateFonts.h \
@@ -50,11 +58,11 @@ INCLUDEPATH += \
$$PWD/../../../../JavaScriptCore/wtf \
$$PWD/../../../../WebKit2 \
$$PWD/../../../../WebKit2/Shared \
- $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated
+ $$GENERATED_SOURCES_DIR
INCLUDEPATH += \
$$OUTPUT_DIR/include \
- $$OUTPUT_DIR/WebCore/generated
+ $$WC_GENERATED_SOURCES_DIR
PREFIX_HEADER = $$PWD/../../WebKitTestRunnerPrefix.h
QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
diff --git a/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro b/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
index a638e65..f43bb0e 100644
--- a/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
+++ b/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
@@ -3,6 +3,8 @@ CONFIG -= app_bundle
BASEDIR = $$PWD/../
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
+GENERATED_SOURCES_DIR = ../generated
+
include(../../../WebKit.pri)
@@ -21,6 +23,7 @@ INCLUDEPATH += \
$$BASEDIR/../../WebKit2/Shared \
$$BASEDIR/../../WebKit2/UIProcess/API/qt \
$$BASEDIR/../../WebKit2/UIProcess/API/cpp/qt \
+ $$GENERATED_SOURCES_DIR
INCLUDEPATH += \
$$OUTPUT_DIR/include \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list