[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9c35ec47f645ef724aed9ff64cf31624db76333b
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 16:41:10 2010 +0000

    [Qt] Fix build on Windows
    
    Reviewed by Kenneth Rohde Christiansen.
    
    DerivedSources for our API headers failed on Windows,
    due to Windows not accepting ; as a command separator,
    not needing quotes for echo, and needing < and > escaped.
    
    We now detect Windows and set these quote markers and
    escape markers accordingly, as well as use && for separating
    individual commands.
    
    * Api/DerivedSources.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54426 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/DerivedSources.pro b/WebKit/qt/Api/DerivedSources.pro
index 529c20b..e2ecd22 100644
--- a/WebKit/qt/Api/DerivedSources.pro
+++ b/WebKit/qt/Api/DerivedSources.pro
@@ -29,18 +29,26 @@ CONFIG -= debug_and_release
 
 DESTDIR = ../../../include
 
+win32 {
+    QUOTE = ""
+    ESCAPE = "^"
+} else {
+    QUOTE = "\\\'"
+    ESCAPE = ""
+}
+
 qtheader_module.target = $${DESTDIR}/QtWebKit
 qtheader_module.depends = $${_PRO_FILE_}
-eval(qtheader_module.commands = echo \\\'\$${LITERAL_HASH}ifndef QT_QTWEBKIT_MODULE_H\\\' > $${qtheader_module.target};)
-eval(qtheader_module.commands += echo \\\'\$${LITERAL_HASH}define QT_QTWEBKIT_MODULE_H\\\' >> $${qtheader_module.target};)
-eval(qtheader_module.commands += echo \\\'\$${LITERAL_HASH}include <QtNetwork/QtNetwork>\\\' >> $${qtheader_module.target};)
+eval(qtheader_module.commands = echo $${QUOTE}\$${LITERAL_HASH}ifndef QT_QTWEBKIT_MODULE_H$${QUOTE} > $${qtheader_module.target} &&)
+eval(qtheader_module.commands += echo $${QUOTE}\$${LITERAL_HASH}define QT_QTWEBKIT_MODULE_H$${QUOTE} >> $${qtheader_module.target} &&)
+eval(qtheader_module.commands += echo $${QUOTE}\$${LITERAL_HASH}include $${ESCAPE}<QtNetwork/QtNetwork$${ESCAPE}>$${QUOTE} >> $${qtheader_module.target} &&)
 WEBKIT_CLASS_HEADERS = ../include/QtWebKit
 
 regex = ".*\sclass\sQWEBKIT_EXPORT\s(\w+)\s(.*)"
 
 for(HEADER, WEBKIT_API_HEADERS) {
     qtheader_module.depends += $$HEADER
-    eval(qtheader_module.commands += echo \\\'\$${LITERAL_HASH}include \\\"$$basename(HEADER)\\\"\\\' >> $${qtheader_module.target};)
+    eval(qtheader_module.commands += echo $${QUOTE}\$${LITERAL_HASH}include \\\"$$basename(HEADER)\\\"$${QUOTE} >> $${qtheader_module.target} &&)
 
     HEADER_NAME = $$basename(HEADER)
     HEADER_TARGET = $$replace(HEADER_NAME, [^a-zA-Z0-9_], -)
@@ -48,7 +56,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
 
     eval($${HEADER_TARGET}.target = $${DESTDIR}/$${HEADER_NAME})
     eval($${HEADER_TARGET}.depends = $$HEADER)
-    eval($${HEADER_TARGET}.commands = echo \\\'\$${LITERAL_HASH}include \\\"$$HEADER\\\"\\\' > $$eval($${HEADER_TARGET}.target))
+    eval($${HEADER_TARGET}.commands = echo $${QUOTE}\$${LITERAL_HASH}include \\\"$$HEADER\\\"$${QUOTE} > $$eval($${HEADER_TARGET}.target))
 
     QMAKE_EXTRA_TARGETS += $$HEADER_TARGET
 
@@ -73,7 +81,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
 
         eval($${CLASS_TARGET}.target = $${DESTDIR}/$${EXPORTED_CLASS})
         eval($${CLASS_TARGET}.depends = $$eval($${HEADER_TARGET}.target))
-        eval($${CLASS_TARGET}.commands = echo \\\'\$${LITERAL_HASH}include \\\"$$basename(HEADER)\\\"\\\' > $$eval($${CLASS_TARGET}.target))
+        eval($${CLASS_TARGET}.commands = echo $${QUOTE}\$${LITERAL_HASH}include \\\"$$basename(HEADER)\\\"$${QUOTE} > $$eval($${CLASS_TARGET}.target))
 
         QMAKE_EXTRA_TARGETS += $$CLASS_TARGET
         WEBKIT_CLASS_HEADERS += ../include/$${EXPORTED_CLASS}
@@ -88,14 +96,14 @@ for(HEADER, WEBKIT_API_HEADERS) {
     }
 }
 
-eval(qtheader_module.commands += echo \\\'\$${LITERAL_HASH}endif // QT_QTWEBKIT_MODULE_H\\\' >> $${qtheader_module.target})
+eval(qtheader_module.commands += echo $${QUOTE}\$${LITERAL_HASH}endif // QT_QTWEBKIT_MODULE_H$${QUOTE} >> $${qtheader_module.target})
 QMAKE_EXTRA_TARGETS += qtheader_module
 
 qtheader_pri.target = $${DESTDIR}/headers.pri
 qtheader_pri.depends = $${WEBKIT_API_HEADERS} $${WEBKIT_PRIVATE_HEADERS} $${_PRO_FILE_}
-eval(qtheader_pri.commands = echo \\\'WEBKIT_API_HEADERS = $${WEBKIT_API_HEADERS}\\\' > $${qtheader_pri.target};)
-eval(qtheader_pri.commands += echo \\\'WEBKIT_CLASS_HEADERS = $${WEBKIT_CLASS_HEADERS}\\\' >> $${qtheader_pri.target};)
-eval(qtheader_pri.commands += echo \\\'WEBKIT_PRIVATE_HEADERS = $${WEBKIT_PRIVATE_HEADERS}\\\' >> $${qtheader_pri.target};)
+eval(qtheader_pri.commands = echo $${QUOTE}WEBKIT_API_HEADERS = $${WEBKIT_API_HEADERS}$${QUOTE} > $${qtheader_pri.target} &&)
+eval(qtheader_pri.commands += echo $${QUOTE}WEBKIT_CLASS_HEADERS = $${WEBKIT_CLASS_HEADERS}$${QUOTE} >> $${qtheader_pri.target} &&)
+eval(qtheader_pri.commands += echo $${QUOTE}WEBKIT_PRIVATE_HEADERS = $${WEBKIT_PRIVATE_HEADERS}$${QUOTE} >> $${qtheader_pri.target})
 QMAKE_EXTRA_TARGETS += qtheader_pri
 
 generated_files.depends += $${qtheader_module.target} $${qtheader_pri.target}
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 66d620b..2d69b1d 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-05  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        [Qt] Fix build on Windows
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        DerivedSources for our API headers failed on Windows,
+        due to Windows not accepting ; as a command separator,
+        not needing quotes for echo, and needing < and > escaped.
+
+        We now detect Windows and set these quote markers and
+        escape markers accordingly, as well as use && for separating
+        individual commands.
+
+        * Api/DerivedSources.pro:
+
 2010-02-05  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.

-- 
WebKit Debian packaging