diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2014-04-07 12:45:13 -0400 |
---|---|---|
committer | Jake Petroules <jake.petroules@petroules.com> | 2014-04-11 01:27:34 +0200 |
commit | 9ab4669eff693e80090db5ad2f08633518f5abde (patch) | |
tree | 03036e7bdf73f2a6d0eee70eaec9cefd50be3478 /tests/auto/blackbox/testdata | |
parent | 317a76c0d11f10270a8747c64bd82fd387c9f8b6 (diff) |
Fix WiX test and turn it into an autotest.
Change-Id: Ifd1cdfc54e7566146a478cf0833a6f67196735cd
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'tests/auto/blackbox/testdata')
-rw-r--r-- | tests/auto/blackbox/testdata/wix/ExampleScript.bat | 1 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/wix/QbsBootstrapper.wxs | 10 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/wix/QbsSetup.wxs | 34 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/wix/WiXInstallers.qbs | 18 |
4 files changed, 63 insertions, 0 deletions
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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Bundle Name="QbsBootstrapper" Version="1.0.0.0" Manufacturer="Qt Project" UpgradeCode="7b05b159-c9ce-477c-9fb5-7fce3cd50396"> + <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense" /> + + <Chain> + <MsiPackage SourceFile="$(var.msiName)" /> + </Chain> + </Bundle> +</Wix> 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Product Id="*" Name="QbsSetup" Language="1033" Version="1.0.0.0" Manufacturer="Qt Project" UpgradeCode="f60f643e-b002-44d5-b3f4-edafd078314c"> + <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> + + <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> + <MediaTemplate /> + + <Feature Id="ProductFeature" Title="QbsSetup" Level="1"> + <ComponentGroupRef Id="ProductComponents" /> + </Feature> + </Product> + + <Fragment> + <Directory Id="TARGETDIR" Name="SourceDir"> + <?ifdef Win64 ?> + <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?> + <?else ?> + <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?> + <?endif ?> + <Directory Id="$(var.PlatformProgramFilesFolder)"> + <Directory Id="INSTALLFOLDER" Name="QbsSetup" /> + </Directory> + </Directory> + </Fragment> + + <Fragment> + <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> + <Component Id="ProductComponent"> + <File Source="$(var.project.path)/$(var.scriptName)" /> + </Component> + </ComponentGroup> + </Fragment> +</Wix> 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"] + } +} |