Changeset 52313 in webkit


Ignore:
Timestamp:
Dec 18, 2009 9:06:24 AM (14 years ago)
Author:
Simon Hausmann
Message:

[Qt] Clean up the qmake build system to distinguish between trunk builds and package builds

Reviewed by Tor Arne Vestbø.

​https://bugs.webkit.org/show_bug.cgi?id=32716

.:

  • WebKit.pri: Use standalone_package instead of QTDIR_build

JavaScriptCore:

  • pcre/pcre.pri: Use standalone_package instead of QTDIR_build

WebCore:

Introduce standalone_package as config that is set when QTDIR_build is set or when
the directory for the generated files is present.

Renamed uses of QTDIR_build that apply to generic package builds to use standalone_package.
Others remain as they are specific to building inside Qt.

  • WebCore.pro:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r52244 r52313  
     12009-12-18  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        [Qt] Clean up the qmake build system to distinguish between trunk builds and package builds
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=32716
     8
     9        * WebKit.pri: Use standalone_package instead of QTDIR_build
     10
    1112009-12-17  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
    212

  • trunk/JavaScriptCore/ChangeLog

    r52304 r52313  
     12009-12-18  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        [Qt] Clean up the qmake build system to distinguish between trunk builds and package builds
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=32716
     8
     9        * pcre/pcre.pri: Use standalone_package instead of QTDIR_build
     10
    1112009-12-18  Martin Robinson  <martin.james.robinson@gmail.com>
    212

  • trunk/JavaScriptCore/pcre/pcre.pri

    r38508 r52313  
    1313    pcre_xclass.cpp
    1414
    15 !CONFIG(QTDIR_build) {
     15!CONFIG(standalone_package) {
    1616    defineTest(addExtraCompiler) {
    1717        QMAKE_EXTRA_COMPILERS += $$1

  • trunk/WebCore/ChangeLog

    r52312 r52313  
    8484        * wml/WMLElement.cpp:
    8585        (WebCore::WMLElement::parseMappedAttribute):
     86
     872009-12-18  Simon Hausmann  <simon.hausmann@nokia.com>
     88
     89        Reviewed by Tor Arne Vestbø.
     90
     91        [Qt] Clean up the qmake build system to distinguish between trunk builds and package builds
     92
     93        https://bugs.webkit.org/show_bug.cgi?id=32716
     94
     95        Introduce standalone_package as config that is set when QTDIR_build is set or when
     96        the directory for the generated files is present.
     97
     98        Renamed uses of QTDIR_build that apply to generic package builds to use standalone_package.
     99        Others remain as they are specific to building inside Qt.
     100
     101        * WebCore.pro:
    86102
    871032009-12-18  Simon Hausmann  <simon.hausmann@nokia.com>

  • trunk/WebCore/WebCore.pro

    r52261 r52313  
    2828contains(QT_CONFIG, embedded):CONFIG += embedded
    2929
    30 CONFIG(QTDIR_build) {
     30# Detect that we are building as a standalone package by the presence of
     31# either the generated files directory or as part of the Qt package through
     32# QTDIR_build
     33CONFIG(QTDIR_build): CONFIG += standalone_package
     34else:exists($$PWD/generated): CONFIG += standalone_package
     35
     36CONFIG(standalone_package) {
    3137    GENERATED_SOURCES_DIR = $$PWD/generated
    32     include($$QT_SOURCE_TREE/src/qbase.pri)
     38
     39    CONFIG(QTDIR_build):include($$QT_SOURCE_TREE/src/qbase.pri)
     40
    3341    PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
    3442    DEFINES *= NDEBUG
    … …  
    5664unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
    5765
    58 CONFIG(release):!CONFIG(QTDIR_build) {
     66CONFIG(release):!CONFIG(standalone_package) {
    5967    contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
    6068    unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
    … …  
    33513359include($$PWD/../WebKit/qt/Api/headers.pri)
    33523360HEADERS += $$WEBKIT_API_HEADERS
    3353 !CONFIG(QTDIR_build) {
     3361!CONFIG(standalone_package) {
    33543362    target.path = $$[QT_INSTALL_LIBS]
    33553363    headers.files = $$WEBKIT_API_HEADERS
    … …  
    34023410}
    34033411
    3404 CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
     3412CONFIG(standalone_package):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
    34053413    # start with 4.5
    34063414    # Remove the following 2 lines if you want debug information in WebCore

  • trunk/WebKit.pri

    r51484 r52313  
    8181#
    8282defineTest(addExtraCompiler) {
    83     CONFIG(QTDIR_build) {
     83    CONFIG(standalone_package) {
    8484        outputRule = $$eval($${1}.output)
    8585        outVariable = $$eval($${1}.variable_out)
    … …  
    129129    export($${1}_header.variable_out)
    130130
    131     !CONFIG(QTDIR_build): QMAKE_EXTRA_COMPILERS += $${1}_header
     131    !CONFIG(standalone_package): QMAKE_EXTRA_COMPILERS += $${1}_header
    132132
    133133    export(QMAKE_EXTRA_COMPILERS)
Note: See TracChangeset for help on using the changeset viewer.