Changeset 121966 in webkit

Timestamp:

Jul 6, 2012 6:20:11 AM (12 years ago)

Author:

Csaba Osztrogonác

Message:

[Qt] Make use of Qt5 qmake's changed makefile recursion behavior

When not using the -r option, qmake now interleaves qmake and make calls,
so we don't need custom logic for this. There's also an option to supress
the effect of the -r option, which we use to make WebKit.pro the only
project file parsed in a recursive qmake-run.

​https://bugs.webkit.org/show_bug.cgi?id=90461

Patch by Oswald Buddenhagen <​oswald.buddenhagen@nokia.com> on 2012-07-06
Reviewed by Tor Arne Vestbø.

• qmake/mkspecs/features/default_post.prf:
• qmake/mkspecs/features/functions.prf:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• qmake/mkspecs/features/default_post.prf (modified) (2 diffs)
• qmake/mkspecs/features/functions.prf (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
+        [Qt] Make use of Qt5 qmake's changed makefile recursion behavior
+
+        When not using the -r option, qmake now interleaves qmake and make calls,
+        so we don't need custom logic for this. There's also an option to supress
+        the effect of the -r option, which we use to make WebKit.pro the only
+        project file parsed in a recursive qmake-run.
+
+        https://bugs.webkit.org/show_bug.cgi?id=90461
+
+        Reviewed by Tor Arne Vestbø.
+
+        * qmake/mkspecs/features/default_post.prf:
+        * qmake/mkspecs/features/functions.prf:
+
 2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
 

trunk/Tools/qmake/mkspecs/features/default_post.prf

@@ -237 +237 @@
 }
 
-# Doing `$(MAKE) qmake' should recurse through all subdirs
-contains(TEMPLATE, subdirs):!no_recursive_qmake {
+# Doing '$(MAKE) qmake' should recurse through all subdirs. In Qt5, this is
+# automatic (for 'qmake_all', while 'qmake' does not enter subdirs at all).
+haveQt(4):contains(TEMPLATE, subdirs):!no_recursive_qmake {
     recursive_qmake.target = qmake_all
 
@@ -274 +275 @@
 
 incremental.target = incremental
-incremental.commands = $(MAKE) -f $(MAKEFILE) qmake && $(MAKE) -f $(MAKEFILE)
+incremental.commands = $(MAKE) -f $(MAKEFILE) qmake_all && $(MAKE) -f $(MAKEFILE)
 QMAKE_EXTRA_TARGETS += incremental
 

trunk/Tools/qmake/mkspecs/features/functions.prf

@@ -138 +138 @@
     second_base_target = sub-$$replace(secondSubdirFile, [^a-zA-Z0-9_], -)
 
-    # Use a custom target for making the derived sources instead of the default ones,
-    # as the default ones depend on $(MAKEFILE), while we want to depend on *qmake_all.
-    # Without this rule we end up running qmake twice for the derived sources, as well as
-    # introducing a race condition where we run "qmake -o Makefile.DerivedSources" at the
-    # same time as we run "make -f Makefile.DerivedSources", resulting in make reading a
-    # half-written makefile.
-    derived_make_for_qmake.target = $${first_base_target}-make_for_qmake
-    derived_make_for_qmake.depends = $${first_base_target}-qmake_all
-    derived_make_for_qmake.commands = $(MAKE) -f $$eval($${firstSubdir}.makefile)
-    QMAKE_EXTRA_TARGETS += derived_make_for_qmake
-
-    # This target ensures that running "make qmake" will force both qmake and make
-    # to be run on the derived sources before running qmake on the target, so that
-    # qmake can pick up the right dependencies for the target based on the derived
-    # sources that were generated.
-    target_make_qmake.target = $${second_base_target}-qmake_all
-    target_make_qmake.depends = $${derived_make_for_qmake.target}
-    QMAKE_EXTRA_TARGETS += target_make_qmake
-
-    GNUmake {
-        # This target ensures that running make before any makefiles have been created
-        # will still force qmake and make to be run on the derived sources first.
-        target_make.target = $$eval($${secondSubdir}.makefile)
-
-        # We use order-only-prerequisites so that we can run make on the derived sources
-        # without triggering a qmake run on the target due to updated dependencies.
-        target_make.depends = "| $${first_base_target}-make_default-ordered"
-
-        QMAKE_EXTRA_TARGETS += target_make
+    haveQt(4) {
+        # Use a custom target for making the derived sources instead of the default ones,
+        # as the default ones depend on $(MAKEFILE), while we want to depend on *qmake_all.
+        # Without this rule we end up running qmake twice for the derived sources, as well as
+        # introducing a race condition where we run "qmake -o Makefile.DerivedSources" at the
+        # same time as we run "make -f Makefile.DerivedSources", resulting in make reading a
+        # half-written makefile.
+        derived_make_for_qmake.target = $${first_base_target}-make_for_qmake
+        derived_make_for_qmake.depends = $${first_base_target}-qmake_all
+        derived_make_for_qmake.commands = $(MAKE) -f $$eval($${firstSubdir}.makefile)
+        QMAKE_EXTRA_TARGETS += derived_make_for_qmake
+
+        # This target ensures that running "make qmake" will force both qmake and make
+        # to be run on the derived sources before running qmake on the target, so that
+        # qmake can pick up the right dependencies for the target based on the derived
+        # sources that were generated.
+        target_make_qmake.target = $${second_base_target}-qmake_all
+        target_make_qmake.depends = $${derived_make_for_qmake.target}
+        QMAKE_EXTRA_TARGETS += target_make_qmake
+
+        GNUmake {
+            # This target ensures that running make before any makefiles have been created
+            # will still force qmake and make to be run on the derived sources first.
+            target_make.target = $$eval($${secondSubdir}.makefile)
+
+            # We use order-only-prerequisites so that we can run make on the derived sources
+            # without triggering a qmake run on the target due to updated dependencies.
+            target_make.depends = "| $${first_base_target}-make_default-ordered"
+
+            QMAKE_EXTRA_TARGETS += target_make
+        }
+    } else {
+        # Qt5's qmake does most of the above for us already.
+
+        # This target ensures that running "make qmake_all" will force both qmake and make
+        # to be run on the derived sources before running qmake on the target, so that
+        # qmake can pick up the right dependencies for the target based on the derived
+        # sources that were generated. Just "make qmake" is non-recursive anyway.
+        target_make_qmake.target = $${second_base_target}-qmake_all
+        target_make_qmake.depends = $${first_base_target}
+        QMAKE_EXTRA_TARGETS += target_make_qmake
+
+        # Make things work even if qmake -r is used.
+        CONFIG += dont_recurse
     }