summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommi Mänttäri <tommi.manttari@qt.io>2022-03-17 12:14:32 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-04-05 16:56:05 +0000
commitb2f249967f64de7a8f002f85bfccd355cef8ab49 (patch)
tree6adf58b5b2eeee135c1dc590fcabfdff95db53ab
parentc1b8acb464aaa7aa3106401390efc0dbd4150efe (diff)
CI: add Windows host support for QNX
Add required environment variable configurations to COIN for building Qt SW in Windows host for QNX OS. Task-number: QTBUG-101292 Change-Id: I3ea4cbaaebb693a0a46b5f9cbd08209805366ca7 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit aa8bada10b866305ee3e5a082c943e1d05785382) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/instructions/prepare_building_env.yaml48
1 files changed, 41 insertions, 7 deletions
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
index 4121db7db4..b918325f33 100644
--- a/coin/instructions/prepare_building_env.yaml
+++ b/coin/instructions/prepare_building_env.yaml
@@ -326,9 +326,14 @@ instructions:
# QNX variables
- type: Group
enable_if:
- condition: property
- property: target.os
- equals_value: QNX
+ condition: and
+ conditions:
+ - condition: property
+ property: host.os
+ equals_value: Linux
+ - condition: property
+ property: target.os
+ equals_value: QNX
instructions:
- type: WriteFile
fileContents: "#!/bin/bash\nexport TESTARGS={{.Env.TESTARGS}}\nexport TESTRUNNER={{.Env.TESTRUNNER}}\nexport COIN_CTEST_RESULTSDIR={{.Env.COIN_CTEST_RESULTSDIR}}\n$*"
@@ -360,10 +365,39 @@ instructions:
- type: AppendToEnvironmentVariable
variableName: PATH
variableValue: ":{{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/bin:"
- enable_if:
- condition: property
- property: host.os
- equals_value: Linux
+
+ - type: Group
+ enable_if:
+ condition: and
+ conditions:
+ - condition: property
+ property: host.os
+ equals_value: Windows
+ - condition: property
+ property: target.os
+ equals_value: QNX
+ instructions:
+ - type: EnvironmentVariable
+ variableName: QNX_TARGET
+ variableValue: "{{.Env.QNX_710_CMAKE}}/target/qnx7"
+ - type: EnvironmentVariable
+ variableName: QNX_CONFIGURATION_EXCLUSIVE
+ variableValue: "{{.Env.HOMEPATH}}\\.qnx"
+ - type: EnvironmentVariable
+ variableName: QNX_CONFIGURATION
+ variableValue: "{{.Env.HOMEPATH}}\\.qnx"
+ - type: PrependToEnvironmentVariable
+ variableName: PATH
+ variableValue: "{{.Env.QNX_710}}\\host\\win64\\x86_64\\usr\\bin;"
+ - type: PrependToEnvironmentVariable
+ variableName: PATH
+ variableValue: "{{.Env.QNX_710}}\\host\\common\\bin;"
+ - type: PrependToEnvironmentVariable
+ variableName: PATH
+ variableValue: "{{.Env.HOMEPATH}}\\.qnx;"
+ - type: EnvironmentVariable
+ variableName: QNX_HOST
+ variableValue: "{{.Env.QNX_710}}\\host\\win64\\x86_64"
# Enable warnings are errors
- type: Group