Skip to content

Commit

Permalink
Add VxWorks specific instructions
Browse files Browse the repository at this point in the history
Adds VxWorks conditions to match target instructions
and sets env prefix to wrenv.

Change-Id: If9a8ffcdf4b60cc4b45eb2a336737d77d2f8804a
Reviewed-by: Jukka Jokiniva <[email protected]>
Reviewed-by: Dimitrios Apostolou <[email protected]>
  • Loading branch information
Toni Saario committed Nov 13, 2023
1 parent 9bed675 commit ea84c1a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
6 changes: 3 additions & 3 deletions coin/instructions/coin_module_build_template_v2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions coin/instructions/coin_qtbase_build_template_v2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions coin/instructions/prepare_building_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit ea84c1a

Please sign in to comment.