[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
hausmann at webkit.org
hausmann at webkit.org
Wed Jan 6 00:17:48 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit f02ef8f4196c58efa05831c39899b18ec8225bf5
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 4 15:37:26 2010 +0000
[Qt] Fix standalone package builds.
Reviewed by Tor Arne Vestbø.
.:
* WebKit.pri: Add logic for detecting standalone builds. Set OUTPUT_DIR to the top-level dir in that case.
* WebKit.pro: Don't build JSC and DRT for package builds.
WebCore:
* WebCore.pro: Moved logic for detecting standalone builds to WebKit.pri. Set DESTDIR for package builds.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52734 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 3c7a426..323ff44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-04 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Fix standalone package builds.
+
+ * WebKit.pri: Add logic for detecting standalone builds. Set OUTPUT_DIR to the top-level dir in that case.
+ * WebKit.pro: Don't build JSC and DRT for package builds.
+
2010-01-04 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4931bda..ecb4a71 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-04 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Fix standalone package builds.
+
+ * WebCore.pro: Moved logic for detecting standalone builds to WebKit.pri. Set DESTDIR for package builds.
+
2010-01-04 Yongjun Zhang <yongjun.zhang at nokia.com>
Reviewed by Laszlo Gombos.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index a12faef..be7a576 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -27,12 +27,6 @@ TARGET = QtWebKit
contains(QT_CONFIG, embedded):CONFIG += embedded
-# Detect that we are building as a standalone package by the presence of
-# either the generated files directory or as part of the Qt package through
-# QTDIR_build
-CONFIG(QTDIR_build): CONFIG += standalone_package
-else:exists($$PWD/generated): CONFIG += standalone_package
-
CONFIG(standalone_package) {
GENERATED_SOURCES_DIR = $$PWD/generated
@@ -51,9 +45,10 @@ CONFIG(standalone_package) {
OBJECTS_DIR = obj/release
}
- DESTDIR = $$OUTPUT_DIR/lib
}
+!CONFIG(QTDIR_build): DESTDIR = $$OUTPUT_DIR/lib
+
GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR${QMAKE_DIR_SEP}
unix {
diff --git a/WebKit.pri b/WebKit.pri
index 70fdce8..4de615b 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -1,5 +1,14 @@
# Include file to make it easy to include WebKit into Qt projects
+# Detect that we are building as a standalone package by the presence of
+# either the generated files directory or as part of the Qt package through
+# QTDIR_build
+CONFIG(QTDIR_build): CONFIG += standalone_package
+else:exists($$PWD/WebCore/generated): CONFIG += standalone_package
+
+CONFIG(standalone_package) {
+ OUTPUT_DIR=$$PWD
+}
isEmpty(OUTPUT_DIR) {
CONFIG(debug, debug|release) {
diff --git a/WebKit.pro b/WebKit.pro
index d57d42f..84e77ca 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -1,17 +1,23 @@
TEMPLATE = subdirs
CONFIG += ordered
+include(WebKit.pri)
+
SUBDIRS += \
WebCore \
- JavaScriptCore/jsc.pro \
WebKitTools/QtLauncher \
WebKit/qt/QGVLauncher \
WebKit/qt/tests
-!win32:!symbian {
- SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
- SUBDIRS += WebKitTools/DumpRenderTree/qt/ImageDiff.pro
- SUBDIRS += WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+!CONFIG(standalone_package) {
+ SUBDIRS += JavaScriptCore/jsc.pro
+
+ !win32:!symbian {
+ SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+ SUBDIRS += WebKitTools/DumpRenderTree/qt/ImageDiff.pro
+ SUBDIRS += WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+ }
+
}
include(WebKit/qt/docs/docs.pri)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list