[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bd166ebeed2f314d0cd89baf9a3bbe9a80f3e9d9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 23:34:59 2010 +0000

    2010-12-03  Siddharth Mathur  <siddharth.mathur at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] [WK2] Build system improvements for non-Unix targets
            https://bugs.webkit.org/show_bug.cgi?id=50257
    
            * DerivedSources.pro:
            Fix dir seperator errors on Windows build host. Thanks to Laszlo Gombos.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73313 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 91ca1bc..e86e1f2 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-03  Siddharth Mathur  <siddharth.mathur at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] [WK2] Build system improvements for non-Unix targets
+        https://bugs.webkit.org/show_bug.cgi?id=50257
+
+        * DerivedSources.pro:
+        Fix dir seperator errors on Windows build host. Thanks to Laszlo Gombos.
+
 2010-12-03  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 2a11aa3..70ef356 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -46,6 +46,7 @@ DIRS = \
     $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt
 
 for(DIR, DIRS) {
+    DIR = $$replace(DIR, /, $$QMAKE_DIR_SEP)
     !exists($$DIR): system($$QMAKE_MKDIR $$DIR)
 }
 
@@ -115,17 +116,19 @@ SCRIPTS = \
     $$PWD/Scripts/webkit2/__init__.py \
     $$PWD/Scripts/webkit2/messages.py
 
-ualist_copier.commands = $(COPY_FILE) $${SRC_ROOT_DIR}/WebKitTools/QtTestBrowser/useragentlist.txt $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/useragentlist.txt
-ualist_copier.depends = $${SRC_ROOT_DIR}/WebKitTools/QtTestBrowser/useragentlist.txt
-ualist_copier.input = $${SRC_ROOT_DIR}/WebKitTools/QtTestBrowser/useragentlist.txt
+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.commands = $(COPY_FILE) $${SRC_ROOT_DIR}/WebKitTools/MiniBrowser/MiniBrowser.qrc $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc
-qrc_copier.depends = ualist_copier $${SRC_ROOT_DIR}/WebKitTools/MiniBrowser/MiniBrowser.qrc
-qrc_copier.input = $${SRC_ROOT_DIR}/WebKitTools/MiniBrowser/MiniBrowser.qrc
+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
 

-- 
WebKit Debian packaging