Commit 7ae981c9 authored by abecsi@webkit.org's avatar abecsi@webkit.org

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73905 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0473a745
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-06 Philippe Normand <pnormand@igalia.com>
Reviewed by Martin Robinson.
......
......@@ -7,8 +7,9 @@ SUBDIRS += \
WebKit/qt/Api/DerivedSources.pro
webkit2 {
SUBDIRS += WebKit2/DerivedSources.pro
SUBDIRS += WebKitTools/WebKitTestRunner/DerivedSources.pro
SUBDIRS += WebKit2/DerivedSources.pro \
WebKitTools/WebKitTestRunner/DerivedSources.pro \
WebKitTools/MiniBrowser/DerivedSources.pro
}
for(subpro, 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 Csaba Osztrogonác <ossy@webkit.org>
Unreviewed.
......@@ -41,17 +41,6 @@ SBOX_CHECK = $$(_SBOX_DIR)
PYTHON = python
}
DIRS = \
$$OUTPUT_DIR/WebKitTools/MiniBrowser/qt
for(DIR, DIRS) {
DIR = $$replace(DIR, /, $$QMAKE_DIR_SEP)
!exists($$DIR): system($$QMAKE_MKDIR $$DIR)
}
QMAKE_EXTRA_TARGETS += createdirs
SRC_ROOT_DIR = $$replace(PWD, /WebKit2, /)
defineTest(addExtraCompiler) {
......@@ -119,22 +108,6 @@ SCRIPTS = \
$$PWD/Scripts/webkit2/__init__.py \
$$PWD/Scripts/webkit2/messages.py
ualist_copier.input = $${SRC_ROOT_DIR}WebKitTools/QtTestBrowser/useragentlist.txt
ualist_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/useragentlist.txt
ualist_copier.tempNames = $$ualist_copier.input $$ualist_copier.output
ualist_copier.commands = $$QMAKE_COPY $$replace(ualist_copier.tempNames, "/", $$QMAKE_DIR_SEP)
ualist_copier.depends = $$ualist_copier.input
generated_files.depends += ualist_copier
QMAKE_EXTRA_TARGETS += ualist_copier
qrc_copier.input = $${SRC_ROOT_DIR}WebKitTools/MiniBrowser/MiniBrowser.qrc
qrc_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc
qrc_copier.tempNames = $$qrc_copier.input $$qrc_copier.output
qrc_copier.commands = $$QMAKE_COPY $$replace(qrc_copier.tempNames, "/", $$QMAKE_DIR_SEP)
qrc_copier.depends = ualist_copier $$qrc_copier.input
generated_files.depends += qrc_copier
QMAKE_EXTRA_TARGETS += qrc_copier
message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
message_header_generator.input = MESSAGE_RECEIVERS
message_header_generator.depends = $$SCRIPTS
......@@ -147,8 +120,8 @@ message_receiver_generator.depends = $$SCRIPTS
message_receiver_generator.output_function = message_receiver_generator_output
addExtraCompiler(message_receiver_generator)
fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKit2 $${OUTPUT_DIR}/include qt
fwheader_generator.depends = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKit2 ../include qt
fwheader_generator.depends = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl
generated_files.depends += fwheader_generator
QMAKE_EXTRA_TARGETS += fwheader_generator
......
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.
2010-12-13 Eric Seidel <eric@webkit.org>
Reviewed by Adam Barth.
......
# DerivedSources - qmake build info
CONFIG -= debug_and_release
TEMPLATE = lib
TARGET = dummy
QMAKE_EXTRA_TARGETS += generated_files
SRC_ROOT_DIR = $$replace(PWD, "/WebKitTools/MiniBrowser", "")
!exists($$OUTPUT_DIR/WebKitTools/MiniBrowser/qt):system($$QMAKE_MKDIR $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt)
ualist_copier.input = $$SRC_ROOT_DIR/WebKitTools/QtTestBrowser/useragentlist.txt
ualist_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/useragentlist.txt
ualist_copier.tempNames = $$ualist_copier.input $$ualist_copier.output
ualist_copier.commands = $$QMAKE_COPY $$replace(ualist_copier.tempNames, "/", $$QMAKE_DIR_SEP)
ualist_copier.depends = $$ualist_copier.input
generated_files.depends += ualist_copier
QMAKE_EXTRA_TARGETS += ualist_copier
# We have to copy the resource file to the build directory
# to use the useragentlist.txt file of QtTestBrowser without
# polluting the source tree.
qrc_copier.input = $$SRC_ROOT_DIR/WebKitTools/MiniBrowser/MiniBrowser.qrc
qrc_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc
qrc_copier.tempNames = $$qrc_copier.input $$qrc_copier.output
qrc_copier.commands = $$QMAKE_COPY $$replace(qrc_copier.tempNames, "/", $$QMAKE_DIR_SEP)
qrc_copier.depends = ualist_copier $$qrc_copier.input
generated_files.depends += qrc_copier
QMAKE_EXTRA_TARGETS += qrc_copier
......@@ -52,9 +52,7 @@ contains(QT_CONFIG, opengl) {
DEFINES += QT_CONFIGURED_WITH_OPENGL
}
# We have to copy the resource file to the build directory
# to use the useragentlist.txt file of QtTestBrowser without
# polluting the source tree.
# The copier is defined in WebKit2/DerivedSources.pro.
# We copy the resource file to the build directory.
# The copier is defined in WebKitTools/MiniBrowser/DerivedSources.pro.
RESOURCES += \
$$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc
......@@ -1547,6 +1547,7 @@ sub buildQMakeProject($@)
if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
push @subdirs, "WebKit2";
push @subdirs, "WebKitTools/WebKitTestRunner";
push @subdirs, "WebKitTools/MiniBrowser";
}
for my $subdir (@subdirs) {
......
......@@ -37,8 +37,8 @@ defineTest(addExtraCompiler) {
SRC_ROOT_DIR = $$replace(PWD, /WebKitTools/WebKitTestRunner, /)
# Make sure forwarded headers needed by this project are present
fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKitTools/WebKitTestRunner $${OUTPUT_DIR}/include qt
fwheader_generator.depends = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKitTools/WebKitTestRunner $${OUTPUT_DIR}/include qt
fwheader_generator.depends = $${SRC_ROOT_DIR}/WebKit2/Scripts/generate-forwarding-headers.pl
generated_files.depends += fwheader_generator
QMAKE_EXTRA_TARGETS += fwheader_generator
......
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