diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-10-31 09:27:00 -0400 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-04 11:44:00 +0100 |
| commit | 4e136110b1b6ac0cbc5ace5077a26aa258338e21 (patch) | |
| tree | 55e8296c70a47a3309cd745d9281e4bde0714ceb /share | |
| parent | 2bd54bec4e67c90350c141dc05b65ff9cdac4a1e (diff) | |
| download | qbs-4e136110b1b6ac0cbc5ace5077a26aa258338e21.tar.gz | |
Don't use the term "Burn" in the WiX module.
What WiX happens to calls its various internal parts is irrelevant to
users; using more well understood terminology now.
Task-number: QBS-413
Change-Id: Iba2359d92d36b0a2e8a78b75d9bed7fec4d728d1
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/base/WindowsSetupPackage.qbs (renamed from share/qbs/imports/qbs/base/BurnSetupPackage.qbs) | 2 | ||||
| -rw-r--r-- | share/qbs/modules/wix/WiXModule.qbs | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/share/qbs/imports/qbs/base/BurnSetupPackage.qbs b/share/qbs/imports/qbs/base/WindowsSetupPackage.qbs index e1ff83a0d..a3609ed03 100644 --- a/share/qbs/imports/qbs/base/BurnSetupPackage.qbs +++ b/share/qbs/imports/qbs/base/WindowsSetupPackage.qbs @@ -1,4 +1,4 @@ Product { Depends { name: "wix" } - type: ["burnsetup"] + type: ["wixsetup"] } diff --git a/share/qbs/modules/wix/WiXModule.qbs b/share/qbs/modules/wix/WiXModule.qbs index 84cd1f6c6..97a6796dd 100644 --- a/share/qbs/modules/wix/WiXModule.qbs +++ b/share/qbs/modules/wix/WiXModule.qbs @@ -89,13 +89,13 @@ Module { description: "the list of localizations to build the MSI for; leave undefined to build all localizations" } - property stringList extensions: type.contains("burnsetup") ? ["WixBalExtension"] : [] // default to WiX Standard Bootstrapper extension + property stringList extensions: type.contains("wixsetup") ? ["WixBalExtension"] : [] // default to WiX Standard Bootstrapper extension // private properties property string targetSuffix: { if (type.contains("msi")) { return windowsInstallerSuffix; - } else if (type.contains("burnsetup")) { + } else if (type.contains("wixsetup")) { return executableSuffix; } } @@ -279,8 +279,8 @@ Module { inputs: ["wixobj", "wxl"] Artifact { - condition: product.type.contains("burnsetup") - fileTags: ["burnsetup", "application"] + condition: product.type.contains("wixsetup") + fileTags: ["wixsetup", "application"] fileName: product.destinationDirectory + "/" + product.targetName + ModUtils.moduleProperty(product, "executableSuffix") } @@ -299,8 +299,8 @@ Module { prepare: { var i; var primaryOutput; - if (product.type.contains("burnsetup")) { - primaryOutput = outputs.burnsetup[0]; + if (product.type.contains("wixsetup")) { + primaryOutput = outputs.wixsetup[0]; } else if (product.type.contains("msi")) { primaryOutput = outputs.msi[0]; } else { |
