aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/configurations
diff options
context:
space:
mode:
authorAntti Kokko <antti.kokko@qt.io>2018-08-30 15:11:14 +0300
committerAntti Kokko <antti.kokko@qt.io>2018-08-31 05:35:52 +0000
commit5719a877ffae5fcbcafc83a0fbe00d21085e1c07 (patch)
tree8e5ca2de8b5df31e9ffea195a6bd9c0c62646a28 /packaging-tools/configurations
parent328ae37e0a9c7dd068c39d246109203ee5f4575f (diff)
Add MinGW 7.3.0 64-bit package to MinGW tools online repository build
Add package templates. Include 64-bit MinGW 7.3.0 in existing MinGW repository build job since all the MinGW versions exist under same repository structure. Change-Id: I4c13eed66391e0054f1a18e4871fa1189210338e Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Diffstat (limited to 'packaging-tools/configurations')
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/installscript.qs99
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/package.xml12
-rw-r--r--packaging-tools/configurations/repository_configs/tools_desktop/win_x86_repository_tools_mingw38
-rw-r--r--packaging-tools/configurations/windows/x64/x86_64-tools-mingw730-conf38
4 files changed, 162 insertions, 25 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/installscript.qs
new file mode 100644
index 000000000..0bafff4f4
--- /dev/null
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/installscript.qs
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 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()
+{
+ installer.valueChanged.connect( this, Component.prototype.reactOnTargetDirChange );
+ // set the default values to MINGW730_DIR
+ Component.prototype.reactOnTargetDirChange("TargetDir", installer.value("TargetDir"));
+}
+
+Component.prototype.reactOnTargetDirChange = function(key, value)
+{
+ if (key == "TargetDir") {
+ var path = value + "%TARGET_INSTALL_DIR%";
+ installer.setValue("MINGW730_DIR", path.replace(/\\/g, "/"));
+ }
+}
+
+Component.prototype.createOperations = function()
+{
+ component.createOperations();
+
+ if (installer.value("os") == "win") {
+ try {
+ if (installer.value("SDKToolBinary") == "")
+ return;
+
+ var tcId = "ProjectExplorer.ToolChain.Mingw:" + component.name;
+ var dbgId = "Debugger." + component.name;
+ installer.setValue("MINGW730_64_TCID", tcId);
+ installer.setValue("MINGW730_64_DBGID", dbgId);
+
+ component.addOperation("Execute",
+ ["{0,2}", "@SDKToolBinary@", "addTC",
+ "--id", tcId + ".gcc",
+ "--name", "MinGW 7.3.0 64bit for C",
+ "--path", "@MINGW730_DIR@/bin/gcc.exe",
+ "--abi", "x86-windows-msys-pe-64bit",
+ "--language", "1",
+ "--supportedAbis", "x86-windows-msys-pe-64bit",
+ "UNDOEXECUTE",
+ "@SDKToolBinary@", "rmTC", "--id", tcId + ".gcc"]);
+
+ component.addOperation("Execute",
+ ["{0,2}", "@SDKToolBinary@", "addTC",
+ "--id", tcId + ".g++",
+ "--name", "MinGW 7.3.0 64bit for C++",
+ "--path", "@MINGW730_DIR@/bin/g++.exe",
+ "--abi", "x86-windows-msys-pe-64bit",
+ "--language", "2",
+ "--supportedAbis", "x86-windows-msys-pe-64bit",
+ "UNDOEXECUTE",
+ "@SDKToolBinary@", "rmTC", "--id", tcId + ".g++"]);
+
+ component.addOperation("Execute",
+ ["{0,2}", "@SDKToolBinary@", "addDebugger",
+ "--id", dbgId,
+ "--name", "GNU gdb 8.1 for MinGW 7.3.0 64bit",
+ "--binary", "@MINGW730_DIR@/bin/gdb.exe",
+ "--abis", "x86-windows-msys-pe-64bit",
+ "--engine", "1",
+ "UNDOEXECUTE",
+ "@SDKToolBinary@", "rmDebugger", "--id", dbgId]);
+
+ component.addOperation("Execute",
+ ["{0,4}", "@SDKToolBinary@", "addKeys",
+ "android", "MakeExtraSearchDirectory", "QString:@MINGW730_DIR@/bin"]);
+ } catch( e ) {
+ print( e );
+ }
+ }
+}
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/package.xml
new file mode 100644
index 000000000..01e93a8d6
--- /dev/null
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/package.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+ <DisplayName>MinGW 7.3.0 64 bit</DisplayName>
+ <Description>MinGW-builds 7.3.0 64 bit toolchain.</Description>
+ <Version>7.3.0-0</Version>
+ <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
+ <Dependencies>qt.tools.qtcreator</Dependencies>
+ <Default>false</Default>
+ <Script>installscript.qs</Script>
+ <SortingPriority>599</SortingPriority>
+ <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
+</Package>
diff --git a/packaging-tools/configurations/repository_configs/tools_desktop/win_x86_repository_tools_mingw b/packaging-tools/configurations/repository_configs/tools_desktop/win_x86_repository_tools_mingw
index 77100776f..1ac3cea31 100644
--- a/packaging-tools/configurations/repository_configs/tools_desktop/win_x86_repository_tools_mingw
+++ b/packaging-tools/configurations/repository_configs/tools_desktop/win_x86_repository_tools_mingw
@@ -1,39 +1,26 @@
#############################################################################
##
-## Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/legal
+## Copyright (C) 2018 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:LGPL$
+## $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 Digia. For licensing terms and
-## conditions see http://qt.digia.com/licensing. For further information
-## use the contact form at http://qt.digia.com/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 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 2.1 requirements
-## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception, Digia gives you certain additional
-## rights. These rights are described in the Digia Qt LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+## 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.0 as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU General Public License version 3.0 requirements will be
-## met: http://www.gnu.org/copyleft/gpl.html.
-##
+## 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$
##
@@ -51,7 +38,8 @@ file_list: x86-tools-mingw-conf,
x86-tools-mingw482-conf,
x86-tools-mingw491-conf,
x86-tools-mingw492-conf,
- x86-tools-mingw530-conf
+ x86-tools-mingw530-conf,
+ x86_64-tools-mingw730-conf
[PackageTemplates]
template_dirs: pkg_tools
diff --git a/packaging-tools/configurations/windows/x64/x86_64-tools-mingw730-conf b/packaging-tools/configurations/windows/x64/x86_64-tools-mingw730-conf
new file mode 100644
index 000000000..68dc47ddf
--- /dev/null
+++ b/packaging-tools/configurations/windows/x64/x86_64-tools-mingw730-conf
@@ -0,0 +1,38 @@
+#############################################################################
+##
+## Copyright (C) 2018 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.win64_mingw730]
+archives: tools.win64_mingw730
+target_install_base: /Tools/mingw730_64
+[tools.win64_mingw730]
+archive_uri: http://download.qt.io/development_releases/prebuilt/mingw_64/x86_64-7.3.0-release-posix-seh-rt_v5-rev0.7z
+package_strip_dirs: 1
+target_install_dir: /
+rpath_target:
+archive_name: x86_64-7.3.0-release-posix-seh-rt_v5-rev0.7z