Commit b8f85883 authored by abecsi@webkit.org's avatar abecsi@webkit.org
Browse files

2011-02-15 Andras Becsi <abecsi@webkit.org>

        Reviewed by Csaba Osztrogonác.

        [Qt] Redesign the build system
        https://bugs.webkit.org/show_bug.cgi?id=51339

        Part 1.

        Introduce CodeGenerators.pri and add common includepaths to WebCore.pri,
        thus unnecessary duplications can be removed from project files.

        No new tests needed.

        * CodeGenerators.pri: Copied from Source/WebCore/WebCore.pri.
        Don't add non-source generated files to SOURCES.
        * DerivedSources.pro: Change WebCore.pri to CodeGenerators.pri.
        * WebCore.pri: Move code generation rules to CodeGenerators.pri.
        * WebCore.pro: Move common options to WebCore.pri.
2011-02-15  Andras Becsi  <abecsi@webkit.org>

        Reviewed by NOBODY Csaba Osztrogonác.

        [Qt] Redesign the build system
        https://bugs.webkit.org/show_bug.cgi?id=51339

        Part 1.

        Introduce CodeGenerators.pri and add common includepaths to WebCore.pri,
        thus unnecessary duplications can be removed from project files.

        * WebKit2.pro: Simplify and deduplicate includepaths.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e17fa44d
2011-02-15 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Redesign the build system
https://bugs.webkit.org/show_bug.cgi?id=51339
Part 1.
Introduce CodeGenerators.pri and add common includepaths to WebCore.pri,
thus unnecessary duplications can be removed from project files.
No new tests needed.
* CodeGenerators.pri: Copied from Source/WebCore/WebCore.pri.
Don't add non-source generated files to SOURCES.
* DerivedSources.pro: Change WebCore.pri to CodeGenerators.pri.
* WebCore.pri: Move code generation rules to CodeGenerators.pri.
* WebCore.pro: Move common options to WebCore.pri.
2011-02-15 Charlie Reis <creis@chromium.org>
 
Reviewed by Mihai Parparita.
This diff is collapsed.
......@@ -27,5 +27,4 @@ defineTest(addExtraCompiler) {
return(true)
}
include(WebCore.pri)
include(CodeGenerators.pri)
This diff is collapsed.
......@@ -2,21 +2,6 @@
CONFIG += building-libs
CONFIG += depend_includepath
V8_DIR = "$$[QT_INSTALL_PREFIX]/src/3rdparty/v8"
v8:exists($${V8_DIR}/include/v8.h) {
message(Using V8 with QtScript)
QT += script
INCLUDEPATH += $${V8_DIR}/include
DEFINES *= V8_BINDING=1
DEFINES += WTF_CHANGES=1
DEFINES *= WTF_USE_V8=1
DEFINES += USING_V8_SHARED
linux-*:LIBS += -lv8
}
symbian: {
TARGET.EPOCALLOWDLLDATA=1
# DRM and Allfiles capabilites need to be audited to be signed on Symbian
......@@ -79,30 +64,12 @@ symbian: {
}
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
include($$PWD/WebCore.pri)
include($$PWD/../WebKit.pri)
TEMPLATE = lib
TARGET = QtWebKit
contains(QT_CONFIG, qpa):CONFIG += embedded
CONFIG(standalone_package) {
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated
PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
} else {
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
!CONFIG(release, debug|release) {
OBJECTS_DIR = obj/debug
} else { # Release
OBJECTS_DIR = obj/release
}
}
CONFIG(QTDIR_build) {
include($$QT_SOURCE_TREE/src/qbase.pri)
} else {
......@@ -160,17 +127,11 @@ symbian {
}
}
RESOURCES += \
$$PWD/../WebCore/WebCore.qrc
include_webinspector: RESOURCES += $$PWD/../WebCore/inspector/front-end/WebKit.qrc $$WC_GENERATED_SOURCES_DIR/InspectorBackendStub.qrc
enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
use_qt_mobile_theme: DEFINES += WTF_USE_QT_MOBILE_THEME=1
contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
DEFINES += ENABLE_NO_LISTBOX_RENDERING=1
}
......@@ -202,99 +163,7 @@ defineTest(addExtraCompiler) {
return(true)
}
include(WebCore.pri)
v8 {
WEBCORE_INCLUDEPATH = \
$$PWD/bindings/v8 \
$$PWD/bindings/v8/custom \
$$PWD/bindings/v8/specialization \
$$PWD/bridge/qt/v8
} else {
WEBCORE_INCLUDEPATH = \
$$PWD/bridge/jsc \
$$PWD/bindings/js \
$$PWD/bindings/js/specialization \
$$PWD/bridge/c
}
WEBCORE_INCLUDEPATH = \
$$PWD \
$$PWD/accessibility \
$$PWD/bindings \
$$PWD/bindings/generic \
$$PWD/bridge \
$$PWD/css \
$$PWD/dom \
$$PWD/dom/default \
$$PWD/editing \
$$PWD/fileapi \
$$PWD/history \
$$PWD/html \
$$PWD/html/canvas \
$$PWD/html/parser \
$$PWD/html/shadow \
$$PWD/inspector \
$$PWD/loader \
$$PWD/loader/appcache \
$$PWD/loader/archive \
$$PWD/loader/cache \
$$PWD/loader/icon \
$$PWD/mathml \
$$PWD/notifications \
$$PWD/page \
$$PWD/page/animation \
$$PWD/platform \
$$PWD/platform/animation \
$$PWD/platform/audio \
$$PWD/platform/graphics \
$$PWD/platform/graphics/filters \
$$PWD/platform/graphics/transforms \
$$PWD/platform/image-decoders \
$$PWD/platform/mock \
$$PWD/platform/network \
$$PWD/platform/sql \
$$PWD/platform/text \
$$PWD/platform/text/transcoder \
$$PWD/plugins \
$$PWD/rendering \
$$PWD/rendering/mathml \
$$PWD/rendering/style \
$$PWD/rendering/svg \
$$PWD/storage \
$$PWD/svg \
$$PWD/svg/animation \
$$PWD/svg/graphics \
$$PWD/svg/graphics/filters \
$$PWD/svg/properties \
$$PWD/webaudio \
$$PWD/websockets \
$$PWD/wml \
$$PWD/workers \
$$PWD/xml \
$$WC_GENERATED_SOURCES_DIR \
$$WEBCORE_INCLUDEPATH
WEBCORE_INCLUDEPATH = \
$$PWD/bridge/qt \
$$PWD/page/qt \
$$PWD/platform/graphics/qt \
$$PWD/platform/network/qt \
$$PWD/platform/qt \
$$PWD/../WebKit/qt/Api \
$$PWD/../WebKit/qt/WebCoreSupport \
$$WEBCORE_INCLUDEPATH
symbian {
PREPEND_INCLUDEPATH = $$WEBCORE_INCLUDEPATH $$PREPEND_INCLUDEPATH
} else {
INCLUDEPATH = $$WEBCORE_INCLUDEPATH $$INCLUDEPATH
}
QT += network
include(CodeGenerators.pri)
DASHBOARDSUPPORTCSSPROPERTIES = $$PWD/css/DashboardSupportCSSPropertyNames.in
......
2011-02-15 Andras Becsi <abecsi@webkit.org>
Reviewed by NOBODY Csaba Osztrogonác.
[Qt] Redesign the build system
https://bugs.webkit.org/show_bug.cgi?id=51339
Part 1.
Introduce CodeGenerators.pri and add common includepaths to WebCore.pri,
thus unnecessary duplications can be removed from project files.
* WebKit2.pro: Simplify and deduplicate includepaths.
2011-01-26 MORITA Hajime <morrita@google.com>
 
Reviewed by Ryosuke Niwa.
......@@ -14,8 +14,8 @@ CONFIG(standalone_package) {
}
include($$PWD/../WebKit.pri)
include($$PWD/../common.pri)
include($$PWD/../WebCore/features.pri)
include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
include($$PWD/../WebCore/WebCore.pri)
include(WebKit2.pri)
TEMPLATE = lib
......@@ -33,90 +33,6 @@ DESTDIR = $$WEBKIT2_DESTDIR
# Build both debug and release configurations
mac: CONFIG += build_all
WEBKIT2_INCLUDEPATH = \
$$PWD/.. \
WEBKIT2_INCLUDEPATH = \
$$PWD/../JavaScriptCore \
$$PWD/../JavaScriptCore/assembler \
$$PWD/../JavaScriptCore/bytecode \
$$PWD/../JavaScriptCore/bytecompiler \
$$PWD/../JavaScriptCore/debugger \
$$PWD/../JavaScriptCore/interpreter \
$$PWD/../JavaScriptCore/jit \
$$PWD/../JavaScriptCore/parser \
$$PWD/../JavaScriptCore/profiler \
$$PWD/../JavaScriptCore/runtime \
$$PWD/../JavaScriptCore/wtf \
$$PWD/../JavaScriptCore/wtf/symbian \
$$PWD/../JavaScriptCore/wtf/unicode \
$$PWD/../JavaScriptCore/yarr \
$$PWD/../JavaScriptCore/API \
$$PWD/../JavaScriptCore/ForwardingHeaders \
$$WEBKIT2_INCLUDEPATH
WEBKIT2_INCLUDEPATH = \
$$PWD/../WebCore \
$$PWD/../WebCore/accessibility \
$$PWD/../WebCore/bindings \
$$PWD/../WebCore/bindings/generic \
$$PWD/../WebCore/bindings/js \
$$PWD/../WebCore/bridge \
$$PWD/../WebCore/bridge/c \
$$PWD/../WebCore/bridge/jsc \
$$PWD/../WebCore/css \
$$PWD/../WebCore/dom \
$$PWD/../WebCore/dom/default \
$$PWD/../WebCore/editing \
$$PWD/../WebCore/history \
$$PWD/../WebCore/html \
$$PWD/../WebCore/html/canvas \
$$PWD/../WebCore/inspector \
$$PWD/../WebCore/loader \
$$PWD/../WebCore/loader/appcache \
$$PWD/../WebCore/loader/archive \
$$PWD/../WebCore/loader/cache \
$$PWD/../WebCore/loader/icon \
$$PWD/../WebCore/mathml \
$$PWD/../WebCore/notifications \
$$PWD/../WebCore/page \
$$PWD/../WebCore/page/animation \
$$PWD/../WebCore/platform \
$$PWD/../WebCore/platform/animation \
$$PWD/../WebCore/platform/graphics \
$$PWD/../WebCore/platform/graphics/filters \
$$PWD/../WebCore/platform/graphics/transforms \
$$PWD/../WebCore/platform/image-decoders \
$$PWD/../WebCore/platform/mock \
$$PWD/../WebCore/platform/network \
$$PWD/../WebCore/platform/sql \
$$PWD/../WebCore/platform/text \
$$PWD/../WebCore/platform/text/transcoder \
$$PWD/../WebCore/plugins \
$$PWD/../WebCore/rendering \
$$PWD/../WebCore/rendering/style \
$$PWD/../WebCore/storage \
$$PWD/../WebCore/svg \
$$PWD/../WebCore/svg/animation \
$$PWD/../WebCore/svg/graphics \
$$PWD/../WebCore/svg/graphics/filters \
$$PWD/../WebCore/svg/properties \
$$PWD/../WebCore/websockets \
$$PWD/../WebCore/wml \
$$PWD/../WebCore/workers \
$$PWD/../WebCore/xml \
$$WEBKIT2_INCLUDEPATH
WEBKIT2_INCLUDEPATH = \
$$PWD/../WebCore/bridge/qt \
$$PWD/../WebCore/page/qt \
$$PWD/../WebCore/platform/graphics/qt \
$$PWD/../WebCore/platform/network/qt \
$$PWD/../WebCore/platform/qt \
$$PWD/../WebKit/qt/Api \
$$PWD/../WebKit/qt/WebCoreSupport \
$$WEBKIT2_INCLUDEPATH
WEBKIT2_INCLUDEPATH = \
$$PWD \
Platform \
......@@ -152,15 +68,14 @@ WEBKIT2_INCLUDEPATH = \
WebProcess/WebCoreSupport/qt \
WebProcess/WebPage \
WebProcess/qt \
$$WEBKIT2_INCLUDEPATH
$$OUTPUT_DIR/include
WEBKIT2_INCLUDEPATH += \
$$OUTPUT_DIR/include \
WEBKIT2_INCLUDEPATH = \
$$WC_GENERATED_SOURCES_DIR \
$$WEBKIT2_GENERATED_SOURCES_DIR \
$$WEBKIT2_INCLUDEPATH
# On Symbian PREPEND_INCLUDEPATH is the best way to make sure that WebKit headers
# On Symbian PREPEND_INCLUDEPATH is the best way to make sure that WebKit headers
# are included before platform headers.
symbian {
......@@ -267,6 +182,7 @@ HEADERS += \
Shared/StringPairVector.h \
Shared/UserMessageCoders.h \
Shared/VisitedLinkTable.h \
Shared/WebCoreArgumentCoders.h \
Shared/WebBackForwardListItem.h \
Shared/WebCertificateInfo.h \
Shared/WebContextMenuItem.h \
......
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