[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 18:30:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7ae981c94c376839e07720e33b727875d48942ea
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 13 13:16:44 2010 +0000
2010-12-13 Andras Becsi <abecsi at 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 at 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 at 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
diff --git a/ChangeLog b/ChangeLog
index 187598a..f902987 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-13 Andras Becsi <abecsi at 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 at igalia.com>
Reviewed by Martin Robinson.
diff --git a/DerivedSources.pro b/DerivedSources.pro
index ef88632..e7fbeb2 100644
--- a/DerivedSources.pro
+++ b/DerivedSources.pro
@@ -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) {
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 658b8f3..246d769 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-13 Andras Becsi <abecsi at 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 at webkit.org>
Unreviewed.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 5971c2a..7e3ecca 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -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
diff --git a/WebKitTools/Scripts/generate-forwarding-headers.pl b/WebKit2/Scripts/generate-forwarding-headers.pl
similarity index 100%
rename from WebKitTools/Scripts/generate-forwarding-headers.pl
rename to WebKit2/Scripts/generate-forwarding-headers.pl
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ce5b66e..5f53c9c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-13 Andras Becsi <abecsi at 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 at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/MiniBrowser/DerivedSources.pro b/WebKitTools/MiniBrowser/DerivedSources.pro
new file mode 100644
index 0000000..42dde37
--- /dev/null
+++ b/WebKitTools/MiniBrowser/DerivedSources.pro
@@ -0,0 +1,32 @@
+# 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
diff --git a/WebKitTools/MiniBrowser/qt/MiniBrowser.pro b/WebKitTools/MiniBrowser/qt/MiniBrowser.pro
index 82f6a00..6833c0f 100644
--- a/WebKitTools/MiniBrowser/qt/MiniBrowser.pro
+++ b/WebKitTools/MiniBrowser/qt/MiniBrowser.pro
@@ -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
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 538271e..9d47e8c 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -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) {
diff --git a/WebKitTools/WebKitTestRunner/DerivedSources.pro b/WebKitTools/WebKitTestRunner/DerivedSources.pro
index bab70cc..a722d9f 100644
--- a/WebKitTools/WebKitTestRunner/DerivedSources.pro
+++ b/WebKitTools/WebKitTestRunner/DerivedSources.pro
@@ -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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list