Changeset 73905 in webkit


Ignore:
Timestamp:
Dec 13, 2010 5:16:44 AM (13 years ago)
Author:
abecsi@webkit.org
Message:

2010-12-13 Andras Becsi <​abecsi@webkit.org>

Reviewed by Csaba Osztrogonác.

[Qt][WK2] Fix build if WebKitTools are not available
​https://bugs.webkit.org/show_bug.cgi?id=50242

  • DerivedSources.pro: add new DerivedSources.pro to SUBDIRS.

2010-12-13 Andras Becsi <​abecsi@webkit.org>

Reviewed by Csaba Osztrogonác.

[Qt][WK2] Fix build if WebKitTools are not available
​https://bugs.webkit.org/show_bug.cgi?id=50242

  • DerivedSources.pro: Remove dependency to WebKitTools.
  • Scripts/generate-forwarding-headers.pl: Moved from WebKitTools/Scripts/generate-forwarding-headers.pl.

2010-12-13 Andras Becsi <​abecsi@webkit.org>

Reviewed by Csaba Osztrogonác.

[Qt][WK2] Fix build if WebKitTools are not available
​https://bugs.webkit.org/show_bug.cgi?id=50242

  • MiniBrowser/qt/MiniBrowser.pro: Correct the comment.
  • Scripts/webkitdirs.pm: Added WebKitTools/MiniBrowser to $subdirs.
  • MiniBrowser/DerivedSources.pro: Added.
Location:
trunk
Files:
1 added
8 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r73624 r73905  
     12010-12-13  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        [Qt][WK2] Fix build if WebKitTools are not available
     6        https://bugs.webkit.org/show_bug.cgi?id=50242
     7
     8        * DerivedSources.pro: add new DerivedSources.pro to SUBDIRS.
     9
    1102010-12-06  Philippe Normand  <pnormand@igalia.com>
    211

  • trunk/DerivedSources.pro

    r69405 r73905  
    88
    99webkit2 {
    10     SUBDIRS += WebKit2/DerivedSources.pro
    11     SUBDIRS += WebKitTools/WebKitTestRunner/DerivedSources.pro
     10    SUBDIRS += WebKit2/DerivedSources.pro \
     11            WebKitTools/WebKitTestRunner/DerivedSources.pro \
     12            WebKitTools/MiniBrowser/DerivedSources.pro
    1213}
    1314

  • trunk/WebKit2/ChangeLog

    r73892 r73905  
     12010-12-13  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        [Qt][WK2] Fix build if WebKitTools are not available
     6        https://bugs.webkit.org/show_bug.cgi?id=50242
     7
     8        * DerivedSources.pro: Remove dependency to WebKitTools.
     9        * Scripts/generate-forwarding-headers.pl: Moved from WebKitTools/Scripts/generate-forwarding-headers.pl.
     10
    1112010-12-13  Csaba Osztrogonác  <ossy@webkit.org>
    212

  • trunk/WebKit2/DerivedSources.pro

    r73848 r73905  
    4141    PYTHON = python
    4242}
    43 
    44 
    45 DIRS = \
    46     $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt
    47 
    48 for(DIR, DIRS) {
    49     DIR = $$replace(DIR, /, $$QMAKE_DIR_SEP)
    50     !exists($$DIR): system($$QMAKE_MKDIR $$DIR)
    51 }
    52 
    53 QMAKE_EXTRA_TARGETS += createdirs
    5443
    5544SRC_ROOT_DIR = $$replace(PWD, /WebKit2, /)
    … …  
    120109    $$PWD/Scripts/webkit2/messages.py
    121110
    122 ualist_copier.input = $${SRC_ROOT_DIR}WebKitTools/QtTestBrowser/useragentlist.txt
    123 ualist_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/useragentlist.txt
    124 ualist_copier.tempNames = $$ualist_copier.input $$ualist_copier.output
    125 ualist_copier.commands = $$QMAKE_COPY $$replace(ualist_copier.tempNames, "/", $$QMAKE_DIR_SEP)
    126 ualist_copier.depends = $$ualist_copier.input
    127 generated_files.depends += ualist_copier
    128 QMAKE_EXTRA_TARGETS += ualist_copier
    129 
    130 qrc_copier.input = $${SRC_ROOT_DIR}WebKitTools/MiniBrowser/MiniBrowser.qrc
    131 qrc_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc
    132 qrc_copier.tempNames = $$qrc_copier.input $$qrc_copier.output
    133 qrc_copier.commands = $$QMAKE_COPY $$replace(qrc_copier.tempNames, "/", $$QMAKE_DIR_SEP)
    134 qrc_copier.depends = ualist_copier $$qrc_copier.input
    135 generated_files.depends += qrc_copier
    136 QMAKE_EXTRA_TARGETS += qrc_copier
    137 
    138111message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
    139112message_header_generator.input = MESSAGE_RECEIVERS
    … …  
    148121addExtraCompiler(message_receiver_generator)
    149122
    150 fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKit2 $${OUTPUT_DIR}/include qt
    151 fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
     123fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKit2 ../include qt
     124fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl
    152125generated_files.depends     += fwheader_generator
    153126QMAKE_EXTRA_TARGETS         += fwheader_generator

  • trunk/WebKitTools/ChangeLog

    r73895 r73905  
     12010-12-13  Andras Becsi  <abecsi@webkit.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        [Qt][WK2] Fix build if WebKitTools are not available
     6        https://bugs.webkit.org/show_bug.cgi?id=50242
     7
     8        * MiniBrowser/qt/MiniBrowser.pro: Correct the comment.
     9        * Scripts/webkitdirs.pm: Added WebKitTools/MiniBrowser to $subdirs.
     10        * MiniBrowser/DerivedSources.pro: Added.
     11
    1122010-12-13  Eric Seidel  <eric@webkit.org>
    213

  • trunk/WebKitTools/MiniBrowser/qt/MiniBrowser.pro

    r72220 r73905  
    5353}
    5454
    55 # We have to copy the resource file to the build directory
    56 # to use the useragentlist.txt file of QtTestBrowser without
    57 # polluting the source tree.
    58 # The copier is defined in WebKit2/DerivedSources.pro.
     55# We copy the resource file to the build directory.
     56# The copier is defined in WebKitTools/MiniBrowser/DerivedSources.pro.
    5957RESOURCES += \
    6058    $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc

  • trunk/WebKitTools/Scripts/webkitdirs.pm

    r73611 r73905  
    15481548        push @subdirs, "WebKit2";
    15491549        push @subdirs, "WebKitTools/WebKitTestRunner";
     1550        push @subdirs, "WebKitTools/MiniBrowser";
    15501551    }
    15511552

  • trunk/WebKitTools/WebKitTestRunner/DerivedSources.pro

    r69324 r73905  
    3838
    3939# Make sure forwarded headers needed by this project are present
    40 fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKitTools/WebKitTestRunner $${OUTPUT_DIR}/include qt
    41 fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
     40fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKitTools/WebKitTestRunner $${OUTPUT_DIR}/include qt
     41fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl
    4242generated_files.depends     += fwheader_generator
    4343QMAKE_EXTRA_TARGETS         += fwheader_generator
Note: See TracChangeset for help on using the changeset viewer.