diff options
author | Jake Petroules <jake.petroules@qt.io> | 2016-11-28 01:57:57 -0800 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2016-12-05 13:04:53 +0000 |
commit | d5b4d35659265013d2695f9de87d661d8101280c (patch) | |
tree | c55b9aade6aaf95097791a528e67a26014627413 /share | |
parent | 0ffae69bcaca623acc3efb3afc2c0def2aa67977 (diff) | |
download | qbs-d5b4d35659265013d2695f9de87d661d8101280c.tar.gz |
Add support for building Inno Setup packages
[ChangeLog] Add support for building Inno Setup packages
Task-number: QBS-936
Change-Id: I4cc8e2b39ad93a7aa307a38d88e3f61687c8d364
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs | 54 | ||||
-rw-r--r-- | share/qbs/imports/qbs/base/InnoSetup.qbs | 34 | ||||
-rw-r--r-- | share/qbs/modules/innosetup/InnoSetupModule.qbs | 142 |
3 files changed, 230 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs b/share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs new file mode 100644 index 000000000..d0e756d19 --- /dev/null +++ b/share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing +** +** This file is part of Qbs. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information +** use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +import qbs +import qbs.Utilities + +PathProbe { + // Outputs + property var version + + configure: { + var keySuffix = "Microsoft\\Windows\\CurrentVersion\\Uninstall\\Inno Setup 5_is1"; + var keys = [ + "HKEY_LOCAL_MACHINE\\SOFTWARE\\" + keySuffix, + "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\" + keySuffix + ]; + for (var i in keys) { + var v = Utilities.getNativeSetting(keys[i], "DisplayVersion"); + if (v) { + path = Utilities.getNativeSetting(keys[i], "InstallLocation"); + version = v; + found = path && version; + return; + } + } + } +} diff --git a/share/qbs/imports/qbs/base/InnoSetup.qbs b/share/qbs/imports/qbs/base/InnoSetup.qbs new file mode 100644 index 000000000..5ea076eb3 --- /dev/null +++ b/share/qbs/imports/qbs/base/InnoSetup.qbs @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing +** +** This file is part of Qbs. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information +** use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +Product { + Depends { name: "innosetup"; condition: qbs.targetOS.contains("windows") } + type: ["innosetup.exe"] +} diff --git a/share/qbs/modules/innosetup/InnoSetupModule.qbs b/share/qbs/modules/innosetup/InnoSetupModule.qbs new file mode 100644 index 000000000..70e36f77b --- /dev/null +++ b/share/qbs/modules/innosetup/InnoSetupModule.qbs @@ -0,0 +1,142 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing +** +** This file is part of Qbs. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information +** use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +import qbs +import qbs.FileInfo +import qbs.ModUtils +import qbs.Probes + +Module { + condition: qbs.targetOS.contains("windows") + + Probes.InnoSetupProbe { + id: innoSetupProbe + } + + property path toolchainInstallPath: innoSetupProbe.path + version: innoSetupProbe.version + property var versionParts: version ? version.split('.').map(function (item) { return parseInt(item, 10); }) : [] + property int versionMajor: versionParts[0] + property int versionMinor: versionParts[1] + property int versionPatch: versionParts[2] + + property string compilerName: "ISCC.exe" + property string compilerPath: FileInfo.joinPaths(toolchainInstallPath, compilerName) + + property bool verboseOutput: false + PropertyOptions { + name: "verboseOutput" + description: "display verbose output from the Inno Setup compiler" + } + + property pathList includePaths + PropertyOptions { + name: "includePaths" + description: "directories to add to the include search path" + } + + property stringList defines + PropertyOptions { + name: "defines" + description: "variables that are defined when using the Inno Setup compiler" + } + + property stringList compilerFlags + PropertyOptions { + name: "compilerFlags" + description: "additional flags for the Inno Setup compiler" + } + + readonly property string executableSuffix: ".exe" + + validate: { + var validator = new ModUtils.PropertyValidator("innosetup"); + validator.setRequiredProperty("toolchainInstallPath", toolchainInstallPath); + validator.setRequiredProperty("version", version); + validator.setRequiredProperty("versionMajor", versionMajor); + validator.setRequiredProperty("versionMinor", versionMinor); + validator.setRequiredProperty("versionPatch", versionPatch); + validator.addVersionValidator("version", version, 3, 3); + validator.addRangeValidator("versionMajor", versionMajor, 1); + validator.addRangeValidator("versionMinor", versionMinor, 0); + validator.addRangeValidator("versionPatch", versionPatch, 0); + validator.validate(); + } + + // Inno Setup Script + FileTagger { + patterns: ["*.iss"] + fileTags: ["innosetup.iss"] + } + + Rule { + id: innoSetupCompiler + inputs: ["innosetup.iss"] + + Artifact { + fileTags: ["innosetup.exe", "application"] + filePath: FileInfo.joinPaths(product.destinationDirectory, + product.targetName + + ModUtils.moduleProperty(product, "executableSuffix")) + } + + prepare: { + var i; + var args = [ + "/O" + FileInfo.toNativeSeparators(FileInfo.path(output.filePath)), + "/F" + FileInfo.toNativeSeparators(FileInfo.completeBaseName(output.fileName)) + ]; + + if (!ModUtils.moduleProperty(product, "verboseOutput")) + args.push("/Q"); + + var includePaths = ModUtils.moduleProperty(product, "includePaths"); + for (i in includePaths) + args.push("/I" + FileInfo.toNativeSeparators(includePaths[i])); + + // User-supplied defines + var defines = ModUtils.moduleProperty(product, "defines"); + for (i in defines) + args.push("/D" + defines[i]); + + // User-supplied flags + var flags = ModUtils.moduleProperty(product, "compilerFlags"); + for (i in flags) + args.push(flags[i]); + + args.push(FileInfo.toNativeSeparators(input.filePath)); + var cmd = new Command(ModUtils.moduleProperty(product, "compilerPath"), args); + cmd.description = "compiling " + input.fileName; + cmd.highlight = "compiler"; + cmd.workingDirectory = FileInfo.path(input.filePath); + return cmd; + } + } +} |