Title: [128295] trunk/Tools
Revision
128295
Author
commit-qu...@webkit.org
Date
2012-09-12 05:13:50 -0700 (Wed, 12 Sep 2012)

Log Message

[Qt] Make it possible to build with "make release" and "make debug" on Windows
https://bugs.webkit.org/show_bug.cgi?id=96488

Patch by Simon Hausmann <simon.hausm...@nokia.com> on 2012-09-12
Reviewed by Tor Arne Vestbø.

A "make debug" is passed through recursively and currently it aborts at Makefile.DerivedSources
because there are no such targets. We want the generated sources to be independent from release
or debug build configurations, so it is sufficient to provide fake debug and release targets that
redirect to the same general-purpose target (first) of creating the derived sources.

* qmake/mkspecs/features/default_post.prf:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (128294 => 128295)


--- trunk/Tools/ChangeLog	2012-09-12 12:10:20 UTC (rev 128294)
+++ trunk/Tools/ChangeLog	2012-09-12 12:13:50 UTC (rev 128295)
@@ -1,3 +1,17 @@
+2012-09-12  Simon Hausmann  <simon.hausm...@nokia.com>
+
+        [Qt] Make it possible to build with "make release" and "make debug" on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=96488
+
+        Reviewed by Tor Arne Vestbø.
+
+        A "make debug" is passed through recursively and currently it aborts at Makefile.DerivedSources
+        because there are no such targets. We want the generated sources to be independent from release
+        or debug build configurations, so it is sufficient to provide fake debug and release targets that
+        redirect to the same general-purpose target (first) of creating the derived sources.
+
+        * qmake/mkspecs/features/default_post.prf:
+
 2012-09-12  Kenneth Rohde Christiansen  <kenn...@webkit.org>
 
         [EFL] Make DumpRenderTree smarter at finding the fonts

Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128294 => 128295)


--- trunk/Tools/qmake/mkspecs/features/default_post.prf	2012-09-12 12:10:20 UTC (rev 128294)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf	2012-09-12 12:13:50 UTC (rev 128295)
@@ -68,6 +68,13 @@
 
     CONFIG -= debug_and_release
 
+    fake_debug.target = debug
+    fake_debug.depends = first
+    QMAKE_EXTRA_TARGETS += fake_debug
+    fake_release.target = release
+    fake_release.depends = first
+    QMAKE_EXTRA_TARGETS += fake_release
+
     for(generator, GENERATORS) {
         eval($${generator}.CONFIG = target_predeps no_link)
         eval($${generator}.dependency_type = TYPE_C)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to