Changeset 73313 in webkit

Timestamp:

Dec 3, 2010 3:34:59 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-03 Siddharth Mathur <​siddharth.mathur@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.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources.pro (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-03  Siddharth Mathur  <siddharth.mathur@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@webkit.org>
 

trunk/WebKit2/DerivedSources.pro

@@ -47 +47 @@
 
 for(DIR, DIRS) {
+    DIR = $$replace(DIR, /, $$QMAKE_DIR_SEP)
     !exists($$DIR): system($$QMAKE_MKDIR $$DIR)
 }
@@ -116 +117 @@
     $$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