Title: [128045] trunk/Source/WebKit2
- Revision
- 128045
- Author
- [email protected]
- Date
- 2012-09-10 04:40:29 -0700 (Mon, 10 Sep 2012)
Log Message
[Qt] Fix generation of forward headers for generated files in WebCore on Windows
https://bugs.webkit.org/show_bug.cgi?id=96245
Patch by Simon Hausmann <[email protected]> on 2012-09-10
Reviewed by Tor Arne Vestbø.
We generate the forwarding header files of generated WebCore sources by using
mkdir to ensure the target directory exists, followed by
echo #include "..." > file.h. On Windows mkdir returns with an error if the
target directory exists. For us that is not an error, so work around it with
(mkdir path 2>nul || echo>nul)
* DerivedSources.pri:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128044 => 128045)
--- trunk/Source/WebKit2/ChangeLog 2012-09-10 11:24:26 UTC (rev 128044)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-10 11:40:29 UTC (rev 128045)
@@ -1,3 +1,18 @@
+2012-09-10 Simon Hausmann <[email protected]>
+
+ [Qt] Fix generation of forward headers for generated files in WebCore on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=96245
+
+ Reviewed by Tor Arne Vestbø.
+
+ We generate the forwarding header files of generated WebCore sources by using
+ mkdir to ensure the target directory exists, followed by
+ echo #include "..." > file.h. On Windows mkdir returns with an error if the
+ target directory exists. For us that is not an error, so work around it with
+ (mkdir path 2>nul || echo>nul)
+
+ * DerivedSources.pri:
+
2012-09-10 Allan Sandfeld Jensen <[email protected]>
[Qt][WK2] REGRESSION(r127861): It made one test fail and one test crash
Modified: trunk/Source/WebKit2/DerivedSources.pri (128044 => 128045)
--- trunk/Source/WebKit2/DerivedSources.pri 2012-09-10 11:24:26 UTC (rev 128044)
+++ trunk/Source/WebKit2/DerivedSources.pri 2012-09-10 11:40:29 UTC (rev 128045)
@@ -144,8 +144,12 @@
eval($${header_target}.target = $$dest_dir/$$header_name)
eval($${header_target}.depends = $$header_path)
- eval($${header_target}.commands = $${QMAKE_MKDIR} $$dest_dir && echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$header_path\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${header_target}.target))
+ win32: eval($${header_target}.commands = ($${QMAKE_MKDIR} $$toSystemPath($$dest_dir) 2>nul || echo>nul))
+ else: eval($${header_target}.commands = $${QMAKE_MKDIR} $$toSystemPath($$dest_dir) )
+
+ eval($${header_target}.commands += && echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$header_path\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${header_target}.target))
+
GENERATORS += $$header_target
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
