[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 15:52:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit aae57b9f831f30dfe724dccac3b6cc5cde7ba67e
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 15 22:07:13 2010 +0000
2010-11-15 Andreas Kling <kling at webkit.org>
Reviewed by Tor Arne Vestbø.
[Qt] Use $${PYTHON} rather than "python" to execute Python scripts
Fixes building with the old Python that currently ships with Scratchbox.
* DerivedSources.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72037 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c088467..88608ae 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-15 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Use $${PYTHON} rather than "python" to execute Python scripts
+
+ Fixes building with the old Python that currently ships with Scratchbox.
+
+ * DerivedSources.pro:
+
2010-11-15 Brady Eidson <beidson at apple.com>
Reviewed by a better attempt at a Windows build fix.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index a01c15a..57ec528 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -109,13 +109,13 @@ SCRIPTS = \
$$PWD/Scripts/webkit2/__init__.py \
$$PWD/Scripts/webkit2/messages.py
-message_header_generator.commands = python $${SRC_ROOT_DIR}WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+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
message_header_generator.output_function = message_header_generator_output
addExtraCompiler(message_header_generator)
-message_receiver_generator.commands = python $${SRC_ROOT_DIR}WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+message_receiver_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
message_receiver_generator.input = MESSAGE_RECEIVERS
message_receiver_generator.depends = $$SCRIPTS
message_receiver_generator.output_function = message_receiver_generator_output
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list