Installer modules: add a "helper" file tag to pull in dependent inputs

Use case: building an Inno Setup, NSIS, or WiX project often depends on
artifacts created by other products (executables, shared libraries,
etc.). This allows the rules which create these installer files to
depend on relevant installable artifacts.

[ChangeLog] The Inno Setup, NSIS, and WiX modules' rules now have a
dependency on installable artifacts of dependencies by default, via
the default item templates InnoSetup, NSISSetup,
and WindowsInstallerPackage. This can be explicitly controlled via the
dependsOnInstallables boolean property of those item templates.

Change-Id: Ia12f7d9965091c06ab83ba86836ec989c899f765
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 54 insertions, 3 deletions

diff --git a/share/qbs/imports/qbs/base/InnoSetup.qbs b/share/qbs/imports/qbs/base/InnoSetup.qbs
index 5ea076eb3..732ca06b0 100644
--- a/share/qbs/imports/qbs/base/InnoSetup.qbs
+++ b/share/qbs/imports/qbs/base/InnoSetup.qbs
@@ -28,7 +28,10 @@
 **
 ****************************************************************************/
 
-Product {
+import qbs
+
+Installer {
     Depends { name: "innosetup"; condition: qbs.targetOS.contains("windows") }
     type: ["innosetup.exe"]
+    auxiliaryInputs: ["innosetup.input"]
 }
diff --git a/share/qbs/imports/qbs/base/Installer.qbs b/share/qbs/imports/qbs/base/Installer.qbs
new file mode 100644
index 000000000..701034f62
--- /dev/null
+++ b/share/qbs/imports/qbs/base/Installer.qbs
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
+**
+** This file is part of Qbs.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms and
+** conditions see http://www.qt.io/terms-conditions. For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights.  These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+import qbs
+
+Product {
+    property bool dependsOnInstallables: true
+    property stringList auxiliaryInputs: []
+
+    Group {
+        condition: dependsOnInstallables
+        fileTagsFilter: ["installable"]
+        fileTags: auxiliaryInputs
+    }
+}
diff --git a/share/qbs/imports/qbs/base/NSISSetup.qbs b/share/qbs/imports/qbs/base/NSISSetup.qbs
index 1362f2713..183577bd5 100644
--- a/share/qbs/imports/qbs/base/NSISSetup.qbs
+++ b/share/qbs/imports/qbs/base/NSISSetup.qbs
@@ -28,7 +28,10 @@
 **
 ****************************************************************************/
 
-Product {
+import qbs
+
+Installer {
     Depends { name: "nsis"; condition: qbs.targetOS.contains("windows") }
     type: ["nsissetup"]
+    auxiliaryInputs: ["nsis.input"]
 }
diff --git a/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs b/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs
index 791fc9473..554149337 100644
--- a/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs
+++ b/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs
@@ -28,7 +28,10 @@
 **
 ****************************************************************************/
 
-Product {
+import qbs
+
+Installer {
     Depends { name: "wix"; condition: qbs.targetOS.contains("windows") }
     type: ["msi"]
+    auxiliaryInputs: ["wix.input"]
 }