Fix race conditions in innosetup, wix and nsis modules

As first attempted in 7f6ec1cc27.

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

7 files changed, 7 insertions, 52 deletions

diff --git a/share/qbs/imports/qbs/base/InnoSetup.qbs b/share/qbs/imports/qbs/base/InnoSetup.qbs
index 732ca06b0..c4873412a 100644
--- a/share/qbs/imports/qbs/base/InnoSetup.qbs
+++ b/share/qbs/imports/qbs/base/InnoSetup.qbs
@@ -30,8 +30,7 @@
 
 import qbs
 
-Installer {
+Product {
     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
deleted file mode 100644
index 701034f62..000000000
--- a/share/qbs/imports/qbs/base/Installer.qbs
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** 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 183577bd5..6401a17c4 100644
--- a/share/qbs/imports/qbs/base/NSISSetup.qbs
+++ b/share/qbs/imports/qbs/base/NSISSetup.qbs
@@ -30,8 +30,7 @@
 
 import qbs
 
-Installer {
+Product {
     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 554149337..d624be864 100644
--- a/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs
+++ b/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs
@@ -30,8 +30,7 @@
 
 import qbs
 
-Installer {
+Product {
     Depends { name: "wix"; condition: qbs.targetOS.contains("windows") }
     type: ["msi"]
-    auxiliaryInputs: ["wix.input"]
 }
diff --git a/share/qbs/modules/innosetup/InnoSetupModule.qbs b/share/qbs/modules/innosetup/InnoSetupModule.qbs
index a2f85d51b..bc5b74460 100644
--- a/share/qbs/modules/innosetup/InnoSetupModule.qbs
+++ b/share/qbs/modules/innosetup/InnoSetupModule.qbs
@@ -99,7 +99,7 @@ Module {
     Rule {
         id: innoSetupCompiler
         inputs: ["innosetup.iss"]
-        auxiliaryInputs: ["innosetup.input"]
+        auxiliaryInputs: ["installable"]
 
         Artifact {
             fileTags: ["innosetup.exe", "application"]
diff --git a/share/qbs/modules/nsis/NSISModule.qbs b/share/qbs/modules/nsis/NSISModule.qbs
index d1a356c46..ef1d5b0e1 100644
--- a/share/qbs/modules/nsis/NSISModule.qbs
+++ b/share/qbs/modules/nsis/NSISModule.qbs
@@ -145,7 +145,7 @@ Module {
         id: nsisCompiler
         multiplex: true
         inputs: ["nsi"]
-        auxiliaryInputs: ["nsis.input"]
+        auxiliaryInputs: ["installable"]
 
         Artifact {
             fileTags: ["nsissetup", "application"]
diff --git a/share/qbs/modules/wix/WiXModule.qbs b/share/qbs/modules/wix/WiXModule.qbs
index 5f2d1316c..3159822de 100644
--- a/share/qbs/modules/wix/WiXModule.qbs
+++ b/share/qbs/modules/wix/WiXModule.qbs
@@ -179,7 +179,7 @@ Module {
     Rule {
         id: candleCompiler
         inputs: ["wxs"]
-        auxiliaryInputs: ["wxi", "wix.input"]
+        auxiliaryInputs: ["wxi", "installable"]
 
         Artifact {
             fileTags: ["wixobj"]
@@ -334,7 +334,7 @@ Module {
         id: lightLinker
         multiplex: true
         inputs: ["wixobj", "wxl"]
-        auxiliaryInputs: ["wix.input"]
+        auxiliaryInputs: ["installable"]
         inputsFromDependencies: product.type.contains("wixsetup") ? ["msi"] : []
 
         outputArtifacts: {