diff options
-rw-r--r-- | meta-boot2qt/classes/qbsp.bbclass | 2 | ||||
-rw-r--r-- | meta-boot2qt/files/qbsp/base_installscript.qs | 58 | ||||
-rw-r--r-- | meta-boot2qt/files/qbsp/base_package.xml | 2 | ||||
-rw-r--r-- | meta-boot2qt/files/qbsp/image_package.xml | 1 | ||||
-rw-r--r-- | meta-boot2qt/files/qbsp/toolchain_installscript.qs | 2 | ||||
-rw-r--r-- | meta-boot2qt/files/qbsp/toolchain_package.xml | 1 |
6 files changed, 65 insertions, 1 deletions
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass index da790bf..bdce9fb 100644 --- a/meta-boot2qt/classes/qbsp.bbclass +++ b/meta-boot2qt/classes/qbsp.bbclass | |||
@@ -33,6 +33,7 @@ FILESEXTRAPATHS_prepend := "${B2QTBASE}/files/qbsp:" | |||
33 | 33 | ||
34 | SRC_URI = "\ | 34 | SRC_URI = "\ |
35 | file://base_package.xml \ | 35 | file://base_package.xml \ |
36 | file://base_installscript.qs \ | ||
36 | file://image_package.xml \ | 37 | file://image_package.xml \ |
37 | file://toolchain_package.xml \ | 38 | file://toolchain_package.xml \ |
38 | file://toolchain_installscript.qs \ | 39 | file://toolchain_installscript.qs \ |
@@ -144,6 +145,7 @@ prepare_qbsp() { | |||
144 | mkdir -p ${COMPONENT_PATH}/meta | 145 | mkdir -p ${COMPONENT_PATH}/meta |
145 | 146 | ||
146 | cp ${WORKDIR}/base_package.xml ${COMPONENT_PATH}/meta/package.xml | 147 | cp ${WORKDIR}/base_package.xml ${COMPONENT_PATH}/meta/package.xml |
148 | cp ${WORKDIR}/base_installscript.qs ${COMPONENT_PATH}/meta/installscript.qs | ||
147 | patch_installer_files ${COMPONENT_PATH}/meta | 149 | patch_installer_files ${COMPONENT_PATH}/meta |
148 | } | 150 | } |
149 | 151 | ||
diff --git a/meta-boot2qt/files/qbsp/base_installscript.qs b/meta-boot2qt/files/qbsp/base_installscript.qs new file mode 100644 index 0000000..e6c5fbc --- /dev/null +++ b/meta-boot2qt/files/qbsp/base_installscript.qs | |||
@@ -0,0 +1,58 @@ | |||
1 | /**************************************************************************** | ||
2 | ** | ||
3 | ** Copyright (C) 2018 The Qt Company Ltd. | ||
4 | ** Contact: https://www.qt.io/licensing/ | ||
5 | ** | ||
6 | ** This file is part of the Boot to Qt meta layer. | ||
7 | ** | ||
8 | ** $QT_BEGIN_LICENSE:GPL$ | ||
9 | ** Commercial License Usage | ||
10 | ** Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ** accordance with the commercial license agreement provided with the | ||
12 | ** Software or, alternatively, in accordance with the terms contained in | ||
13 | ** a written agreement between you and The Qt Company. For licensing terms | ||
14 | ** and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ** information use the contact form at https://www.qt.io/contact-us. | ||
16 | ** | ||
17 | ** GNU General Public License Usage | ||
18 | ** Alternatively, this file may be used under the terms of the GNU | ||
19 | ** General Public License version 3 or (at your option) any later version | ||
20 | ** approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ** the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ** included in the packaging of this file. Please review the following | ||
23 | ** information to ensure the GNU General Public License requirements will | ||
24 | ** be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ** | ||
26 | ** $QT_END_LICENSE$ | ||
27 | ** | ||
28 | ****************************************************************************/ | ||
29 | |||
30 | var targetHost = "Linux"; | ||
31 | var currentHost = "Linux"; | ||
32 | |||
33 | function Component() | ||
34 | { | ||
35 | if ("@SDKFILE@".indexOf("mingw32") >= 0) | ||
36 | targetHost = "Windows"; | ||
37 | |||
38 | if (systemInfo.kernelType === "winnt") | ||
39 | currentHost = "Windows"; | ||
40 | else if (systemInfo.kernelType === "darwin") | ||
41 | currentHost = "macOS"; | ||
42 | |||
43 | if (currentHost != targetHost) { | ||
44 | component.enabled = false; | ||
45 | component.setValue("Default", false); | ||
46 | installer.componentByName(component.name + ".toolchain").setValue("Default", false); | ||
47 | installer.componentByName(component.name + ".toolchain").enabled = false; | ||
48 | installer.componentByName(component.name + ".system").setValue("Default", false); | ||
49 | installer.componentByName(component.name + ".system").enabled = false; | ||
50 | |||
51 | gui.currentPageWidget().completeChanged.connect(this, Component.prototype.completeChanged) | ||
52 | } | ||
53 | } | ||
54 | |||
55 | Component.prototype.completeChanged = function () | ||
56 | { | ||
57 | QMessageBox.critical("error", "Invalid QBSP package", "The selected QBSP supports only " + targetHost + " host platform.\nPlease restart the installer before continuing."); | ||
58 | } | ||
diff --git a/meta-boot2qt/files/qbsp/base_package.xml b/meta-boot2qt/files/qbsp/base_package.xml index 5f16dfa..57b5076 100644 --- a/meta-boot2qt/files/qbsp/base_package.xml +++ b/meta-boot2qt/files/qbsp/base_package.xml | |||
@@ -5,4 +5,6 @@ | |||
5 | <DisplayName>@TARGET@</DisplayName> | 5 | <DisplayName>@TARGET@</DisplayName> |
6 | <Description>@NAME@ for @TARGET@</Description> | 6 | <Description>@NAME@ for @TARGET@</Description> |
7 | <Dependencies>@LICENSEDEPENDENCY@</Dependencies> | 7 | <Dependencies>@LICENSEDEPENDENCY@</Dependencies> |
8 | <Script>installscript.qs</Script> | ||
9 | <Default>true</Default> | ||
8 | </Package> | 10 | </Package> |
diff --git a/meta-boot2qt/files/qbsp/image_package.xml b/meta-boot2qt/files/qbsp/image_package.xml index 27e5f2e..326b443 100644 --- a/meta-boot2qt/files/qbsp/image_package.xml +++ b/meta-boot2qt/files/qbsp/image_package.xml | |||
@@ -5,4 +5,5 @@ | |||
5 | <DisplayName>@TARGET@ Linux System</DisplayName> | 5 | <DisplayName>@TARGET@ Linux System</DisplayName> |
6 | <Description>System image for @TARGET@ hardware</Description> | 6 | <Description>System image for @TARGET@ hardware</Description> |
7 | <DownloadableArchives>image.7z</DownloadableArchives> | 7 | <DownloadableArchives>image.7z</DownloadableArchives> |
8 | <Default>true</Default> | ||
8 | </Package> | 9 | </Package> |
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index 4afab71..7cef6bc 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs | |||
@@ -1,6 +1,6 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** | 2 | ** |
3 | ** Copyright (C) 2016 The Qt Company Ltd. | 3 | ** Copyright (C) 2018 The Qt Company Ltd. |
4 | ** Contact: https://www.qt.io/licensing/ | 4 | ** Contact: https://www.qt.io/licensing/ |
5 | ** | 5 | ** |
6 | ** This file is part of the Boot to Qt meta layer. | 6 | ** This file is part of the Boot to Qt meta layer. |
diff --git a/meta-boot2qt/files/qbsp/toolchain_package.xml b/meta-boot2qt/files/qbsp/toolchain_package.xml index 166e09b..89a73b7 100644 --- a/meta-boot2qt/files/qbsp/toolchain_package.xml +++ b/meta-boot2qt/files/qbsp/toolchain_package.xml | |||
@@ -7,4 +7,5 @@ | |||
7 | <DownloadableArchives>toolchain.7z</DownloadableArchives> | 7 | <DownloadableArchives>toolchain.7z</DownloadableArchives> |
8 | <Dependencies>qt.tools.qtcreator</Dependencies> | 8 | <Dependencies>qt.tools.qtcreator</Dependencies> |
9 | <Script>installscript.qs</Script> | 9 | <Script>installscript.qs</Script> |
10 | <Default>true</Default> | ||
10 | </Package> | 11 | </Package> |