From aa8bada10b866305ee3e5a082c943e1d05785382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tommi=20M=C3=A4ntt=C3=A4ri?= Date: Thu, 17 Mar 2022 12:14:32 +0200 Subject: [PATCH] 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 Pick-to: 6.3 6.2 Change-Id: I3ea4cbaaebb693a0a46b5f9cbd08209805366ca7 Reviewed-by: Samuli Piippo --- coin/instructions/prepare_building_env.yaml | 48 ++++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index 0f4788a8f58..e1ff30ea70d 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: EnvironmentVariable variableName: QNX_TARGET @@ -354,10 +359,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