diff options
author | Antti Kokko <antti.kokko@qt.io> | 2019-02-12 10:59:40 +0200 |
---|---|---|
committer | Antti Kokko <antti.kokko@qt.io> | 2019-02-12 09:23:19 +0000 |
commit | aa822c1d93fd60bd5ba49cea3a74e05009c55deb (patch) | |
tree | ed46bdd96870b43c9cf39483cdd011bbbd76e7bd /packaging-tools/configurations | |
parent | bd688542dacfdac86d18cbaf60249e0a26b1b66e (diff) |
Add MinGW 7.3.0 32-bit package to MinGW tools online repository build
Add package templates.
Include 32-bit MinGW 7.3.0 in existing MinGW repository
build job since all the MinGW versions exist under same
repository structure.
Change-Id: Iccb8946c0c5e9c4bcdc534f16ccc273a8358bf1b
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Diffstat (limited to 'packaging-tools/configurations')
4 files changed, 151 insertions, 1 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs new file mode 100644 index 000000000..79821af29 --- /dev/null +++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** 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() +{ + 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_32_TCID", tcId); + installer.setValue("MINGW730_32_DBGID", dbgId); + + component.addOperation("Execute", + ["{0,2}", "@SDKToolBinary@", "addTC", + "--id", tcId + ".gcc", + "--name", "MinGW 7.3.0 32-bit for C", + "--path", "@MINGW730_DIR@/bin/gcc.exe", + "--abi", "x86-windows-msys-pe-32bit", + "--language", "1", + "--supportedAbis", "x86-windows-msys-pe-32bit", + "UNDOEXECUTE", + "@SDKToolBinary@", "rmTC", "--id", tcId + ".gcc"]); + + component.addOperation("Execute", + ["{0,2}", "@SDKToolBinary@", "addTC", + "--id", tcId + ".g++", + "--name", "MinGW 7.3.0 32-bit for C++", + "--path", "@MINGW730_DIR@/bin/g++.exe", + "--abi", "x86-windows-msys-pe-32bit", + "--language", "2", + "--supportedAbis", "x86-windows-msys-pe-32bit", + "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 32-bit", + "--binary", "@MINGW730_DIR@/bin/gdb.exe", + "--abis", "x86-windows-msys-pe-32bit", + "--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.win32_mingw730/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/package.xml new file mode 100644 index 000000000..f8639832c --- /dev/null +++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/package.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Package> + <DisplayName>MinGW 7.3.0 32-bit</DisplayName> + <Description>MinGW-builds 7.3.0 32-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>730</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 1ac3cea31..479634027 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 @@ -39,7 +39,8 @@ file_list: x86-tools-mingw-conf, x86-tools-mingw491-conf, x86-tools-mingw492-conf, x86-tools-mingw530-conf, - x86_64-tools-mingw730-conf + x86_64-tools-mingw730-conf, + x86-tools-mingw730-conf [PackageTemplates] template_dirs: pkg_tools diff --git a/packaging-tools/configurations/windows/x86/x86-tools-mingw730-conf b/packaging-tools/configurations/windows/x86/x86-tools-mingw730-conf new file mode 100644 index 000000000..12075732d --- /dev/null +++ b/packaging-tools/configurations/windows/x86/x86-tools-mingw730-conf @@ -0,0 +1,38 @@ +############################################################################# +## +## 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.win32_mingw730] +archives: tools.win32_mingw730 +target_install_base: /Tools/mingw730_32 +[tools.win32_mingw730] +archive_uri: http://download.qt.io/development_releases/prebuilt/mingw_32/i686-7.3.0-release-posix-dwarf-rt_v5-rev0.7z +package_strip_dirs: 1 +target_install_dir: / +rpath_target: +archive_name: i686-7.3.0-release-posix-dwarf-rt_v5-rev0.7z |