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/manual | |
| 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/manual')
| -rw-r--r-- | tests/manual/WiXInstallers/ExampleScript.bat | 1 | ||||
| -rwxr-xr-x | tests/manual/WiXInstallers/QbsBootstrapper.wxs | 10 | ||||
| -rwxr-xr-x | tests/manual/WiXInstallers/QbsSetup.wxs | 34 | ||||
| -rw-r--r-- | tests/manual/WiXInstallers/WiXInstallers.qbs | 18 |
4 files changed, 0 insertions, 63 deletions
diff --git a/tests/manual/WiXInstallers/ExampleScript.bat b/tests/manual/WiXInstallers/ExampleScript.bat deleted file mode 100644 index 3af583cd8..000000000 --- a/tests/manual/WiXInstallers/ExampleScript.bat +++ /dev/null @@ -1 +0,0 @@ -echo Hello world! diff --git a/tests/manual/WiXInstallers/QbsBootstrapper.wxs b/tests/manual/WiXInstallers/QbsBootstrapper.wxs deleted file mode 100755 index 272f6af5b..000000000 --- a/tests/manual/WiXInstallers/QbsBootstrapper.wxs +++ /dev/null @@ -1,10 +0,0 @@ -<?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/manual/WiXInstallers/QbsSetup.wxs b/tests/manual/WiXInstallers/QbsSetup.wxs deleted file mode 100755 index 8f97ff667..000000000 --- a/tests/manual/WiXInstallers/QbsSetup.wxs +++ /dev/null @@ -1,34 +0,0 @@ -<?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/manual/WiXInstallers/WiXInstallers.qbs b/tests/manual/WiXInstallers/WiXInstallers.qbs deleted file mode 100644 index 59cdf7f4c..000000000 --- a/tests/manual/WiXInstallers/WiXInstallers.qbs +++ /dev/null @@ -1,18 +0,0 @@ -import qbs - -Project { - WindowsInstallerPackage { - name: "QbsSetup" - targetName: "qbs-" + qbs.architecture - files: ["QbsSetup.wxs", "ExampleScript.bat"] - wix.defines: ["scriptName=ExampleScript.bat"] - } - - BurnSetupPackage { - Depends { name: "QbsSetup" } - name: "QbsBootstrapper" - targetName: "qbs-setup-" + qbs.architecture - files: ["QbsBootstrapper.wxs"] - wix.defines: ["msiName=qbs-" + qbs.architecture + ".msi"] - } -} |