Changeset 84364 in webkit


Ignore:
Timestamp:
Apr 20, 2011 6:46:45 AM (13 years ago)
Author:
kbalazs@webkit.org
Message:

2011-04-20 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Csaba Osztrogonác.

[Qt] Cleanup includepath adjustment for generated files
​https://bugs.webkit.org/show_bug.cgi?id=58869

  • JavaScriptCore.pri: Add the directory of generated files to the include path with absolute path to make it valid in the final build step.

2011-04-20 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Csaba Osztrogonác.

[Qt] Cleanup includepath adjustment for generated files
​https://bugs.webkit.org/show_bug.cgi?id=58869

Build cleanup, no new tests.

  • WebCore.pri: Add the directory of generated files to the include path with absolute path to make it valid in the final build step. Remove unnecessary logic.

2011-04-20 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Csaba Osztrogonác.

[Qt] Cleanup includepath adjustment for generated files
​https://bugs.webkit.org/show_bug.cgi?id=58869

  • QtWebKit.pro: Revert the hacky fix in r84174. Remove unnecessary logic.

2011-04-20 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Csaba Osztrogonác.

[Qt] Cleanup includepath adjustment for generated files
​https://bugs.webkit.org/show_bug.cgi?id=58869

  • WebKit2.pri: Add the directory of generated files to the include path with absolute path to make it valid in the final build step.
Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r84301 r84364  
     12011-04-20  Balazs Kelemen  <kbalazs@webkit.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        [Qt] Cleanup includepath adjustment for generated files
     6        https://bugs.webkit.org/show_bug.cgi?id=58869
     7
     8        * JavaScriptCore.pri:  Add the directory of generated files to the include
     9        path with absolute path to make it valid in the final build step.
     10
    1112011-04-19  Oliver Hunt  <oliver@apple.com>
    212

  • trunk/Source/JavaScriptCore/JavaScriptCore.pri

    r83385 r84364  
    1616    isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/generated
    1717} else {
    18     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = generated
     18    isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$OUTPUT_DIR/JavaScriptCore/generated
    1919}
    2020

  • trunk/Source/WebCore/ChangeLog

    r84362 r84364  
     12011-04-20  Balazs Kelemen  <kbalazs@webkit.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        [Qt] Cleanup includepath adjustment for generated files
     6        https://bugs.webkit.org/show_bug.cgi?id=58869
     7
     8        Build cleanup, no new tests.
     9
     10        * WebCore.pri: Add the directory of generated files to the include path
     11        with absolute path to make it valid in the final build step. Remove
     12        unnecessary logic.
     13
    1142011-04-20  Mariusz Grzegorczyk  <mariusz.g@samsung.com>
    215

  • trunk/Source/WebCore/WebCore.pri

    r84149 r84364  
    2323CONFIG(standalone_package) {
    2424    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
    25     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated
    2625
    2726    PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
    2827} else {
    29     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
    30     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
     28    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$OUTPUT_DIR/WebCore/generated
    3129}
    3230

  • trunk/Source/WebKit/qt/ChangeLog

    r84334 r84364  
     12011-04-20  Balazs Kelemen  <kbalazs@webkit.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        [Qt] Cleanup includepath adjustment for generated files
     6        https://bugs.webkit.org/show_bug.cgi?id=58869
     7
     8        * QtWebKit.pro: Revert the hacky fix in r84174. Remove
     9        unnecessary logic.
     10
    1112011-04-19  Yi Shen  <yi.4.shen@nokia.com>
    212

  • trunk/Source/WebKit/qt/QtWebKit.pro

    r84196 r84364  
    1515
    1616SOURCE_DIR = $$replace(PWD, /WebKit/qt, "")
    17 
    18 CONFIG(standalone_package) {
    19     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../../JavaScriptCore/generated
    20     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../../WebCore/generated
    21     isEmpty(WC_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/../../WebKit2/generated
    22 } else {
    23     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../../JavaScriptCore/generated
    24     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../WebCore/generated
    25     isEmpty(WC_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = ../../WebKit2/generated
    26 }
    2717
    2818include($$PWD/Api/headers.pri)
    … …  
    3222    include($$SOURCE_DIR/WebKit2/WebKit2.pri)
    3323    include($$SOURCE_DIR/WebKit2/WebKit2API.pri)
    34     INCLUDEPATH += $$OUTPUT_DIR/WebKit2/generated
    3524}
    3625include($$SOURCE_DIR/WebCore/WebCore.pri)

  • trunk/Source/WebKit2/ChangeLog

    r84318 r84364  
     12011-04-20  Balazs Kelemen  <kbalazs@webkit.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        [Qt] Cleanup includepath adjustment for generated files
     6        https://bugs.webkit.org/show_bug.cgi?id=58869
     7
     8        * WebKit2.pri: Add the directory of generated files to the include
     9        path with absolute path to make it valid in the final build step.
     10
    1112011-04-19  Anders Carlsson  <andersca@apple.com>
    212

  • trunk/Source/WebKit2/WebKit2.pri

    r81980 r84364  
    1414    isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
    1515} else {
    16     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
     16    isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$OUTPUT_DIR/WebKit2/generated
    1717}
    1818
Note: See TracChangeset for help on using the changeset viewer.