From 9ab4669eff693e80090db5ad2f08633518f5abde Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 7 Apr 2014 12:45:13 -0400 Subject: Fix WiX test and turn it into an autotest. Change-Id: Ifd1cdfc54e7566146a478cf0833a6f67196735cd Reviewed-by: Christian Kandeler --- tests/auto/blackbox/testdata/wix/ExampleScript.bat | 1 + .../auto/blackbox/testdata/wix/QbsBootstrapper.wxs | 10 +++++++ tests/auto/blackbox/testdata/wix/QbsSetup.wxs | 34 ++++++++++++++++++++++ tests/auto/blackbox/testdata/wix/WiXInstallers.qbs | 18 ++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 tests/auto/blackbox/testdata/wix/ExampleScript.bat create mode 100644 tests/auto/blackbox/testdata/wix/QbsBootstrapper.wxs create mode 100644 tests/auto/blackbox/testdata/wix/QbsSetup.wxs create mode 100644 tests/auto/blackbox/testdata/wix/WiXInstallers.qbs (limited to 'tests/auto/blackbox/testdata') diff --git a/tests/auto/blackbox/testdata/wix/ExampleScript.bat b/tests/auto/blackbox/testdata/wix/ExampleScript.bat new file mode 100644 index 000000000..3af583cd8 --- /dev/null +++ b/tests/auto/blackbox/testdata/wix/ExampleScript.bat @@ -0,0 +1 @@ +echo Hello world! diff --git a/tests/auto/blackbox/testdata/wix/QbsBootstrapper.wxs b/tests/auto/blackbox/testdata/wix/QbsBootstrapper.wxs new file mode 100644 index 000000000..272f6af5b --- /dev/null +++ b/tests/auto/blackbox/testdata/wix/QbsBootstrapper.wxs @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/tests/auto/blackbox/testdata/wix/QbsSetup.wxs b/tests/auto/blackbox/testdata/wix/QbsSetup.wxs new file mode 100644 index 000000000..8f97ff667 --- /dev/null +++ b/tests/auto/blackbox/testdata/wix/QbsSetup.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs new file mode 100644 index 000000000..6f4adfe8f --- /dev/null +++ b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs @@ -0,0 +1,18 @@ +import qbs + +Project { + WindowsInstallerPackage { + name: "QbsSetup" + targetName: "qbs-" + qbs.architecture + files: ["QbsSetup.wxs", "ExampleScript.bat"] + wix.defines: ["scriptName=ExampleScript.bat"] + } + + WindowsSetupPackage { + Depends { name: "QbsSetup" } + name: "QbsBootstrapper" + targetName: "qbs-setup-" + qbs.architecture + files: ["QbsBootstrapper.wxs"] + wix.defines: ["msiName=qbs-" + qbs.architecture + ".msi"] + } +} -- cgit v1.2.3