Changeset 201

Timestamp:

Oct 5, 2009, 8:51:38 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

mkspecs: Generate explicit all, clean, distclean and install/uninstall targets for both debug_and_release builds in the subdirs makefile (in the common form of 'release-clean', 'release-install' etc).

File:

• trunk/mkspecs/features/exclusive_builds.prf (modified) (2 diffs)

trunk/mkspecs/features/exclusive_builds.prf

@@ -42 +42 @@
 
     contains(TEMPLATE, subdirs) {
+        # explicit default targets for both builds
         eval(sub_$${firstBuildName}.target = $$firstBuild)
-        export(sub_$${firstBuildName}.target)
+        export(sub_$${firstBuildName}.target)
         eval(sub_$${firstBuildName}.CONFIG = recursive)
-        export(sub_$${firstBuildName}.CONFIG)
+        export(sub_$${firstBuildName}.CONFIG)
         eval(sub_$${secondBuildName}.target = $$secondBuild)
-        export(sub_$${secondBuildName}.target)
+        export(sub_$${secondBuildName}.target)
         eval(sub_$${secondBuildName}.CONFIG = recursive)
-        export(sub_$${secondBuildName}.CONFIG)
-        QMAKE_EXTRA_TARGETS += sub_$${firstBuildName} sub_$${secondBuildName}
-        export(QMAKE_EXTRA_TARGETS)
+        export(sub_$${secondBuildName}.CONFIG)
+        QMAKE_EXTRA_TARGETS += sub_$${firstBuildName} sub_$${secondBuildName}
+        # other handy explicit targets
+        targets = all clean distclean install uninstall
+        for(tgt, targets) {
+            eval(sub_$${firstBuildName}_$${tgt}.target = $${firstBuild}-$${tgt})
+            export(sub_$${firstBuildName}_$${tgt}.target)
+            eval(sub_$${firstBuildName}_$${tgt}.CONFIG = recursive)
+            export(sub_$${firstBuildName}_$${tgt}.CONFIG)
+            eval(sub_$${secondBuildName}_$${tgt}.target = $${secondBuild}-$${tgt})
+            export(sub_$${secondBuildName}_$${tgt}.target)
+            eval(sub_$${secondBuildName}_$${tgt}.CONFIG = recursive)
+            export(sub_$${secondBuildName}_$${tgt}.CONFIG)
+            QMAKE_EXTRA_TARGETS += sub_$${firstBuildName}_$${tgt} sub_$${secondBuildName}_$${tgt}
+        }
+        unset(targets)
+        # export all new targets
+        export(QMAKE_EXTRA_TARGETS)
     } else:!build_pass {
         first_BUILDS  =
@@ -85 +101 @@
             eval($${secondBuildName}$${permutation}.CONFIG = $${secondBuild} $${secondBuildName}Build $$eval($${permutation}.CONFIG))
             export($${secondBuildName}$${permutation}.CONFIG)
- 
+
             first_BUILDS += $${firstBuildName}$${permutation}
             second_BUILDS += $${secondBuildName}$${permutation}
         }
- 
+
         # A mutual exclusive block.
-        CONFIG($${firstBuild}, $${firstBuild}|$${secondBuild}): BUILDS = $$first_BUILDS  $$second_BUILDS 
+        CONFIG($${firstBuild}, $${firstBuild}|$${secondBuild}): BUILDS = $$first_BUILDS  $$second_BUILDS
         else: BUILDS = $$second_BUILDS $$first_BUILDS
         export(BUILDS)