Do not pull in the bundle module unconditionally

... into our convenience products such as Application. It is not needed
for non-Darwin platforms.

Change-Id: I4cba4c088eeb5817e6991ccbf2c78b41d5ac88c8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

4 files changed, 29 insertions, 5 deletions

diff --git a/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs b/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs
index 2d9c95e95..217ed7d08 100644
--- a/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs
+++ b/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs
@@ -20,6 +20,14 @@ Project {
             files: "test.cpp.in"
             fileTags: "cpp.in"
         }
+        Probe {
+            id: osProbe
+            property stringList targetOS: qbs.targetOS
+            configure: {
+                found = targetOS.contains("darwin");
+                console.info("is darwin: " + found);
+            }
+        }
     }
     Product {
         name: "meta"
diff --git a/tests/auto/blackbox/testdata/installpackage/installpackage.qbs b/tests/auto/blackbox/testdata/installpackage/installpackage.qbs
index 190e3f5ef..a0649a578 100644
--- a/tests/auto/blackbox/testdata/installpackage/installpackage.qbs
+++ b/tests/auto/blackbox/testdata/installpackage/installpackage.qbs
@@ -1,7 +1,10 @@
 Project {
     CppApplication {
         name: "public_tool"
-        bundle.isBundle: false
+        Properties {
+            condition: qbs.targetOS.contains("darwin")
+            bundle.isBundle: false
+        }
         Depends { name: "mylib" }
         files: ["main.cpp"]
         Group {
@@ -16,7 +19,10 @@ Project {
         files: ["main.cpp"]
     }
     DynamicLibrary {
-        bundle.isBundle: false
+        Properties {
+            condition: qbs.targetOS.contains("darwin")
+            bundle.isBundle: false
+        }
         Depends { name: "cpp" }
         name: "mylib"
         files: ["lib.cpp"]
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 5e9615a17..28d2a96a1 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -386,6 +386,8 @@ void TestBlackbox::artifactsMapChangeTracking()
 {
     QDir::setCurrent(testDataDir + "/artifacts-map-change-tracking");
     QCOMPARE(runQbs(QStringList{"-p", "TheApp"}), 0);
+    QVERIFY2(m_qbsStdout.contains("is darwin:"), m_qbsStdout.constData());
+    const bool isDarwin = m_qbsStdout.contains("is darwin: true");
     QVERIFY2(m_qbsStdout.contains("running rule for test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("creating test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("linking"), m_qbsStdout.constData());
@@ -402,8 +404,13 @@ void TestBlackbox::artifactsMapChangeTracking()
     const QString projectFile("artifacts-map-change-tracking.qbs");
     REPLACE_IN_FILE(projectFile, "TheBinary", "TheNewBinary");
     QCOMPARE(runQbs(QStringList{"-p", "TheApp"}), 0);
-    QEXPECT_FAIL("", "change tracking could become even more fine-grained", Continue);
-    QVERIFY2(!m_qbsStdout.contains("running rule for test.cpp"), m_qbsStdout.constData());
+
+    // Changing the target binary affects bundle properties, and property changes on source
+    // artifacts currently cause the build graph loader to invalidate the product's rules.
+    if (isDarwin)
+        QEXPECT_FAIL("", "change tracking could become even more fine-grained", Continue);
+
+    QVERIFY2(m_qbsStdout.contains("running rule for test.cpp") == isDarwin, m_qbsStdout.constData());
     QVERIFY2(!m_qbsStdout.contains("creating test.cpp"), m_qbsStdout.constData());
     QVERIFY2(m_qbsStdout.contains("linking"), m_qbsStdout.constData());
     QCOMPARE(runQbs(QStringList{"-p", "meta"}), 0);
diff --git a/tests/auto/language/testdata/rfc1034identifier.qbs b/tests/auto/language/testdata/rfc1034identifier.qbs
index 885053718..4d320f899 100644
--- a/tests/auto/language/testdata/rfc1034identifier.qbs
+++ b/tests/auto/language/testdata/rfc1034identifier.qbs
@@ -2,5 +2,8 @@ import qbs.Utilities
 
 CppApplication {
     name: Utilities.rfc1034Identifier("this!has@special#characters$uh-oh,Undersc0r3s_Are.Bad")
-    bundle.infoPlist: { return {"CFBundleIdentifier": "$(PRODUCT_NAME:rfc1034identifier)"}; }
+    Properties {
+        condition: qbs.targetOS.contains("darwin")
+        bundle.infoPlist: { return {"CFBundleIdentifier": "$(PRODUCT_NAME:rfc1034identifier)"}; }
+    }
 }