Commit 59b53cb0 authored by hausmann@webkit.org's avatar hausmann@webkit.org

[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
parent 5814ca79
2010-01-04 Simon Hausmann <simon.hausmann@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@webkit.org>
Reviewed by Adam Barth.
......
2010-01-04 Simon Hausmann <simon.hausmann@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@nokia.com>
Reviewed by Laszlo Gombos.
......@@ -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 {
......
# 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) {
......
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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment