diff options
author | Toni Saario <toni.saario@qt.io> | 2023-09-29 17:03:40 +0300 |
---|---|---|
committer | Toni Saario <toni.saario@qt.io> | 2023-11-13 18:14:59 +0000 |
commit | ea84c1a229a83fd3ff1cadb333a14ccc0838b00d (patch) | |
tree | 673a09030e9dc5361f358994d26f946e45dfe69d /coin | |
parent | 9bed675df8eed361439a1d5de43a9dd41359be5c (diff) |
Add VxWorks specific instructions
Adds VxWorks conditions to match target instructions
and sets env prefix to wrenv.
Change-Id: If9a8ffcdf4b60cc4b45eb2a336737d77d2f8804a
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Diffstat (limited to 'coin')
-rw-r--r-- | coin/instructions/coin_module_build_template_v2.yaml | 6 | ||||
-rw-r--r-- | coin/instructions/coin_qtbase_build_template_v2.yaml | 6 | ||||
-rw-r--r-- | coin/instructions/prepare_building_env.yaml | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml index 48c671ca42..e7f47328e8 100644 --- a/coin/instructions/coin_module_build_template_v2.yaml +++ b/coin/instructions/coin_module_build_template_v2.yaml @@ -20,7 +20,7 @@ instructions: equals_property: target.os - condition: property property: target.osVersion - not_in_values: [QEMU, WebAssembly, INTEGRITY] + not_in_values: [QEMU, WebAssembly, INTEGRITY, VxWorks] - condition: property property: features not_contains_value: "TargetBuildOnly" @@ -60,13 +60,13 @@ instructions: enable_if: condition: property property: target.osVersion - in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks] enable_if: condition: or conditions: - condition: property property: target.osVersion - in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks] - condition: and conditions: - condition: property diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml index a048b2ba8a..bcba742781 100644 --- a/coin/instructions/coin_qtbase_build_template_v2.yaml +++ b/coin/instructions/coin_qtbase_build_template_v2.yaml @@ -13,7 +13,7 @@ instructions: equals_property: target.os - condition: property property: target.osVersion - not_in_values: [QEMU, WebAssembly, INTEGRITY] + not_in_values: [QEMU, WebAssembly, INTEGRITY, VxWorks] - condition: property property: features not_contains_value: "TargetBuildOnly" @@ -51,13 +51,13 @@ instructions: enable_if: condition: property property: target.osVersion - in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks] enable_if: condition: or conditions: - condition: property property: target.osVersion - in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks] - condition: and conditions: - condition: property diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index e41f7eea4d..efeaa3d721 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -340,6 +340,17 @@ instructions: variableName: TARGET_ENV_PREFIX variableValue: "c:\\users\\qt\\prefix.bat" + # VxWorks + - type: Group + enable_if: + condition: property + property: target.osVersion + equals_value: VxWorks + instructions: + - type: EnvironmentVariable + variableName: TARGET_ENV_PREFIX + variableValue: "{{.Env.VXWORKS_HOME}}/wrenv.linux" + # QNX variables - type: Group enable_if: |