From 7a4988687d3db80d4d75ab13c87a629551fb7345 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 12 Sep 2014 13:56:46 -0400 Subject: Fix various bugs in WiX module and fix its autotest. Misuse of moduleProperty vs moduleProperties, product vs input, reading the toolchain property from the cpp module instead of the qbs module, reading the build variant from the product instead of the qbs module, and various style fixes. Conditional artifacts are also replaced by outputArtifacts. Change-Id: I11a7a73517cddb8f69db6270181f92c9674f9367 Reviewed-by: Jake Petroules Reviewed-by: Christian Kandeler --- tests/auto/blackbox/testdata/wix/WiXInstallers.qbs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/auto/blackbox/testdata') diff --git a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs index 88f50733d..aa93113dd 100644 --- a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs +++ b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs @@ -1,4 +1,5 @@ import qbs +import qbs.FileInfo Project { WindowsInstallerPackage { @@ -6,6 +7,13 @@ Project { targetName: "qbs-" + qbs.architecture files: ["QbsSetup.wxs", "ExampleScript.bat"] wix.defines: ["scriptName=ExampleScript.bat"] + + Export { + Depends { name: "wix" } + wix.defines: base.concat(["msiName=" + + FileInfo.joinPaths(product.buildDirectory, + targetName + wix.windowsInstallerSuffix)]) + } } WindowsSetupPackage { @@ -13,7 +21,6 @@ Project { name: "QbsBootstrapper" targetName: "qbs-setup-" + qbs.architecture files: ["QbsBootstrapper.wxs"] - wix.defines: ["msiName=" + project.buildDirectory + "/QbsSetup/qbs-" + qbs.architecture + ".msi"] } WindowsInstallerPackage { -- cgit v1.2.3