aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/configurations
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-02-13 11:24:52 +0100
committerEike Ziller <eike.ziller@qt.io>2019-02-13 11:02:25 +0000
commit967553b02d8f9a1ce8c23e5b9c1dde9852100d2c (patch)
tree3053b492517c2279f6cc487b7cd40e3061624704 /packaging-tools/configurations
parent973fd480ae9ca621df0d3ad3e3d5f9166706ccb1 (diff)
Add package for MSVC 2017 redistributable
To be used by Qt Creator + Design Studio + potentially others Change-Id: I6342380a9f7bead530ec92514c559ea22f7c309f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'packaging-tools/configurations')
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/installscript.qs48
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/package.xml10
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/installscript.qs48
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/package.xml10
-rw-r--r--packaging-tools/configurations/windows/x64/x64-tools-vcredist_msvc2017-conf37
-rw-r--r--packaging-tools/configurations/windows/x86/x86-tools-vcredist_msvc2017-conf37
6 files changed, 190 insertions, 0 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/installscript.qs
new file mode 100644
index 000000000..2a6cd1961
--- /dev/null
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/installscript.qs
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the release tools of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// constructor
+function Component()
+{
+ // only install c++ runtime if it is needed, no minor version check of the c++ runtime till we need it
+ if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\15.0\\VC\\Runtimes\\x64\\Installed") != 1)
+ component.setValue("RequiresAdminRights", "true");
+}
+
+Component.prototype.createOperations = function()
+{
+ // Call the base createOperations and afterwards set some registry settings
+ // so that the simulator finds its fonts and applications find the simulator
+ component.createOperations();
+
+ if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\15.0\\VC\\Runtimes\\x64\\Installed") != 1) {
+ // return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application
+ // return value 5100 means there's a newer version of the runtime already installed
+ component.addElevatedOperation("Execute", "{0,3010,1638,5100}", "@TargetDir@\\vcredist\\vcredist_msvc2017_x64.exe", "/norestart", "/q");
+ }
+}
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/package.xml
new file mode 100644
index 000000000..57ca644ca
--- /dev/null
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/package.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+ <DisplayName>VCRedist for MSVC 2017 64bit</DisplayName>
+ <Description>Visual C++ Redistributable Packages for Visual Studio 2017 64 bit</Description>
+ <Version>2019-02-13-0</Version>
+ <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
+ <Script>installscript.qs</Script>
+ <Virtual>true</Virtual>
+ <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
+</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/installscript.qs
new file mode 100644
index 000000000..a62b3913b
--- /dev/null
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/installscript.qs
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the release tools of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// constructor
+function Component()
+{
+ // only install c runtime if it is needed, no minor version check of the c runtime till we need it
+ if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\15.0\\VC\\Runtimes\\x86\\Installed") != 1)
+ component.setValue("RequiresAdminRights", "true");
+}
+
+Component.prototype.createOperations = function()
+{
+ // Call the base createOperations and afterwards set some registry settings
+ // so that the simulator finds its fonts and applications find the simulator
+ component.createOperations();
+
+ if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\15.0\\VC\\Runtimes\\x86\\Installed") != 1) {
+ // return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application
+ // return value 5100 means there's a newer version of the runtime already installed
+ component.addElevatedOperation("Execute", "{0,3010,1638,5100}", "@TargetDir@\\vcredist\\vcredist_msvc2017_x86.exe", "/norestart", "/q");
+ }
+}
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/package.xml
new file mode 100644
index 000000000..4d7306bff
--- /dev/null
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/package.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+ <DisplayName>VCRedist for MSVC 2017 32bit</DisplayName>
+ <Description>Visual C++ Redistributable Packages for Visual Studio 2017 32 bit</Description>
+ <Version>2019-02-13-0</Version>
+ <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
+ <Script>installscript.qs</Script>
+ <Virtual>true</Virtual>
+ <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
+</Package>
diff --git a/packaging-tools/configurations/windows/x64/x64-tools-vcredist_msvc2017-conf b/packaging-tools/configurations/windows/x64/x64-tools-vcredist_msvc2017-conf
new file mode 100644
index 000000000..5f6f67871
--- /dev/null
+++ b/packaging-tools/configurations/windows/x64/x64-tools-vcredist_msvc2017-conf
@@ -0,0 +1,37 @@
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the release tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## 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 https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+[qt.tools.vcredist_msvc2017_x64]
+archives: tools.vcredist_msvc2017_x64
+target_install_base: /vcredist
+[tools.vcredist_msvc2017_x64]
+archive_uri: http://download.qt.io/development_releases/prebuilt/vcredist/vcredist_msvc2017_x64.7z
+package_strip_dirs: 0
+target_install_dir: /
+archive_name: vcredist_msvc2017_x64.7z
diff --git a/packaging-tools/configurations/windows/x86/x86-tools-vcredist_msvc2017-conf b/packaging-tools/configurations/windows/x86/x86-tools-vcredist_msvc2017-conf
new file mode 100644
index 000000000..d0f98fca2
--- /dev/null
+++ b/packaging-tools/configurations/windows/x86/x86-tools-vcredist_msvc2017-conf
@@ -0,0 +1,37 @@
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the release tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## 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 https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+[qt.tools.vcredist_msvc2017_x86]
+archives: tools.vcredist_msvc2017_x86
+target_install_base: /vcredist
+[tools.vcredist_msvc2017_x86]
+archive_uri: http://download.qt.io/development_releases/prebuilt/vcredist/vcredist_msvc2017_x86.7z
+package_strip_dirs: 0
+target_install_dir: /
+archive_name: vcredist_msvc2017_x86.7z